[Instantobjects-cvscommit] SF.net SVN: instantobjects:[856] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 856
          http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=856&view=rev
Author:   bvsimmons
Date:     2009-08-20 12:06:18 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
Minor updates for D7 and D2007 and others
D2007 - removed references to Zeos Broker from RunTime Packages
D7 - Added missing path to ..\Source\Catalogs for PrimerCross to PrimerCross.
     -  Added missing .res file for MySQL Catalog
Tests - Added path to ..\Source\Brokers\XML

Modified Paths:
--------------
    trunk/Demos/PrimerCross/PrimerExternal.dof
    trunk/Demos/PrimerCross/PrimerExternal.xml
    trunk/Source/PackageGroups/D2007/RunTimePackages.groupproj
    trunk/Tests/TestIO.cfg
    trunk/Tests/TestIO.dof

Added Paths:
-----------
    trunk/Source/Catalogs/MySQL/D7/IOMySQLCatalog.res

Modified: trunk/Demos/PrimerCross/PrimerExternal.dof
===================================================================

--- trunk/Demos/PrimerCross/PrimerExternal.dof	2009-08-20 09:27:11 UTC (rev 855)
+++ trunk/Demos/PrimerCross/PrimerExternal.dof	2009-08-20 12:06:18 UTC (rev 856)
@@ -94,7 +94,7 @@
 UnitOutputDir=
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=$(DELPHI)\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB;..\..\Source\Brokers\ZeosDBO;..\..\Source\Catalogs\BDE;..\..\Source\Catalogs\MsSql;..\..\Source\Catalogs\IbFb;..\..\Source\Catalogs\XML
+SearchPath=$(DELPHI)\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB;..\..\Source\Brokers\ZeosDBO;..\..\Source\Catalogs\BDE;..\..\Source\Catalogs\MsSql;..\..\Source\Catalogs\IbFb;..\..\Source\Catalogs\MySQL;..\..\Source\Catalogs\XML
 Packages=
 Conditionals=
 DebugSourceDirs=

Modified: trunk/Demos/PrimerCross/PrimerExternal.xml
===================================================================
--- trunk/Demos/PrimerCross/PrimerExternal.xml	2009-08-20 09:27:11 UTC (rev 855)
+++ trunk/Demos/PrimerCross/PrimerExternal.xml	2009-08-20 12:06:18 UTC (rev 856)
@@ -1,2 +1,2 @@
 <TInstantConnectionDefs><TInstantIBXConnectionDef><Name>FirebirdDBExternal</Name><IsBuilt>TRUE</IsBuilt><LoginPrompt>FALSE</LoginPrompt><ConnectionString>.\FirebirdDB\PRIMERDB.FDB</ConnectionString><Options>ibxUseDelimitedIdents</Options><Params>User_Name=SYSDBA
-Password=masterkey</Params></TInstantIBXConnectionDef><TInstantXMLConnectionDef><Name>XMLDB</Name><IsBuilt>TRUE</IsBuilt><RootFolder>W:\Projects\instantobjects\Demos\PrimerCross\XMLDB</RootFolder></TInstantXMLConnectionDef></TInstantConnectionDefs>
\ No newline at end of file
+Password=masterkey</Params></TInstantIBXConnectionDef><TInstantXMLConnectionDef><Name>XMLDB</Name><IsBuilt>TRUE</IsBuilt><RootFolder>.\XMLDB\</RootFolder></TInstantXMLConnectionDef></TInstantConnectionDefs>
\ No newline at end of file

Added: trunk/Source/Catalogs/MySQL/D7/IOMySQLCatalog.res
===================================================================
(Binary files differ)


Property changes on: trunk/Source/Catalogs/MySQL/D7/IOMySQLCatalog.res
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Source/PackageGroups/D2007/RunTimePackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/D2007/RunTimePackages.groupproj	2009-08-20 09:27:11 UTC (rev 855)
+++ trunk/Source/PackageGroups/D2007/RunTimePackages.groupproj	2009-08-20 12:06:18 UTC (rev 856)
@@ -91,22 +91,13 @@
   <Target Name="IOXML:Make">
     <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Make" />
   </Target>
