From: <car...@us...> - 2016-05-31 17:37:02
|
Revision: 975 http://sourceforge.net/p/instantobjects/code/975 Author: carlobar Date: 2016-05-31 17:36:59 +0000 (Tue, 31 May 2016) Log Message: ----------- Modified Paths: -------------- trunk/Demos/PrimerCross/Primer_D2010.dproj trunk/Demos/PrimerCross/Primer_D2010.res trunk/Source/Brokers/ADO/D10/DclIOADO.dproj trunk/Source/Brokers/ADO/D10/IOADO.dproj trunk/Source/Brokers/DBX/D10/DclIODBX.dproj trunk/Source/Brokers/DBX/D10/IODBX.dproj trunk/Source/Brokers/FireDAC/D10/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10/IOFireDAC.dproj trunk/Source/Brokers/IBX/D10/DclIOIBX.dproj trunk/Source/Brokers/IBX/D10/IOIBX.dproj trunk/Source/Brokers/XML/D10/DclIOXML.dproj trunk/Source/Brokers/XML/D10/IOXML.dproj trunk/Source/Catalogs/IBFb/D10/IOIBFbCatalog.dproj trunk/Source/Catalogs/MSSql/D10/IOMSSqlCatalog.dproj trunk/Source/Catalogs/MySQL/D10/IOMySQLCatalog.dproj trunk/Source/Core/D10/IOCore.dproj trunk/Source/Core/DXE3/IOCoreRtl.dpk trunk/Source/Core/DXE3/IOCoreRtl.dproj trunk/Source/Core/DXE3/IOCoreRtl.res trunk/Source/Design/D10/DclIOCore.dproj trunk/Source/InstantDefines.inc trunk/Source/PackageGroups/D2010/DesignTimePackages.groupproj trunk/Source/PackageGroups/D2010/RunTimePackages.groupproj Removed Paths: ------------- trunk/Source/Brokers/FireDAC/DXE8/IOFireDAC.identcache trunk/Source/Design/DXE3/DclIOCore.identcache Modified: trunk/Demos/PrimerCross/Primer_D2010.dproj =================================================================== --- trunk/Demos/PrimerCross/Primer_D2010.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Demos/PrimerCross/Primer_D2010.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -176,14 +176,14 @@ <BuildConfiguration Include="Base"> <Key>Base</Key> </BuildConfiguration> + <BuildConfiguration Include="Release"> + <Key>Cfg_1</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> <BuildConfiguration Include="Debug"> <Key>Cfg_2</Key> <CfgParent>Base</CfgParent> </BuildConfiguration> - <BuildConfiguration Include="Release"> - <Key>Cfg_1</Key> - <CfgParent>Base</CfgParent> - </BuildConfiguration> </ItemGroup> <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/> </Project> Modified: trunk/Demos/PrimerCross/Primer_D2010.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D10/DclIOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10/DclIOADO.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/ADO/D10/DclIOADO.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>None</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Brokers/ADO/D10/IOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10/IOADO.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/ADO/D10/IOADO.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Brokers/DBX/D10/DclIODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10/DclIODBX.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/DBX/D10/DclIODBX.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Brokers/DBX/D10/IODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10/IODBX.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/DBX/D10/IODBX.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Brokers/FireDAC/D10/DclIOFireDAC.dproj =================================================================== --- trunk/Source/Brokers/FireDAC/D10/DclIOFireDAC.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/FireDAC/D10/DclIOFireDAC.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>None</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Brokers/FireDAC/D10/IOFireDAC.dproj =================================================================== --- trunk/Source/Brokers/FireDAC/D10/IOFireDAC.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/FireDAC/D10/IOFireDAC.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>None</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Deleted: trunk/Source/Brokers/FireDAC/DXE8/IOFireDAC.identcache =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D10/DclIOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D10/DclIOIBX.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/IBX/D10/DclIOIBX.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Brokers/IBX/D10/IOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D10/IOIBX.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/IBX/D10/IOIBX.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Brokers/XML/D10/DclIOXML.dproj =================================================================== --- trunk/Source/Brokers/XML/D10/DclIOXML.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/XML/D10/DclIOXML.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Brokers/XML/D10/IOXML.dproj =================================================================== --- trunk/Source/Brokers/XML/D10/IOXML.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Brokers/XML/D10/IOXML.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Catalogs/IBFb/D10/IOIBFbCatalog.dproj =================================================================== --- trunk/Source/Catalogs/IBFb/D10/IOIBFbCatalog.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Catalogs/IBFb/D10/IOIBFbCatalog.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>None</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Catalogs/MSSql/D10/IOMSSqlCatalog.dproj =================================================================== --- trunk/Source/Catalogs/MSSql/D10/IOMSSqlCatalog.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Catalogs/MSSql/D10/IOMSSqlCatalog.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>None</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Catalogs/MySQL/D10/IOMySQLCatalog.dproj =================================================================== --- trunk/Source/Catalogs/MySQL/D10/IOMySQLCatalog.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Catalogs/MySQL/D10/IOMySQLCatalog.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>None</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Core/D10/IOCore.dproj =================================================================== --- trunk/Source/Core/D10/IOCore.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Core/D10/IOCore.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Modified: trunk/Source/Core/DXE3/IOCoreRtl.dpk =================================================================== --- trunk/Source/Core/DXE3/IOCoreRtl.dpk 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Core/DXE3/IOCoreRtl.dpk 2016-05-31 17:36:59 UTC (rev 975) @@ -25,13 +25,16 @@ {$IMAGEBASE $400000} {$DEFINE RELEASE} {$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'InstantObjects Run-Time Package (Delphi XE)'} -{$LIBSUFFIX '_D15'} +{$DESCRIPTION 'InstantObjects Run-Time Package (Delphi XE3)'} +{$LIBSUFFIX '_D17'} {$RUNONLY} {$IMPLICITBUILD OFF} requires - rtl; + rtl, + vcl, + dbrtl, + vcldb; contains InstantUtils in '..\InstantUtils.pas', Modified: trunk/Source/Core/DXE3/IOCoreRtl.dproj =================================================================== --- trunk/Source/Core/DXE3/IOCoreRtl.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Core/DXE3/IOCoreRtl.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -1,171 +1,182 @@ - <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <ProjectGuid>{587E0156-166D-4A1E-B620-1392C9EFEB8E}</ProjectGuid> - <MainSource>IOCoreRtl.dpk</MainSource> - <Base>True</Base> - <Config Condition="'$(Config)'==''">Release</Config> - <AppType>Package</AppType> - <FrameworkType>VCL</FrameworkType> - <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> - <ProjectVersion>13.4</ProjectVersion> - <Platform Condition="'$(Platform)'==''">Win32</Platform> - <TargetedPlatforms>1</TargetedPlatforms> - </PropertyGroup> - <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> - <Base_Win64>true</Base_Win64> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''"> - <Base_Win32>true</Base_Win32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''"> - <Cfg_1>true</Cfg_1> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''"> - <Cfg_2>true</Cfg_2> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="'$(Base)'!=''"> - <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> - <VerInfo_Locale>1033</VerInfo_Locale> - <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace> - <DCC_ImageBase>00400000</DCC_ImageBase> - <DllSuffix>_D15</DllSuffix> - <GenPackage>true</GenPackage> - <RuntimeOnlyPackage>true</RuntimeOnlyPackage> - <DCC_TypedAtParameter>true</DCC_TypedAtParameter> - <DCC_Description>InstantObjects Run-Time Package (Delphi XE)</DCC_Description> - <DCC_S>false</DCC_S> - <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> - <GenDll>true</GenDll> - <DCC_N>false</DCC_N> - <DCC_E>false</DCC_E> - <DCC_F>false</DCC_F> - <DCC_K>false</DCC_K> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_Win64)'!=''"> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_Win32)'!=''"> - <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <VerInfo_Locale>1033</VerInfo_Locale> - <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_1)'!=''"> - <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> - <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> - <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> - <DCC_DebugInformation>false</DCC_DebugInformation> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2)'!=''"> - <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> - <DCC_Optimize>false</DCC_Optimize> - <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> - </PropertyGroup> - <ItemGroup> - <DelphiCompile Include="$(MainSource)"> - <MainSource>MainSource</MainSource> - </DelphiCompile> - <DCCReference Include="rtl.dcp"/> - <DCCReference Include="..\InstantUtils.pas"/> - <DCCReference Include="..\InstantClasses.pas"/> - <DCCReference Include="..\InstantConsts.pas"/> - <DCCReference Include="..\InstantRtti.pas"/> - <DCCReference Include="..\InstantCommand.pas"/> - <DCCReference Include="..\InstantPersistence.pas"/> - <DCCReference Include="..\InstantExplorer.pas"/> - <DCCReference Include="..\InstantDesignHook.pas"/> - <DCCReference Include="..\InstantCode.pas"/> - <DCCReference Include="..\InstantTextFiler.pas"/> - <DCCReference Include="..\InstantPresentation.pas"/> - <DCCReference Include="..\InstantAccessors.pas"/> - <DCCReference Include="..\InstantConnectionManagerFormUnit.pas"> - <Form>InstantConnectionManagerForm</Form> - </DCCReference> - <DCCReference Include="..\InstantConnectionManager.pas"/> - <DCCReference Include="..\InstantImageUtils.pas"/> - <DCCReference Include="..\InstantPump.pas"/> - <DCCReference Include="..\InstantDBBuild.pas"/> - <DCCReference Include="..\InstantDBEvolution.pas"/> - <DCCReference Include="..\InstantCustomDBEvolverFormUnit.pas"> - <Form>InstantCustomDBEvolverForm</Form> - </DCCReference> - <DCCReference Include="..\InstantDBEvolverFormUnit.pas"> - <Form>InstantDBEvolverForm</Form> - </DCCReference> - <DCCReference Include="..\InstantDBBuilderFormUnit.pas"> - <Form>InstantDBBuilderForm</Form> - </DCCReference> - <DCCReference Include="..\InstantTypes.pas"/> - <DCCReference Include="..\InstantBrokers.pas"/> - <DCCReference Include="..\InstantMetadata.pas"/> - <DCCReference Include="..\InstantStandardValidators.pas"/> - <DCCReference Include="..\InstantValidation.pas"/> - <DCCReference Include="..\InstantRttiAttributes.pas"/> - <BuildConfiguration Include="Debug"> - <Key>Cfg_2</Key> - <CfgParent>Base</CfgParent> - </BuildConfiguration> - <BuildConfiguration Include="Base"> - <Key>Base</Key> - </BuildConfiguration> - <BuildConfiguration Include="Release"> - <Key>Cfg_1</Key> - <CfgParent>Base</CfgParent> - </BuildConfiguration> - </ItemGroup> - <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> - <ProjectExtensions> - <Borland.Personality>Delphi.Personality.12</Borland.Personality> - <Borland.ProjectType>Package</Borland.ProjectType> - <BorlandProject> - <Delphi.Personality> - <Source> - <Source Name="MainSource">IOCoreRtl.dpk</Source> - </Source> - <VersionInfo> - <VersionInfo Name="IncludeVerInfo">False</VersionInfo> - <VersionInfo Name="AutoIncBuild">False</VersionInfo> - <VersionInfo Name="MajorVer">1</VersionInfo> - <VersionInfo Name="MinorVer">0</VersionInfo> - <VersionInfo Name="Release">0</VersionInfo> - <VersionInfo Name="Build">0</VersionInfo> - <VersionInfo Name="Debug">False</VersionInfo> - <VersionInfo Name="PreRelease">False</VersionInfo> - <VersionInfo Name="Special">False</VersionInfo> - <VersionInfo Name="Private">False</VersionInfo> - <VersionInfo Name="DLL">False</VersionInfo> - <VersionInfo Name="Locale">1033</VersionInfo> - <VersionInfo Name="CodePage">1252</VersionInfo> - </VersionInfo> - <VersionInfoKeys> - <VersionInfoKeys Name="CompanyName"/> - <VersionInfoKeys Name="FileDescription"/> - <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> - <VersionInfoKeys Name="InternalName"/> - <VersionInfoKeys Name="LegalCopyright"/> - <VersionInfoKeys Name="LegalTrademarks"/> - <VersionInfoKeys Name="OriginalFilename"/> - <VersionInfoKeys Name="ProductName"/> - <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> - <VersionInfoKeys Name="Comments"/> - </VersionInfoKeys> - </Delphi.Personality> - <Platforms> - <Platform value="Win64">False</Platform> - <Platform value="Win32">True</Platform> - </Platforms> - </BorlandProject> - <ProjectFileVersion>12</ProjectFileVersion> - </ProjectExtensions> - <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> - </Project> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{587E0156-166D-4A1E-B620-1392C9EFEB8E}</ProjectGuid> + <MainSource>IOCoreRtl.dpk</MainSource> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Release</Config> + <AppType>Package</AppType> + <FrameworkType>VCL</FrameworkType> + <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> + <ProjectVersion>14.3</ProjectVersion> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''"> + <Base_Win32>true</Base_Win32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''"> + <Cfg_1>true</Cfg_1> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''"> + <Cfg_1_Win32>true</Cfg_1_Win32> + <CfgParent>Cfg_1</CfgParent> + <Cfg_1>true</Cfg_1> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''"> + <Cfg_2>true</Cfg_2> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <VerInfo_Locale>1033</VerInfo_Locale> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace> + <DCC_ImageBase>00400000</DCC_ImageBase> + <DllSuffix>_D15</DllSuffix> + <GenPackage>true</GenPackage> + <RuntimeOnlyPackage>true</RuntimeOnlyPackage> + <DCC_TypedAtParameter>true</DCC_TypedAtParameter> + <DCC_Description>InstantObjects Run-Time Package (Delphi XE)</DCC_Description> + <DCC_S>false</DCC_S> + <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> + <GenDll>true</GenDll> + <DCC_N>false</DCC_N> + <DCC_E>false</DCC_E> + <DCC_F>false</DCC_F> + <DCC_K>false</DCC_K> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_Locale>1033</VerInfo_Locale> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_DebugInformation>false</DCC_DebugInformation> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <DCC_Description>InstantObjects Run-Time Package (Delphi XE3)</DCC_Description> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <DllSuffix>_D17</DllSuffix> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + <DCC_Optimize>false</DCC_Optimize> + <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> + </PropertyGroup> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="rtl.dcp"/> + <DCCReference Include="vcl.dcp"/> + <DCCReference Include="dbrtl.dcp"/> + <DCCReference Include="vcldb.dcp"/> + <DCCReference Include="..\InstantUtils.pas"/> + <DCCReference Include="..\InstantClasses.pas"/> + <DCCReference Include="..\InstantConsts.pas"/> + <DCCReference Include="..\InstantRtti.pas"/> + <DCCReference Include="..\InstantCommand.pas"/> + <DCCReference Include="..\InstantPersistence.pas"/> + <DCCReference Include="..\InstantExplorer.pas"/> + <DCCReference Include="..\InstantDesignHook.pas"/> + <DCCReference Include="..\InstantCode.pas"/> + <DCCReference Include="..\InstantTextFiler.pas"/> + <DCCReference Include="..\InstantPresentation.pas"/> + <DCCReference Include="..\InstantAccessors.pas"/> + <DCCReference Include="..\InstantConnectionManagerFormUnit.pas"> + <Form>InstantConnectionManagerForm</Form> + </DCCReference> + <DCCReference Include="..\InstantConnectionManager.pas"/> + <DCCReference Include="..\InstantImageUtils.pas"/> + <DCCReference Include="..\InstantPump.pas"/> + <DCCReference Include="..\InstantDBBuild.pas"/> + <DCCReference Include="..\InstantDBEvolution.pas"/> + <DCCReference Include="..\InstantCustomDBEvolverFormUnit.pas"> + <Form>InstantCustomDBEvolverForm</Form> + </DCCReference> + <DCCReference Include="..\InstantDBEvolverFormUnit.pas"> + <Form>InstantDBEvolverForm</Form> + </DCCReference> + <DCCReference Include="..\InstantDBBuilderFormUnit.pas"> + <Form>InstantDBBuilderForm</Form> + </DCCReference> + <DCCReference Include="..\InstantTypes.pas"/> + <DCCReference Include="..\InstantBrokers.pas"/> + <DCCReference Include="..\InstantMetadata.pas"/> + <DCCReference Include="..\InstantStandardValidators.pas"/> + <DCCReference Include="..\InstantValidation.pas"/> + <DCCReference Include="..\InstantRttiAttributes.pas"/> + <BuildConfiguration Include="Debug"> + <Key>Cfg_2</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + <BuildConfiguration Include="Base"> + <Key>Base</Key> + </BuildConfiguration> + <BuildConfiguration Include="Release"> + <Key>Cfg_1</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + </ItemGroup> + <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>Package</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Source> + <Source Name="MainSource">IOCoreRtl.dpk</Source> + </Source> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">True</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1033</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"/> + <VersionInfoKeys Name="FileDescription"/> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"/> + <VersionInfoKeys Name="LegalCopyright"/> + <VersionInfoKeys Name="LegalTrademarks"/> + <VersionInfoKeys Name="OriginalFilename"/> + <VersionInfoKeys Name="ProductName"/> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"/> + </VersionInfoKeys> + <Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k170.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <Platforms> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> +</Project> Modified: trunk/Source/Core/DXE3/IOCoreRtl.res =================================================================== (Binary files differ) Modified: trunk/Source/Design/D10/DclIOCore.dproj =================================================================== --- trunk/Source/Design/D10/DclIOCore.dproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/Design/D10/DclIOCore.dproj 2016-05-31 17:36:59 UTC (rev 975) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.0</ProjectVersion> + <ProjectVersion>18.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> Deleted: trunk/Source/Design/DXE3/DclIOCore.identcache =================================================================== (Binary files differ) Modified: trunk/Source/InstantDefines.inc =================================================================== --- trunk/Source/InstantDefines.inc 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/InstantDefines.inc 2016-05-31 17:36:59 UTC (rev 975) @@ -230,6 +230,30 @@ {$LIBSUFFIX '_D23'} {$ENDIF} +// Delphi 10.1 Berlin +{$IFDEF VER310} + {$DEFINE D5+} + {$DEFINE D6+} + {$DEFINE D7+} + {$DEFINE D9+} + {$DEFINE D10+} + {$DEFINE D11+} + {$DEFINE D12+} + {$DEFINE D14+} + {$DEFINE D15+} + {$DEFINE D16+} + {$DEFINE D17+} + {$DEFINE D18+} + {$DEFINE D19+} + {$DEFINE D20+} + {$DEFINE D21+} + {$DEFINE D22+} + {$DEFINE D23+} + {$DEFINE D24} + {$DEFINE D24+} + {$LIBSUFFIX '_D23'} +{$ENDIF} + {$IFDEF FPC} {$DEFINE D5+} {$DEFINE D6+} Modified: trunk/Source/PackageGroups/D2010/DesignTimePackages.groupproj =================================================================== --- trunk/Source/PackageGroups/D2010/DesignTimePackages.groupproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/PackageGroups/D2010/DesignTimePackages.groupproj 2016-05-31 17:36:59 UTC (rev 975) @@ -9,9 +9,6 @@ <Projects Include="..\..\Brokers\ADO\D2010\DclIOADO.dproj"> <Dependencies/> </Projects> - <Projects Include="..\..\Brokers\BDE\D2010\DclIOBDE.dproj"> - <Dependencies/> - </Projects> <Projects Include="..\..\Brokers\DBX\D2010\DclIODBX.dproj"> <Dependencies/> </Projects> @@ -49,15 +46,6 @@ <Target Name="DclIOADO:Make"> <MSBuild Targets="Make" Projects="..\..\Brokers\ADO\D2010\DclIOADO.dproj"/> </Target> - <Target Name="DclIOBDE"> - <MSBuild Projects="..\..\Brokers\BDE\D2010\DclIOBDE.dproj"/> - </Target> - <Target Name="DclIOBDE:Clean"> - <MSBuild Targets="Clean" Projects="..\..\Brokers\BDE\D2010\DclIOBDE.dproj"/> - </Target> - <Target Name="DclIOBDE:Make"> - <MSBuild Targets="Make" Projects="..\..\Brokers\BDE\D2010\DclIOBDE.dproj"/> - </Target> <Target Name="DclIODBX"> <MSBuild Projects="..\..\Brokers\DBX\D2010\DclIODBX.dproj"/> </Target> @@ -86,13 +74,13 @@ <MSBuild Targets="Make" Projects="..\..\Brokers\XML\D2010\DclIOXML.dproj"/> </Target> <Target Name="Build"> - <CallTarget Targets="DclIOCore;DclIOADO;DclIOBDE;DclIODBX;DclIOIBX;DclIOXML"/> + <CallTarget Targets="DclIOCore;DclIOADO;DclIODBX;DclIOIBX;DclIOXML"/> </Target> <Target Name="Clean"> - <CallTarget Targets="DclIOCore:Clean;DclIOADO:Clean;DclIOBDE:Clean;DclIODBX:Clean;DclIOIBX:Clean;DclIOXML:Clean"/> + <CallTarget Targets="DclIOCore:Clean;DclIOADO:Clean;DclIODBX:Clean;DclIOIBX:Clean;DclIOXML:Clean"/> </Target> <Target Name="Make"> - <CallTarget Targets="DclIOCore:Make;DclIOADO:Make;DclIOBDE:Make;DclIODBX:Make;DclIOIBX:Make;DclIOXML:Make"/> + <CallTarget Targets="DclIOCore:Make;DclIOADO:Make;DclIODBX:Make;DclIOIBX:Make;DclIOXML:Make"/> </Target> <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/> </Project> Modified: trunk/Source/PackageGroups/D2010/RunTimePackages.groupproj =================================================================== --- trunk/Source/PackageGroups/D2010/RunTimePackages.groupproj 2015-09-07 09:48:26 UTC (rev 974) +++ trunk/Source/PackageGroups/D2010/RunTimePackages.groupproj 2016-05-31 17:36:59 UTC (rev 975) @@ -18,9 +18,6 @@ <Projects Include="..\..\Brokers\ADO\D2010\IOADO.dproj"> <Dependencies/> </Projects> - <Projects Include="..\..\Brokers\BDE\D2010\IOBDE.dproj"> - <Dependencies/> - </Projects> <Projects Include="..\..\Brokers\DBX\D2010\IODBX.dproj"> <Dependencies/> </Projects> @@ -85,15 +82,6 @@ <Target Name="IOADO:Make"> <MSBuild Targets="Make" Projects="..\..\Brokers\ADO\D2010\IOADO.dproj"/> </Target> - <Target Name="IOBDE"> - <MSBuild Projects="..\..\Brokers\BDE\D2010\IOBDE.dproj"/> - </Target> - <Target Name="IOBDE:Clean"> - <MSBuild Targets="Clean" Projects="..\..\Brokers\BDE\D2010\IOBDE.dproj"/> - </Target> - <Target Name="IOBDE:Make"> - <MSBuild Targets="Make" Projects="..\..\Brokers\BDE\D2010\IOBDE.dproj"/> - </Target> <Target Name="IODBX"> <MSBuild Projects="..\..\Brokers\DBX\D2010\IODBX.dproj"/> </Target> @@ -122,13 +110,13 @@ <MSBuild Targets="Make" Projects="..\..\Brokers\XML\D2010\IOXML.dproj"/> </Target> <Target Name="Build"> - <CallTarget Targets="IOCore;IOIBFbCatalog;IOMSSqlCatalog;IOMySQLCatalog;IOADO;IOBDE;IODBX;IOIBX;IOXML"/> + <CallTarget Targets="IOCore;IOIBFbCatalog;IOMSSqlCatalog;IOMySQLCatalog;IOADO;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"/> + <CallTarget Targets="IOCore:Clean;IOIBFbCatalog:Clean;IOMSSqlCatalog:Clean;IOMySQLCatalog:Clean;IOADO: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"/> + <CallTarget Targets="IOCore:Make;IOIBFbCatalog:Make;IOMSSqlCatalog:Make;IOMySQLCatalog:Make;IOADO:Make;IODBX:Make;IOIBX:Make;IOXML:Make"/> </Target> <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/> </Project> |