[JVCL-Checkins] SF.net SVN: jvcl:[13240] trunk/jvcl

[<ob...@us...>]

Revision: 13240
          http://jvcl.svn.sourceforge.net/jvcl/?rev=13240&view=rev
Author:   obones
Date:     2012-02-27 11:05:59 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
Mantis 5696 : Use ICSv7 for all versions that it supports

Modified Paths:
--------------
    trunk/jvcl/packages/xml/JvNet-R.xml
    trunk/jvcl/run/JvProgramVersionCheck.pas

Modified: trunk/jvcl/packages/xml/JvNet-R.xml
===================================================================
--- trunk/jvcl/packages/xml/JvNet-R.xml	2012-02-27 10:33:17 UTC (rev 13239)
+++ trunk/jvcl/packages/xml/JvNet-R.xml	2012-02-27 11:05:59 UTC (rev 13240)
@@ -22,13 +22,13 @@
     <Package Name="IndyProtocols" Targets="allv9up" Condition="USE_3RDPARTY_INDY &amp;&amp; USE_3RDPARTY_INDY10"/>
     <Package Name="IcsBcb60" Targets="C6,C6p" Condition="USE_3RDPARTY_ICS"/>
     <Package Name="IcsDel60" Targets="D6,D6p" Condition="USE_3RDPARTY_ICS"/>
-    <Package Name="IcsDel70" Targets="D7,D7p" Condition="USE_3RDPARTY_ICS"/>
-    <Package Name="IcsDel90" Targets="D9,D9p" Condition="USE_3RDPARTY_ICS"/>
-    <Package Name="IcsDel100" Targets="D10,D10p" Condition="USE_3RDPARTY_ICS"/>
-    <Package Name="IcsDel110" Targets="D11" Condition="USE_3RDPARTY_ICS"/>
-    <Package Name="IcsDel120" Targets="D12" Condition="USE_3RDPARTY_ICS"/>
-    <Package Name="IcsDel140" Targets="D14" Condition="USE_3RDPARTY_ICS"/>
-    <Package Name="IcsDel150" Targets="D15" Condition="USE_3RDPARTY_ICS"/>
+    <Package Name="OverbyteIcsD7Run" Targets="D7,D7p" Condition="USE_3RDPARTY_ICS"/>
+    <Package Name="OverbyteIcsD2006Run" Targets="D10,D10p" Condition="USE_3RDPARTY_ICS"/>
+    <Package Name="OverbyteIcsD2007Run" Targets="D11" Condition="USE_3RDPARTY_ICS"/>
+    <Package Name="OverbyteIcsD2009Run" Targets="D12" Condition="USE_3RDPARTY_ICS"/>
+    <Package Name="OverbyteIcsD2010Run" Targets="D14" Condition="USE_3RDPARTY_ICS"/>
+    <Package Name="OverbyteIcsDXERun" Targets="D15" Condition="USE_3RDPARTY_ICS"/>
+    <Package Name="OverbyteIcsDXE2Run" Targets="D16" Condition="USE_3RDPARTY_ICS"/>
   </Requires>
   <Contains>
     <File Name="..\..\run\JvFormToHtml.pas" Targets="all" Formname="" Condition=""/>

Modified: trunk/jvcl/run/JvProgramVersionCheck.pas
===================================================================
--- trunk/jvcl/run/JvProgramVersionCheck.pas	2012-02-27 10:33:17 UTC (rev 13239)
+++ trunk/jvcl/run/JvProgramVersionCheck.pas	2012-02-27 11:05:59 UTC (rev 13240)
@@ -36,7 +36,11 @@
   IdHTTP, IdFTP,
   {$ENDIF USE_3RDPARTY_INDY}
   {$IFDEF USE_3RDPARTY_ICS}
+  {$IFDEF DELPHI7_UP}
+  OverbyteIcsHttpProt, OverbyteIcsFtpCli,
+  {$ELSE}
   HttpProt, FtpCli,
+  {$ENDIF DELPHI7_UP}
   {$ENDIF USE_3RDPARTY_ICS}
   JvPropertyStore, JvAppStorage, JvAppIniStorage, JvAppXMLStorage,
   JvParameterList, JvThread, JvThreadDialog, SysUtils;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.