-  <Target Name="IOZeosDBO">
-    <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\IOZeosDBO.dproj" Targets="" />
-  </Target>
-  <Target Name="IOZeosDBO:Clean">
-    <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\IOZeosDBO.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="IOZeosDBO:Make">
-    <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\IOZeosDBO.dproj" Targets="Make" />
-  </Target>
   <Target Name="Build">
-    <CallTarget Targets="IOCore;IOIBFbCatalog;IOMSSqlCatalog;IOMySQLCatalog;IOADO;IOBDE;IODBX;IOIBX;IOXML;IOZeosDBO" />
+    <CallTarget Targets="IOCore;IOIBFbCatalog;IOMSSqlCatalog;IOMySQLCatalog;IOADO;IOBDE;IODBX;IOIBX;IOXML" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="IOCore:Clean;IOIBFbCatalog:Clean;IOMSSqlCatalog:Clean;IOMySQLCatalog:Clean;IOADO:Clean;IOBDE:Clean;IODBX:Clean;IOIBX:Clean;IOXML:Clean;IOZeosDBO:Clean" />
+    <CallTarget Targets="IOCore:Clean;IOIBFbCatalog:Clean;IOMSSqlCatalog:Clean;IOMySQLCatalog:Clean;IOADO:Clean;IOBDE:Clean;IODBX:Clean;IOIBX:Clean;IOXML:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="IOCore:Make;IOIBFbCatalog:Make;IOMSSqlCatalog:Make;IOMySQLCatalog:Make;IOADO:Make;IOBDE:Make;IODBX:Make;IOIBX:Make;IOXML:Make;IOZeosDBO:Make" />
+    <CallTarget Targets="IOCore:Make;IOIBFbCatalog:Make;IOMSSqlCatalog:Make;IOMySQLCatalog:Make;IOADO:Make;IOBDE:Make;IODBX:Make;IOIBX:Make;IOXML:Make" />
   </Target>
 </Project>
\ No newline at end of file

Modified: trunk/Tests/TestIO.cfg
===================================================================
--- trunk/Tests/TestIO.cfg	2009-08-20 09:27:11 UTC (rev 855)
+++ trunk/Tests/TestIO.cfg	2009-08-20 12:06:18 UTC (rev 856)
@@ -33,10 +33,10 @@
 -K$00400000
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"..\Source\core;.\ubmock\src"
--O"..\Source\core;.\ubmock\src"
--I"..\Source\core;.\ubmock\src"
--R"..\Source\core;.\ubmock\src"
+-U"..\Source\core;.\ubmock\src;..\Source\Brokers\XML"
+-O"..\Source\core;.\ubmock\src;..\Source\Brokers\XML"
+-I"..\Source\core;.\ubmock\src;..\Source\Brokers\XML"
+-R"..\Source\core;.\ubmock\src;..\Source\Brokers\XML"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

Modified: trunk/Tests/TestIO.dof
===================================================================
--- trunk/Tests/TestIO.dof	2009-08-20 09:27:11 UTC (rev 855)
+++ trunk/Tests/TestIO.dof	2009-08-20 12:06:18 UTC (rev 856)
@@ -94,7 +94,7 @@
 UnitOutputDir=
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=..\Source\core;.\ubmock\src
+SearchPath=..\Source\core;.\ubmock\src;..\Source\Brokers\XML
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;adortl;vclactnband;vclshlctrls;CS30Logging70;Rz30Ctls70;Rz30DBCtls70;ip4000v7;Rave60VCL;Rave60CLX;madBasic_;madDisAsm_;CLXIB;ibxpress;VCLIB;IOCore;IOIBX
 Conditionals=
 DebugSourceDirs=..\core




