You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
(25) |
Oct
(10) |
Nov
(19) |
Dec
(20) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
|
Feb
(206) |
Mar
(43) |
Apr
(25) |
May
(20) |
Jun
(69) |
Jul
(121) |
Aug
(95) |
Sep
(122) |
Oct
(213) |
Nov
(46) |
Dec
(39) |
2006 |
Jan
(28) |
Feb
(57) |
Mar
(21) |
Apr
(7) |
May
(11) |
Jun
(2) |
Jul
(8) |
Aug
(13) |
Sep
(2) |
Oct
(2) |
Nov
(20) |
Dec
(16) |
2007 |
Jan
(9) |
Feb
(15) |
Mar
|
Apr
(4) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
(9) |
Oct
|
Nov
(1) |
Dec
|
2009 |
Jan
|
Feb
|
Mar
(8) |
Apr
(1) |
May
|
Jun
|
Jul
(11) |
Aug
(57) |
Sep
(2) |
Oct
(6) |
Nov
|
Dec
(7) |
2010 |
Jan
(11) |
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(27) |
Oct
(3) |
Nov
(7) |
Dec
(1) |
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(10) |
Oct
|
Nov
|
Dec
|
2012 |
Jan
(8) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(1) |
2013 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
(4) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
|
Nov
(4) |
Dec
|
2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
From: <to...@be...> - 2022-12-07 10:28:13
|
Greetings. The following is your very last notification. I compromised your operating-system using the Wireless device you were connected to. A few weeks ago, I gotten to the machines that you utilized to get on line. All of the information out of your electronics and devices has been immediately replicated to my computers. I gain access to all of your messengers, social networks, email messages, chat history, and contact-list. My computer virus repeatedly upgrades its signatures (driver based), so it remains not visible to antivirus software. I guess at this point you see, the reason why I remained unnoticed right until this exact day Whilst collecting details about yourself, I noticed you happen to be a major fan of porn sites and even more. You truly love to go to porno websites & view kinky video clips while getting an orgasmic pleasure. I've actually made a web cam shooting videos of you wanking off. The editing of the videos you were watching at that time & your self pleasure. Your facial expression is distinctly obvious. I do not think this type of material will be really good for your personal reputation. I can forward this video footage out to every person who know who you are. I additionally have no problem with rendering all of your private info open to public through the web. I do believe you know exactly what I mean. It could be a real disaster for you. I am able to destroy your way of life permanently. I really feel you seriously don't want that to take place. Now let's fix it in this manner: you transfer me 1300 $ (dollars) thru Bitcoin equivalent at the time of payment), & i'll asap erase all your info from my servers. Afterward, we'll ignore each other. My bitcoin transaction address for transaction: bc1q577pc4vkes0sx2972gaqv29rryapga0hrrtxhv Should you not know how to transmit cash & what btc is. Then key in the Google "Get Bitcoin". I provide you with 2 business days to transfer the money. The time started monitoring instantly once you opened up this letter. I will receive a notification the minute this e-mail is exposed. Do not attempt to search for help, as the wallet address can't be traced, e mail the letter came from & cannot be followed also & generated digitally, hence there is no reason for writing to me. Do not make an attempt to contact the police and some other security services, and if you choose to, your personal data will undoubtedly be revealed. Changing online passwords in social media sites, e mail, & gadgets will not help you, since all the info is already downloaded to my computers. Good luck & avoid doing something foolish. Think about your foreseeable future. |
From: <car...@us...> - 2018-11-22 15:05:10
|
Revision: 990 http://sourceforge.net/p/instantobjects/code/990 Author: carlobar Date: 2018-11-22 15:05:08 +0000 (Thu, 22 Nov 2018) Log Message: ----------- WARNING! PROJECT MOVED TO: https://github.com/EtheaDev/InstantObjects Modified Paths: -------------- trunk/Readme1st.txt Modified: trunk/Readme1st.txt =================================================================== --- trunk/Readme1st.txt 2018-11-22 14:08:44 UTC (rev 989) +++ trunk/Readme1st.txt 2018-11-22 15:05:08 UTC (rev 990) @@ -1,3 +1,6 @@ +WARNING: Project moved to https://github.com/EtheaDev/InstantObjects + + ------------------------------------------------------------------ InstantObjects for Delphi - Full Unicode version |
From: <car...@us...> - 2018-11-22 14:08:47
|
Revision: 989 http://sourceforge.net/p/instantobjects/code/989 Author: carlobar Date: 2018-11-22 14:08:44 +0000 (Thu, 22 Nov 2018) Log Message: ----------- Modified Paths: -------------- trunk/Source/Brokers/XML/InstantXML.pas trunk/Source/Brokers/XML/InstantXMLCatalog.pas trunk/Source/Core/D10_2/IOCore.dproj trunk/Source/Core/InstantPersistence.pas trunk/Source/Core/InstantPresentation.pas trunk/Source/InstantDefines.inc Modified: trunk/Source/Brokers/XML/InstantXML.pas =================================================================== --- trunk/Source/Brokers/XML/InstantXML.pas 2018-11-22 11:17:52 UTC (rev 988) +++ trunk/Source/Brokers/XML/InstantXML.pas 2018-11-22 14:08:44 UTC (rev 989) @@ -331,7 +331,7 @@ uses SysUtils, InstantConsts, TypInfo, InstantXMLCatalog, InstantUtils, -{$IFNDEF FMX} +{$IFNDEF INSTANTOBJECTS_FMX} InstantXMLConnectionDefEdit, FileCtrl, Controls, {$ENDIF} Windows; @@ -451,7 +451,7 @@ function TInstantXMLConnectionDef.Edit: Boolean; begin -{$IFNDEF FMX} +{$IFNDEF INSTANTOBJECTS_FMX} with TInstantXMLConnectionDefEditForm.Create(nil) do try LoadData(Self); Modified: trunk/Source/Brokers/XML/InstantXMLCatalog.pas =================================================================== --- trunk/Source/Brokers/XML/InstantXMLCatalog.pas 2018-11-22 11:17:52 UTC (rev 988) +++ trunk/Source/Brokers/XML/InstantXMLCatalog.pas 2018-11-22 14:08:44 UTC (rev 989) @@ -42,7 +42,7 @@ interface uses -{$IFNDEF FMX} +{$IFNDEF INSTANTOBJECTS_FMX} FileCtrl, {$ENDIF} InstantPersistence, InstantBrokers, InstantMetadata, InstantTypes; Modified: trunk/Source/Core/D10_2/IOCore.dproj =================================================================== --- trunk/Source/Core/D10_2/IOCore.dproj 2018-11-22 11:17:52 UTC (rev 988) +++ trunk/Source/Core/D10_2/IOCore.dproj 2018-11-22 14:08:44 UTC (rev 989) @@ -1,4 +1,4 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectGuid>{E05C5686-CAF4-44C4-81A4-CEC21E8392DD}</ProjectGuid> <MainSource>IOCore.dpk</MainSource> @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.2</ProjectVersion> + <ProjectVersion>18.4</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> @@ -18,16 +18,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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> @@ -49,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -91,20 +69,6 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </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> @@ -123,12 +87,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -229,11 +187,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Core/InstantPersistence.pas =================================================================== --- trunk/Source/Core/InstantPersistence.pas 2018-11-22 11:17:52 UTC (rev 988) +++ trunk/Source/Core/InstantPersistence.pas 2018-11-22 14:08:44 UTC (rev 989) @@ -41,7 +41,7 @@ interface uses - {$IFDEF FMX}FMX.Objects,{$ELSE}Graphics,{$ENDIF} + {$IFDEF INSTANTOBJECTS_FMX}FMX.Objects,{$ELSE}Graphics,{$ENDIF} Classes, {$IFNDEF NEXTGEN}Contnrs,{$ENDIF} SysUtils, DB, InstantClasses, InstantCommand, InstantConsts, InstantMetadata, InstantTypes; @@ -463,7 +463,7 @@ public destructor Destroy; override; procedure Assign(Source: TPersistent); override; -{$IFDEF FMX} +{$IFDEF INSTANTOBJECTS_FMX} procedure AssignPicture(Source: TImage); procedure AssignToPicture(Dest: TImage); {$ELSE} @@ -1600,7 +1600,7 @@ procedure InstantUnregisterClasses(AClasses: array of TInstantObjectClass); function InstantResolveGraphicFileType(AStream: TStream ): TInstantGraphicFileFormat; -{$IFNDEF FMX} +{$IFNDEF INSTANTOBJECTS_FMX} procedure InstantRegisterGraphicClass(InstantGraphicFileFormat : TInstantGraphicFileFormat; AGraphicClass: TGraphicClass); function InstantGraphicFileFormatToGraphicClass(InstantGraphicFileFormat : TInstantGraphicFileFormat) : TGraphicClass; @@ -1651,7 +1651,7 @@ var ConnectorClasses: TList; ClassList: TList; -{$IFNDEF FMX} +{$IFNDEF INSTANTOBJECTS_FMX} GraphicClassList: array[TInstantGraphicFileFormat] OF TGraphicClass; {$ENDIF} RuntimeModel: TInstantModel; @@ -2052,7 +2052,7 @@ end; end; -{$IFNDEF FMX} +{$IFNDEF INSTANTOBJECTS_FMX} procedure InstantRegisterGraphicClass(InstantGraphicFileFormat : TInstantGraphicFileFormat; AGraphicClass: TGraphicClass); begin @@ -3793,7 +3793,7 @@ Writer.WriteBinary(SaveDataToStream); end; -{$IFDEF FMX} +{$IFDEF INSTANTOBJECTS_FMX} procedure TInstantBlob.AssignPicture(Source: TImage); begin if Assigned(Source.Bitmap) then @@ -3871,7 +3871,7 @@ procedure TInstantBlob.AssignTo(Dest: TPersistent); begin -{$IFDEF FMX} +{$IFDEF INSTANTOBJECTS_FMX} if Dest is TImage then AssignToPicture(TImage(Dest)) else @@ -9323,7 +9323,7 @@ TInstantObjectReference, TInstantConnectionDefs, TInstantConnectionDef]); ClassList := TList.Create; {$IFDEF MSWINDOWS} -{$IFNDEF FMX} +{$IFNDEF INSTANTOBJECTS_FMX} GraphicClassList[gffIco] := Graphics.TIcon; GraphicClassList[gffBmp] := Graphics.TBitmap; {$IFNDEF FPC} Modified: trunk/Source/Core/InstantPresentation.pas =================================================================== --- trunk/Source/Core/InstantPresentation.pas 2018-11-22 11:17:52 UTC (rev 988) +++ trunk/Source/Core/InstantPresentation.pas 2018-11-22 14:08:44 UTC (rev 989) @@ -3894,6 +3894,8 @@ ClearRecord(Buffer) else begin Obj := Objects[Pred(RecNo)]; + if not Assigned(Obj) then + raise Exception.Create('Critical error: object not found!'); CopyObjectToBuffer(Obj, Buffer); with GetRecInfo(Buffer)^ do begin Modified: trunk/Source/InstantDefines.inc =================================================================== --- trunk/Source/InstantDefines.inc 2018-11-22 11:17:52 UTC (rev 988) +++ trunk/Source/InstantDefines.inc 2018-11-22 14:08:44 UTC (rev 989) @@ -57,6 +57,7 @@ {$DEFINE D12+} {$ENDIF} +// Delphi 2010 {$IFDEF VER210} {$DEFINE D5+} {$DEFINE D6+} @@ -69,6 +70,7 @@ {$DEFINE D14+} {$ENDIF} +// Delphi XE {$IFDEF VER220} {$DEFINE D5+} {$DEFINE D6+} @@ -82,6 +84,7 @@ {$DEFINE D15+} {$ENDIF} +// Delphi XE2 {$IFDEF VER230} {$DEFINE D5+} {$DEFINE D6+} @@ -276,6 +279,31 @@ {$DEFINE D25+} {$ENDIF} +// Delphi 10.3 Rio +{$IFDEF VER330} + {$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 D25+} + {$DEFINE D26} + {$DEFINE D26+} +{$ENDIF} + {$IFDEF FPC} {$DEFINE D5+} {$DEFINE D6+} |
From: <car...@us...> - 2018-11-22 11:17:54
|
Revision: 988 http://sourceforge.net/p/instantobjects/code/988 Author: carlobar Date: 2018-11-22 11:17:52 +0000 (Thu, 22 Nov 2018) Log Message: ----------- Added Paths: ----------- trunk/Demos/PrimerCross/Primer_D10_3.mdr trunk/Demos/PrimerCross/Primer_D10_3.res trunk/Demos/PrimerFireMonkey/Projects/D10_3/ trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.mdr trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.res Added: trunk/Demos/PrimerCross/Primer_D10_3.mdr =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_D10_3.mdr =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_3.mdr 2018-11-22 10:48:18 UTC (rev 987) +++ trunk/Demos/PrimerCross/Primer_D10_3.mdr 2018-11-22 11:17:52 UTC (rev 988) Property changes on: trunk/Demos/PrimerCross/Primer_D10_3.mdr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10_3.res =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_D10_3.res =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_3.res 2018-11-22 10:48:18 UTC (rev 987) +++ trunk/Demos/PrimerCross/Primer_D10_3.res 2018-11-22 11:17:52 UTC (rev 988) Property changes on: trunk/Demos/PrimerCross/Primer_D10_3.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.mdr =================================================================== (Binary files differ) Index: trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.mdr =================================================================== --- trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.mdr 2018-11-22 10:48:18 UTC (rev 987) +++ trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.mdr 2018-11-22 11:17:52 UTC (rev 988) Property changes on: trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.mdr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.res =================================================================== (Binary files differ) Index: trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.res =================================================================== --- trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.res 2018-11-22 10:48:18 UTC (rev 987) +++ trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.res 2018-11-22 11:17:52 UTC (rev 988) Property changes on: trunk/Demos/PrimerFireMonkey/Projects/D10_3/PrimerFM.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property |
From: <car...@us...> - 2018-11-22 10:48:21
|
Revision: 987 http://sourceforge.net/p/instantobjects/code/987 Author: carlobar Date: 2018-11-22 10:48:18 +0000 (Thu, 22 Nov 2018) Log Message: ----------- Demos updated Modified Paths: -------------- trunk/Demos/Intro/Intro.dproj trunk/Demos/Intro/Intro.res trunk/Demos/Intro/Main.dfm trunk/Demos/Intro/Main.pas trunk/Demos/Intro/PersonEdit.dfm trunk/Demos/PrimerCross/QueryView.dfm trunk/Demos/PrimerCross/QueryView.pas trunk/Demos/PrimerCross/RandomData.pas trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj trunk/Demos/PrimerFireMonkey/Source/DemoData.pas trunk/Demos/PrimerFireMonkey/Source/Main.fmx trunk/Demos/PrimerFireMonkey/Source/Main.pas Added Paths: ----------- trunk/Demos/PrimerFireMonkey/Bin/ trunk/Demos/PrimerFireMonkey/Database/ Removed Paths: ------------- trunk/Demos/Intro/Database/Company.DB trunk/Demos/Intro/Database/Company.PX trunk/Demos/Intro/Database/Company.VAL trunk/Demos/Intro/Database/Contact.DB trunk/Demos/Intro/Database/Contact.MB trunk/Demos/Intro/Database/Contact.PX trunk/Demos/Intro/Database/Contact.VAL trunk/Demos/Intro/Database/Person.DB trunk/Demos/Intro/Database/Person.PX trunk/Demos/Intro/Database/Person.VAL trunk/Demos/PrimerFireMonkey/Pictures/man01.emf trunk/Demos/PrimerFireMonkey/Pictures/man02.emf trunk/Demos/PrimerFireMonkey/Pictures/man03.emf trunk/Demos/PrimerFireMonkey/Pictures/man04.emf trunk/Demos/PrimerFireMonkey/Pictures/man05.emf trunk/Demos/PrimerFireMonkey/Pictures/woman01.emf trunk/Demos/PrimerFireMonkey/Pictures/woman02.emf trunk/Demos/PrimerFireMonkey/Pictures/woman03.emf trunk/Demos/PrimerFireMonkey/Pictures/woman04.emf trunk/Demos/PrimerFireMonkey/Pictures/woman05.emf Deleted: trunk/Demos/Intro/Database/Company.DB =================================================================== (Binary files differ) Deleted: trunk/Demos/Intro/Database/Company.PX =================================================================== (Binary files differ) Deleted: trunk/Demos/Intro/Database/Company.VAL =================================================================== (Binary files differ) Deleted: trunk/Demos/Intro/Database/Contact.DB =================================================================== (Binary files differ) Deleted: trunk/Demos/Intro/Database/Contact.MB =================================================================== (Binary files differ) Deleted: trunk/Demos/Intro/Database/Contact.PX =================================================================== (Binary files differ) Deleted: trunk/Demos/Intro/Database/Contact.VAL =================================================================== (Binary files differ) Deleted: trunk/Demos/Intro/Database/Person.DB =================================================================== (Binary files differ) Deleted: trunk/Demos/Intro/Database/Person.PX =================================================================== (Binary files differ) Deleted: trunk/Demos/Intro/Database/Person.VAL =================================================================== (Binary files differ) Modified: trunk/Demos/Intro/Intro.dproj =================================================================== --- trunk/Demos/Intro/Intro.dproj 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/Intro/Intro.dproj 2018-11-22 10:48:18 UTC (rev 987) @@ -6,7 +6,7 @@ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> <DCC_DependencyCheckOutputName>Intro.exe</DCC_DependencyCheckOutputName> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.1</ProjectVersion> + <ProjectVersion>18.5</ProjectVersion> <Base>True</Base> <Config Condition="'$(Config)'==''">Release</Config> <Platform Condition="'$(Platform)'==''">Win32</Platform> @@ -31,12 +31,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''"> - <Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64> - <CfgParent>Cfg_1</CfgParent> - <Cfg_1>true</Cfg_1> - <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> @@ -68,9 +62,13 @@ <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <VerInfo_Locale>1033</VerInfo_Locale> <Icon_MainIcon>Intro_Icon.ico</Icon_MainIcon> + <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44> + <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150> </PropertyGroup> <PropertyGroup Condition="'$(Base_Win64)'!=''"> <Icon_MainIcon>Intro_Icon.ico</Icon_MainIcon> + <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44> + <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1)'!=''"> <Version>7.0</Version> @@ -85,14 +83,12 @@ <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE> <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''"> - <BT_BuildType>Debug</BT_BuildType> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_Locale>1033</VerInfo_Locale> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> - <AppEnableHighDPI>true</AppEnableHighDPI> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> + <BT_BuildType>Debug</BT_BuildType> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2)'!=''"> <Version>7.0</Version> @@ -111,7 +107,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> - <AppEnableHighDPI>true</AppEnableHighDPI> + <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> </PropertyGroup> <ProjectExtensions> <Borland.Personality>Delphi.Personality.12</Borland.Personality> @@ -164,7 +160,6 @@ </Excluded_Packages> </Delphi.Personality> <Platforms> - <Platform value="iOSDevice64">False</Platform> <Platform value="Win32">True</Platform> <Platform value="Win64">False</Platform> </Platforms> Modified: trunk/Demos/Intro/Intro.res =================================================================== (Binary files differ) Modified: trunk/Demos/Intro/Main.dfm =================================================================== --- trunk/Demos/Intro/Main.dfm 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/Intro/Main.dfm 2018-11-22 10:48:18 UTC (rev 987) @@ -33,7 +33,7 @@ Height = 233 Anchors = [akLeft, akTop, akRight, akBottom] DataSource = ContactsSource - TabOrder = 1 + TabOrder = 2 TitleFont.Charset = DEFAULT_CHARSET TitleFont.Color = clWindowText TitleFont.Height = -11 @@ -67,7 +67,7 @@ Height = 25 Anchors = [akRight, akBottom] Caption = 'Add Person' - TabOrder = 2 + TabOrder = 3 OnClick = AddPersonButtonClick end object AddCompanyButton: TButton @@ -77,7 +77,7 @@ Height = 25 Anchors = [akRight, akBottom] Caption = 'Add Company' - TabOrder = 3 + TabOrder = 4 OnClick = AddCompanyButtonClick end object EditContactButton: TButton @@ -87,7 +87,7 @@ Height = 25 Anchors = [akRight, akBottom] Caption = 'Edit Contact' - TabOrder = 4 + TabOrder = 5 OnClick = EditContactButtonClick end object ExploreButton: TButton @@ -97,9 +97,19 @@ Height = 25 Anchors = [akRight, akBottom] Caption = 'Explore' - TabOrder = 5 + TabOrder = 6 OnClick = ExploreButtonClick end + object GenerateDataButton: TButton + Left = 8 + Top = 279 + Width = 97 + Height = 25 + Anchors = [akRight, akBottom] + Caption = 'Generate Data...' + TabOrder = 1 + OnClick = GenerateDataButtonClick + end object ContactSelector: TInstantSelector Command.Strings = ( 'SELECT * FROM ANY TContact ORDER BY Name') Modified: trunk/Demos/Intro/Main.pas =================================================================== --- trunk/Demos/Intro/Main.pas 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/Intro/Main.pas 2018-11-22 10:48:18 UTC (rev 987) @@ -19,6 +19,7 @@ ExploreButton: TButton; InstantXMLConnector: TInstantXMLConnector; XMLFileAccessor: TXMLFilesAccessor; + GenerateDataButton: TButton; procedure AddPersonButtonClick(Sender: TObject); procedure AddCompanyButtonClick(Sender: TObject); procedure EditContactButtonClick(Sender: TObject); @@ -25,10 +26,12 @@ procedure ExploreButtonClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure ContactGridDblClick(Sender: TObject); + procedure GenerateDataButtonClick(Sender: TObject); private function EditContact(Contact: TContact): Boolean; procedure CreateRandomContacts(Count: Integer); procedure EditCurrentContact; + procedure GenerateRandomData(const ANumber: Integer); public end; @@ -111,16 +114,26 @@ ContactSelector.Open; if ContactSelector.Eof then begin - ContactSelector.Close; - try - //First Time: create of Random Data - CreateRandomContacts(100); - finally - ContactSelector.Open; - end; + //First Time: create of Random Data + GenerateRandomData(30); end; end; +procedure TMainForm.GenerateDataButtonClick(Sender: TObject); +begin + GenerateRandomData(10); +end; + +procedure TMainForm.GenerateRandomData(const ANumber: Integer); +begin + ContactSelector.Close; + try + CreateRandomContacts(ANumber); + finally + ContactSelector.Open; + end; +end; + procedure TMainForm.ContactGridDblClick(Sender: TObject); begin EditCurrentContact; Modified: trunk/Demos/Intro/PersonEdit.dfm =================================================================== --- trunk/Demos/Intro/PersonEdit.dfm 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/Intro/PersonEdit.dfm 2018-11-22 10:48:18 UTC (rev 987) @@ -1,8 +1,6 @@ inherited PersonEditForm: TPersonEditForm Caption = 'Person' - ClientHeight = 237 OldCreateOrder = True - ExplicitHeight = 266 PixelsPerInch = 96 TextHeight = 13 object Label6: TLabel [5] @@ -16,16 +14,9 @@ TabOrder = 5 end inherited OkButton: TButton - Top = 208 TabOrder = 6 - ExplicitTop = 208 end - inherited CancelButton: TButton - Top = 208 - TabOrder = 7 - ExplicitTop = 208 - end - object DBEdit5: TDBEdit [13] + object DBEdit5: TDBEdit [12] Left = 8 Top = 184 Width = 95 @@ -34,6 +25,9 @@ DataSource = ContactSource TabOrder = 4 end + inherited CancelButton: TButton + TabOrder = 7 + end inherited ContactExposer: TInstantExposer ObjectClassName = 'TPerson' Top = 208 Modified: trunk/Demos/PrimerCross/QueryView.dfm =================================================================== --- trunk/Demos/PrimerCross/QueryView.dfm 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/PrimerCross/QueryView.dfm 2018-11-22 10:48:18 UTC (rev 987) @@ -1,23 +1,53 @@ inherited QueryViewForm: TQueryViewForm Width = 772 Height = 320 + ExplicitWidth = 772 + ExplicitHeight = 320 object Splitter: TSplitter Left = 0 - Top = 147 + Top = 182 Width = 772 Height = 6 Cursor = crVSplit Align = alTop + ExplicitTop = 147 end - object CommandPanel: TPanel + object ExamplePanel: TPanel Left = 0 Top = 0 Width = 772 + Height = 35 + Align = alTop + BevelOuter = bvLowered + TabOrder = 0 + object ExampleLabel: TLabel + Left = 27 + Top = 16 + Width = 40 + Height = 13 + Caption = 'E&xample' + FocusControl = ExampleComboBox + end + object ExampleComboBox: TComboBox + Left = 73 + Top = 8 + Width = 666 + Height = 21 + Style = csDropDownList + DropDownCount = 12 + TabOrder = 0 + OnClick = ExampleComboBoxClick + end + end + object CommandPanel: TPanel + Left = 0 + Top = 35 + Width = 772 Height = 147 Align = alTop - BevelOuter = bvNone + BevelOuter = bvLowered BorderWidth = 30 - TabOrder = 0 + TabOrder = 1 object CommandLabel: TLabel Left = 30 Top = 14 @@ -26,14 +56,6 @@ Caption = '&Command' FocusControl = CommandEdit end - object ExampleLabel: TLabel - Left = 315 - Top = 125 - Width = 40 - Height = 13 - Caption = 'E&xample' - FocusControl = ExampleComboBox - end object NumberLabel: TLabel Left = 614 Top = 126 @@ -45,8 +67,8 @@ FocusControl = MaxCountEdit end object Label1: TLabel - Left = 168 - Top = 124 + Left = 473 + Top = 125 Width = 26 Height = 13 Caption = 'Mode' @@ -53,12 +75,11 @@ FocusControl = LoadModeComboBox end object CommandEdit: TMemo - Left = 30 - Top = 30 - Width = 712 - Height = 87 + Left = 31 + Top = 31 + Width = 710 + Height = 85 Align = alClient - ParentFont = True TabOrder = 0 end object ExecuteButton: TButton @@ -69,16 +90,6 @@ Action = ExecuteAction TabOrder = 1 end - object ExampleComboBox: TComboBox - Left = 361 - Top = 121 - Width = 268 - Height = 21 - Style = csDropDownList - DropDownCount = 12 - TabOrder = 4 - OnClick = ExampleComboBoxClick - end object MaxCountEdit: TMaskEdit Left = 695 Top = 122 @@ -90,13 +101,13 @@ Text = '0 ' end object LoadModeComboBox: TComboBox - Left = 202 - Top = 121 + Left = 507 + Top = 122 Width = 101 Height = 21 Style = csDropDownList ItemIndex = 0 - TabOrder = 3 + TabOrder = 4 Text = 'Keys First' Items.Strings = ( 'Keys First' @@ -104,8 +115,8 @@ 'Full Burst') end object FetchAllCheckBox: TCheckBox - Left = 95 - Top = 116 + Left = 111 + Top = 123 Width = 64 Height = 17 Alignment = taLeftJustify @@ -113,23 +124,23 @@ TabOrder = 2 end object StatementCacheCheckBox: TCheckBox - Left = 95 - Top = 131 - Width = 64 + Left = 199 + Top = 123 + Width = 106 Height = 17 Alignment = taLeftJustify - Caption = 'S. Cache' - TabOrder = 6 + Caption = 'Statement Cache' + TabOrder = 3 end end object ResultPageControl: TPageControl Left = 0 - Top = 153 + Top = 188 Width = 772 - Height = 167 + Height = 132 ActivePage = ResultTabSheet Align = alClient - TabOrder = 1 + TabOrder = 2 object ResultTabSheet: TTabSheet Caption = 'Result' object ResultGrid: TDBGrid @@ -136,7 +147,7 @@ Left = 0 Top = 0 Width = 764 - Height = 139 + Height = 104 Align = alClient DataSource = TestSource TabOrder = 0 @@ -143,7 +154,7 @@ TitleFont.Charset = DEFAULT_CHARSET TitleFont.Color = clWindowText TitleFont.Height = -11 - TitleFont.Name = 'MS Sans Serif' + TitleFont.Name = 'Tahoma' TitleFont.Style = [] end end @@ -150,13 +161,16 @@ object TranslatedQueryTabSheet: TTabSheet Caption = 'Translated Query' ImageIndex = 1 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object TranslatedQueryMemo: TMemo Left = 0 Top = 0 Width = 764 - Height = 139 + Height = 104 Align = alClient - ParentFont = True TabOrder = 0 end end @@ -163,13 +177,16 @@ object StatsTabSheet: TTabSheet Caption = 'Stats' ImageIndex = 2 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object StatsMemo: TMemo Left = 0 Top = 0 Width = 764 - Height = 139 + Height = 104 Align = alClient - ParentFont = True TabOrder = 0 end end Modified: trunk/Demos/PrimerCross/QueryView.pas =================================================================== --- trunk/Demos/PrimerCross/QueryView.pas 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/PrimerCross/QueryView.pas 2018-11-22 10:48:18 UTC (rev 987) @@ -26,8 +26,6 @@ CommandEdit: TMemo; CommandLabel: TLabel; CommandPanel: TPanel; - ExampleComboBox: TComboBox; - ExampleLabel: TLabel; ExecuteAction: TAction; ExecuteButton: TButton; ResultGrid: TDBGrid; @@ -46,6 +44,9 @@ StatsMemo: TMemo; FetchAllCheckBox: TCheckBox; StatementCacheCheckBox: TCheckBox; + ExamplePanel: TPanel; + ExampleLabel: TLabel; + ExampleComboBox: TComboBox; procedure ExecuteActionExecute(Sender: TObject); procedure ExampleComboBoxClick(Sender: TObject); procedure TestSelectorAfterScroll(DataSet: TDataSet); Modified: trunk/Demos/PrimerCross/RandomData.pas =================================================================== --- trunk/Demos/PrimerCross/RandomData.pas 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/PrimerCross/RandomData.pas 2018-11-22 10:48:18 UTC (rev 987) @@ -93,7 +93,7 @@ 'Detroit', 'Houston', 'Indianapolis', 'Kansas City', 'Las Vegas', 'Los Angeles', 'Memphis', 'Miami', 'Minneapolis', 'Nashville', 'New Orleans', 'New York', 'Oklahoma', 'Omaha', 'Philadelphia', - 'Pittsburgh', 'Portland', 'San Diego', 'San Fransisco', 'Seattle', 'Tampa', + 'Pittsburgh', 'Portland', 'San Diego', 'San Francisco', 'Seattle', 'Tampa', 'Utah', 'Washington'); DomainSuffixes: array[0..4] of string = ( Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man01.emf =================================================================== (Binary files differ) Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man02.emf =================================================================== (Binary files differ) Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man03.emf =================================================================== (Binary files differ) Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man04.emf =================================================================== (Binary files differ) Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man05.emf =================================================================== (Binary files differ) Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman01.emf =================================================================== (Binary files differ) Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman02.emf =================================================================== (Binary files differ) Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman03.emf =================================================================== (Binary files differ) Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman04.emf =================================================================== (Binary files differ) Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman05.emf =================================================================== (Binary files differ) Modified: trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj =================================================================== --- trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj 2018-11-22 10:48:18 UTC (rev 987) @@ -40,7 +40,7 @@ <Base>true</Base> </PropertyGroup> <PropertyGroup Condition="'$(Base)'!=''"> - <DCC_Define>FMX;$(DCC_Define)</DCC_Define> + <DCC_Define>INSTANTOBJECTS_FMX;$(DCC_Define)</DCC_Define> <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> <VerInfo_Locale>1040</VerInfo_Locale> <Manifest_File>None</Manifest_File> @@ -49,7 +49,7 @@ <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon> <DCC_UnitSearchPath>..\..\..\..\Source\Core;..\..\..\..\Source\Catalogs;..\..\..\..\Source\Brokers\XML;..\..\..\..\Source\Brokers\DBX;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput> - <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput> + <DCC_ExeOutput>..\..\Bin</DCC_ExeOutput> <DCC_E>false</DCC_E> <DCC_N>false</DCC_N> <DCC_S>false</DCC_S> @@ -144,8 +144,8 @@ <Source Name="MainSource">PrimerFM.dpr</Source> </Source> <Excluded_Packages> - <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> - <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</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> <Deployment/> Modified: trunk/Demos/PrimerFireMonkey/Source/DemoData.pas =================================================================== --- trunk/Demos/PrimerFireMonkey/Source/DemoData.pas 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/PrimerFireMonkey/Source/DemoData.pas 2018-11-22 10:48:18 UTC (rev 987) @@ -10,7 +10,7 @@ uses Classes, Model, InstantPersistence, - {$IFDEF FMX}FMX.Objects,{$ELSE}Graphics,{$ENDIF} + {$IFDEF INSTANTOBJECTS_FMX}FMX.Objects,{$ELSE}Graphics,{$ENDIF} RandomData; @@ -28,12 +28,7 @@ procedure AssignRandomPicture(Male : boolean; InstantBlob : TInstantBlob); const -{$IFDEF MSWINDOWS} - ARandomExt : Array[0..2] of string = ('.bmp','.jpg','.emf'); -{$ENDIF} -{$IFDEF LINUX} ARandomExt : Array[0..2] of string = ('.bmp','.jpg','.png'); -{$ENDIF} var Picture: TImage; PictureName : string; @@ -43,7 +38,7 @@ PictureName := 'man'+PictureName else PictureName := 'woman'+PictureName; - PictureName := ExtractFilePath(ParamStr(0))+'..\..\..\..\Pictures'+PathDelim+PictureName; + PictureName := ExtractFilePath(ParamStr(0))+'..\Pictures'+PathDelim+PictureName; if FileExists(PictureName) then begin Picture := TImage.Create(nil); Modified: trunk/Demos/PrimerFireMonkey/Source/Main.fmx =================================================================== --- trunk/Demos/PrimerFireMonkey/Source/Main.fmx 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/PrimerFireMonkey/Source/Main.fmx 2018-11-22 10:48:18 UTC (rev 987) @@ -6,88 +6,61 @@ ClientWidth = 842 FormFactor.Width = 320 FormFactor.Height = 480 - FormFactor.Devices = [dkDesktop] + FormFactor.Devices = [Desktop] + DesignerMasterStyle = 0 object DBNavigator1: TBindNavigator - Height = 25.000000000000000000 Position.X = 104.000000000000000000 Position.Y = 8.000000000000000000 - Width = 240.000000000000000000 + Size.Width = 240.000000000000000000 + Size.Height = 25.000000000000000000 + Size.PlatformDefault = False DataSource = BindScopeDB1 xRadius = 4.000000000000000000 yRadius = 4.000000000000000000 object ConnectButton: TButton - DisableFocusEffect = False - Height = 25.000000000000000000 Position.X = -96.000000000000000000 + Size.Width = 80.000000000000000000 + Size.Height = 22.000000000000000000 + Size.PlatformDefault = False TabOrder = 0 Text = 'Connect...' - Width = 89.000000000000000000 OnClick = ConnectButtonClick end end object RecordLabel: TLabel - Height = 15.000000000000000000 Position.X = 352.000000000000000000 Position.Y = 14.000000000000000000 + Size.Width = 120.000000000000000000 + Size.Height = 15.000000000000000000 + Size.PlatformDefault = False Text = 'Record:' - Width = 120.000000000000000000 end object StringGrid1: TStringGrid - Touch.InteractiveGestures = [igPan] - Height = 441.000000000000000000 + CanFocus = True + ClipChildren = True Position.X = 8.000000000000000000 Position.Y = 40.000000000000000000 + Size.Width = 625.000000000000000000 + Size.Height = 353.000000000000000000 + Size.PlatformDefault = False StyleLookup = 'gridstyle' - Width = 633.000000000000000000 + RowHeight = 21.000000000000000000 RowCount = 0 - RowHeight = 21.000000000000000000 - object TStringColumn - Header = 'Name' - Height = 416.000000000000000000 - Width = 200.000000000000000000 - end - object TStringColumn - Header = 'City' - Height = 416.000000000000000000 - Position.X = 200.000000000000000000 - Width = 100.000000000000000000 - end - object TStringColumn - Header = 'Street' - Height = 416.000000000000000000 - Position.X = 300.000000000000000000 - Width = 100.000000000000000000 - end - object TStringColumn - Header = 'Zip' - Height = 416.000000000000000000 - Position.X = 400.000000000000000000 - Width = 30.000000000000000000 - end - object TStringColumn - Header = 'State' - Height = 416.000000000000000000 - Position.X = 430.000000000000000000 - Width = 60.000000000000000000 - end - object TStringColumn - Header = 'Country' - Height = 416.000000000000000000 - Position.X = 490.000000000000000000 - Width = 100.000000000000000000 - end + Viewport.Width = 621.000000000000000000 + Viewport.Height = 328.000000000000000000 end object ImageControl1: TImageControl - DisableFocusEffect = False - Height = 105.000000000000000000 Position.X = 648.000000000000000000 Position.Y = 40.000000000000000000 Scale.X = 2.000000000000000000 Scale.Y = 2.000000000000000000 - Width = 81.000000000000000000 + Size.Width = 73.000000000000000000 + Size.Height = 89.000000000000000000 + Size.PlatformDefault = False object PictureOpacityAnimation: TFloatAnimation Duration = 1.000000000000000000 PropertyName = 'Opacity' + StartValue = 0.000000000000000000 StopValue = 1.000000000000000000 end object PictureRotationAngle: TFloatAnimation @@ -98,19 +71,18 @@ end end object Edit1: TEdit - DisableFocusEffect = False - KeyboardType = vktDefault - Password = False + Touch.InteractiveGestures = [LongTap, DoubleTap] Position.X = 648.000000000000000000 Position.Y = 264.000000000000000000 - Width = 169.000000000000000000 - Height = 22.000000000000000000 + Size.Width = 100.000000000000000000 + Size.Height = 22.000000000000000000 + Size.PlatformDefault = False end object ContactSelector: TInstantSelector AfterScroll = ContactSelectorAfterScroll Command.Strings = ( 'SELECT * FROM ANY TContact') - Connector = InstanXMLXConnector1 + Connector = InstantXMLConnector ObjectClassName = 'TContact' AfterOpen = ContactSelectorAfterOpen Left = 344 @@ -164,13 +136,13 @@ Left = 344 Top = 344 end - object InstanXMLXConnector1: TInstantXMLConnector - IsDefault = True - Connection = XMLFilesAccessor1 + object InstantXMLConnector: TInstantXMLConnector + BlobStreamFormat = sfXML + Connection = XMLFilesAccessor Left = 56 Top = 344 end - object XMLFilesAccessor1: TXMLFilesAccessor + object XMLFilesAccessor: TXMLFilesAccessor RootFolder = '\' Left = 56 Top = 288 @@ -177,7 +149,6 @@ end object BindScopeDB1: TBindScopeDB DataSource = ContactsSource - DataSet = ContactSelector ScopeMappings = <> Left = 344 Top = 408 @@ -185,7 +156,6 @@ object BindingsList: TBindingsList Methods = <> OutputConverters = <> - UseAppManager = True Left = 704 Top = 48 object BindDBGridLink1: TBindDBGridLink @@ -192,7 +162,6 @@ Category = 'DB Links' DataSource = BindScopeDB1 GridControl = StringGrid1 - AutoBufferCount = False Columns = < item FieldName = 'Name' Modified: trunk/Demos/PrimerFireMonkey/Source/Main.pas =================================================================== --- trunk/Demos/PrimerFireMonkey/Source/Main.pas 2018-09-01 10:14:45 UTC (rev 986) +++ trunk/Demos/PrimerFireMonkey/Source/Main.pas 2018-11-22 10:48:18 UTC (rev 987) @@ -8,15 +8,17 @@ Fmx.Bind.Navigator, InstantPersistence, InstantBrokers, Data.DB, InstantXML, InstantPresentation, Data.Bind.Components, Data.Bind.DBScope, Data.Bind.EngExt, Fmx.Bind.DBEngExt, System.Rtti, System.Bindings.Outputs, - Fmx.Bind.Editors, FMX.Grid, Data.Bind.DBLinks, Fmx.Bind.DBLinks, FMX.Objects, FMX.Edit, FMX.Ani; + Fmx.Bind.Editors, FMX.Grid, Data.Bind.DBLinks, Fmx.Bind.DBLinks, FMX.Objects, FMX.Edit, + FMX.Ani, Data.Bind.Controls, FMX.Grid.Style, FMX.StdCtrls, FMX.ScrollBox, + FMX.Controls.Presentation; type TfmMain = class(TForm) DBNavigator1: TBindNavigator; ContactsSource: TDataSource; - InstanXMLXConnector1: TInstantXMLConnector; + InstantXMLConnector: TInstantXMLConnector; ContactSelector: TInstantSelector; - XMLFilesAccessor1: TXMLFilesAccessor; + XMLFilesAccessor: TXMLFilesAccessor; ConnectButton: TButton; RecordLabel: TLabel; BindScopeDB1: TBindScopeDB; @@ -97,7 +99,6 @@ procedure TfmMain.ConnectButtonClick(Sender: TObject); begin InitConnection; - ContactSelector.Open; end; procedure TfmMain.ContactSelectorAfterOpen(DataSet: TDataSet); @@ -120,11 +121,22 @@ procedure TfmMain.InitConnection; begin - XMLFilesAccessor1.RootFolder := ExtractFilePath(ParamStr(0))+ - '..'+PathDelim+'..'+PathDelim+'..'+PathDelim+'..'+PathDelim+'Database'; -// CreateCategories; -// CreateCountries; -// CreateRandomContacts(100, True); + XMLFilesAccessor.RootFolder := ExtractFilePath(ParamStr(0))+ + '..\Database'; + InstantXMLConnector.Connected := True; + InstantXMLConnector.IsDefault := True; + ContactSelector.Open; + if ContactSelector.Eof then + begin + ContactSelector.Close; + Try + CreateCategories; + CreateCountries; + CreateRandomContacts(100, True); + Finally + ContactSelector.Open; + End; + end; end; procedure TfmMain.UpdateRecordLabel; |
From: <car...@us...> - 2018-09-01 10:14:47
|
Revision: 986 http://sourceforge.net/p/instantobjects/code/986 Author: carlobar Date: 2018-09-01 10:14:45 +0000 (Sat, 01 Sep 2018) Log Message: ----------- fixed exposer for date value 1974-09-30 Modified Paths: -------------- trunk/Source/Core/InstantPresentation.pas Modified: trunk/Source/Core/InstantPresentation.pas =================================================================== --- trunk/Source/Core/InstantPresentation.pas 2018-09-01 10:02:02 UTC (rev 985) +++ trunk/Source/Core/InstantPresentation.pas 2018-09-01 10:14:45 UTC (rev 986) @@ -2947,7 +2947,8 @@ if (Field is TDateTimeField) and Assigned(Buffer) then begin D := TDateTimeRec(Buffer^); - Result := (D.Date <> 0) and (D.Time <> 0); + //Result := (D.Date <> 0) and (D.Time <> 0); WRONG TEST, FAIL WITH DATE 30/09/1974! + Result := (D.DateTime <> 0); end else Result := (State in [dsEdit, dsInsert]) or (RecordCount > 0); end; |
From: <car...@us...> - 2018-09-01 10:02:05
|
Revision: 985 http://sourceforge.net/p/instantobjects/code/985 Author: carlobar Date: 2018-09-01 10:02:02 +0000 (Sat, 01 Sep 2018) Log Message: ----------- fixed exposer for date value 1974-09-30 Added AfterCreateObject Event Modified Paths: -------------- trunk/Source/Core/InstantPresentation.pas trunk/Tests/TestIO_DXE3.mdr trunk/Tests/TestInstantExposer.pas Modified: trunk/Source/Core/InstantPresentation.pas =================================================================== --- trunk/Source/Core/InstantPresentation.pas 2018-09-01 09:54:36 UTC (rev 984) +++ trunk/Source/Core/InstantPresentation.pas 2018-09-01 10:02:02 UTC (rev 985) @@ -195,6 +195,7 @@ TInstantFieldEvent = procedure(Sender: TObject; Field: TField) of object; TInstantCreateObjectEvent = procedure(Sender: TObject; var AObject: TObject) of object; + TInstantAfterCreateObjectEvent = procedure(Sender: TObject; const AObject: TObject) of object; TInstantFieldErrorEvent = procedure(Sender: TObject; E: Exception; Field: TField; Value: Variant; Write: Boolean; var Handled: Boolean) of object; TInstantIncludeFieldEvent = procedure(Sender: TObject; const FieldName: string; var Include: Boolean) of object; TInstantFieldDefEvent = procedure(Sender: TObject; FieldDef: TFieldDef) of object; @@ -320,6 +321,7 @@ FBeforePostField: TInstantFieldEvent; FOnCompare: TInstantCompareObjectsEvent; FOnCreateObject: TInstantCreateObjectEvent; + FAfterCreateObject: TInstantAfterCreateObjectEvent; FOnFieldError: TInstantFieldErrorEvent; FOnIncludeField: TInstantIncludeFieldEvent; FOnInitField: TInstantFieldEvent; @@ -498,7 +500,7 @@ procedure SetFieldData(Field: TField; Buffer: TValueBuffer); overload; override; {$ENDIF} {$IFNDEF NEXTGEN} - procedure SetFieldData(Field: TField; Buffer: Pointer); overload; override; {$IFDEF D12+}deprecated 'Use overloaded method instead';{$ENDIF} + procedure SetFieldData(Field: TField; Buffer: Pointer); overload; override; {$ENDIF} procedure SetFiltered(Value: Boolean); override; procedure SetRecNo(Value: Integer); override; @@ -598,6 +600,7 @@ property OnCalcFields; property OnCompare: TInstantCompareObjectsEvent read GetOnCompare write SetOnCompare; property OnCreateObject: TInstantCreateObjectEvent read FOnCreateObject write FOnCreateObject; + property AfterCreateObject: TInstantAfterCreateObjectEvent read FAfterCreateObject write FAfterCreateObject; property OnFieldError: TInstantFieldErrorEvent read FOnFieldError write FOnFieldError; property OnFilterRecord; property OnIncludeField: TInstantIncludeFieldEvent read FOnIncludeField write FOnIncludeField; @@ -2637,6 +2640,8 @@ FOnCreateObject(Self, Result); if not Assigned(Result) then Result := Accessor.CreateObject; + if Assigned(FAfterCreateObject) then + FAfterCreateObject(Self, Result); end; procedure TInstantCustomExposer.DataEvent(Event: TDataEvent; @@ -2807,7 +2812,7 @@ function TInstantCustomExposer.FieldDataSize(Field : TField): integer; begin -{$IFDEF D14} +{$IFDEF VER210} // Workaround for DataSize bugs in D2010 RTM (QC 78620 and 78620) if (not Assigned(Field)) or (Field is TBlobField) then Result := 0 @@ -2924,7 +2929,8 @@ if (Field is TDateTimeField) and Assigned(Buffer) then begin Move(Buffer[0], D, SizeOf(TDateTimeRec)); - Result := (D.Date <> 0) and (D.Time <> 0); + //Result := (D.Date <> 0) and (D.Time <> 0); WRONG TEST, FAIL WITH DATE 30/09/1974! + Result := (D.DateTime <> 0); end else Result := (State in [dsEdit, dsInsert]) or (RecordCount > 0); end; @@ -4256,7 +4262,8 @@ ftDateTime: begin Move(Buffer^, D, FieldDataSize(Field)); - if (D.Date = 0) and (D.Time = 0) then + //if (D.Date = 0) and (D.Time = 0) then WRONG TEST, FAIL WITH DATE 30/09/1974! + if (D.DateTime = 0) then Value := 0 else begin T := MSecsToTimeStamp(D.DateTime); Modified: trunk/Tests/TestIO_DXE3.mdr =================================================================== (Binary files differ) Modified: trunk/Tests/TestInstantExposer.pas =================================================================== --- trunk/Tests/TestInstantExposer.pas 2018-09-01 09:54:36 UTC (rev 984) +++ trunk/Tests/TestInstantExposer.pas 2018-09-01 10:02:02 UTC (rev 985) @@ -290,18 +290,11 @@ FExp.Edit; //Test Name (Unicode) AssignNameField(FExp); + //Test particular Date LBirthDate := EncodeDate(1974, 09, 30); - //Test BirthDate from 01/01/1900 to Today - //LBirthDate := EncodeDate(1900, 01, 01); - //while True do - begin - Field := FExp.FieldByName('BirthDate'); - Field.Value := LBirthDate; - AssertEqualsDateTime(LBirthDate, p.BirthDate); - LBirthDate := LBirthDate + 1; - //if LBirthDate >= Date then - //Break; - end; + Field := FExp.FieldByName('BirthDate'); + Field.Value := LBirthDate; + AssertEqualsDateTime(LBirthDate, p.BirthDate); FExp.Post; old_id := p.id; finally |
From: <car...@us...> - 2018-09-01 09:54:38
|
Revision: 984 http://sourceforge.net/p/instantobjects/code/984 Author: carlobar Date: 2018-09-01 09:54:36 +0000 (Sat, 01 Sep 2018) Log Message: ----------- Updated projects files Modified Paths: -------------- trunk/Source/Brokers/ADO/D10_2/DclIOADO.dproj trunk/Source/Brokers/ADO/D10_2/IOADO.dproj trunk/Source/Brokers/ADO/D2010/DclIOADO.dproj trunk/Source/Brokers/DBX/D10_2/DclIODBX.dproj trunk/Source/Brokers/DBX/D10_2/IODBX.dproj trunk/Source/Brokers/DBX/D2010/DclIODBX.dproj trunk/Source/Brokers/FireDAC/D10_2/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10_2/IOFireDAC.dproj trunk/Source/Brokers/IBX/D10_2/DclIOIBX.dproj trunk/Source/Brokers/IBX/D10_2/IOIBX.dproj trunk/Source/Brokers/IBX/D2010/DclIOIBX.dproj trunk/Source/Brokers/XML/D10_2/DclIOXML.dproj trunk/Source/Brokers/XML/D10_2/IOXML.dproj trunk/Source/Brokers/XML/D2010/DclIOXML.dproj trunk/Source/Catalogs/IBFb/D10_2/IOIBFbCatalog.dproj trunk/Source/Catalogs/MSSql/D10_2/IOMSSqlCatalog.dproj trunk/Source/Catalogs/MySQL/D10_2/IOMySQLCatalog.dproj trunk/Source/Design/D10_2/DclIOCore.dproj trunk/Source/Design/D2010/DclIOCore.dproj Modified: trunk/Source/Brokers/ADO/D10_2/DclIOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10_2/DclIOADO.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/ADO/D10_2/DclIOADO.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -18,16 +18,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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> @@ -49,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -93,20 +71,6 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> @@ -126,12 +90,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -197,12 +155,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> - <Platform value="OSX32">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Brokers/ADO/D10_2/IOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10_2/IOADO.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/ADO/D10_2/IOADO.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -1,4 +1,4 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectGuid>{532C58B1-8400-4716-AD3A-A4C7D7A9F493}</ProjectGuid> <MainSource>IOADO.dpk</MainSource> @@ -18,16 +18,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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> @@ -49,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -91,20 +69,6 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <DCC_Namespace>Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> @@ -123,12 +87,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -202,11 +160,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Brokers/ADO/D2010/DclIOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D2010/DclIOADO.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/ADO/D2010/DclIOADO.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -58,14 +58,14 @@ <BuildConfiguration Include="Base"> <Key>Base</Key> </BuildConfiguration> + <BuildConfiguration Include="Debug"> + <Key>Cfg_2</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> <BuildConfiguration Include="Release"> <Key>Cfg_1</Key> <CfgParent>Base</CfgParent> </BuildConfiguration> - <BuildConfiguration Include="Debug"> - <Key>Cfg_2</Key> - <CfgParent>Base</CfgParent> - </BuildConfiguration> </ItemGroup> <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/> <ProjectExtensions> Modified: trunk/Source/Brokers/DBX/D10_2/DclIODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10_2/DclIODBX.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/DBX/D10_2/DclIODBX.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -18,26 +18,11 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> - <Base_Win64>true</Base_Win64> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''"> <Cfg_1>true</Cfg_1> <CfgParent>Base</CfgParent> @@ -54,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -97,28 +70,11 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <DCC_UsePackage>vcl;IOCore;IODBX;$(DCC_UsePackage)</DCC_UsePackage> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> - <PropertyGroup Condition="'$(Base_Win64)'!=''"> - <DCC_UsePackage>vcl;$(DCC_UsePackage)</DCC_UsePackage> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1)'!=''"> <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> <DCC_DebugInformation>0</DCC_DebugInformation> @@ -133,12 +89,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -208,11 +158,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Brokers/DBX/D10_2/IODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10_2/IODBX.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/DBX/D10_2/IODBX.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -1,4 +1,4 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectGuid>{49B2A99C-6E5A-48BF-A27D-B775DDE99C30}</ProjectGuid> <MainSource>IODBX.dpk</MainSource> @@ -18,16 +18,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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> @@ -49,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -90,20 +68,6 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> @@ -122,12 +86,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -201,11 +159,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Brokers/DBX/D2010/DclIODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D2010/DclIODBX.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/DBX/D2010/DclIODBX.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -56,14 +56,14 @@ <BuildConfiguration Include="Base"> <Key>Base</Key> </BuildConfiguration> + <BuildConfiguration Include="Debug"> + <Key>Cfg_2</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> <BuildConfiguration Include="Release"> <Key>Cfg_1</Key> <CfgParent>Base</CfgParent> </BuildConfiguration> - <BuildConfiguration Include="Debug"> - <Key>Cfg_2</Key> - <CfgParent>Base</CfgParent> - </BuildConfiguration> </ItemGroup> <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/> <ProjectExtensions> Modified: trunk/Source/Brokers/FireDAC/D10_2/DclIOFireDAC.dproj =================================================================== --- trunk/Source/Brokers/FireDAC/D10_2/DclIOFireDAC.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/FireDAC/D10_2/DclIOFireDAC.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -18,16 +18,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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> @@ -49,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -91,20 +69,6 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <DCC_UsePackage>IOFireDAC;$(DCC_UsePackage)</DCC_UsePackage> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> @@ -124,12 +88,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -194,12 +152,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> - <Platform value="OSX32">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Brokers/FireDAC/D10_2/IOFireDAC.dproj =================================================================== --- trunk/Source/Brokers/FireDAC/D10_2/IOFireDAC.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/FireDAC/D10_2/IOFireDAC.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -1,4 +1,4 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectGuid>{0DB0DF8C-A7BA-4C0F-BB72-75945F7C7F0B}</ProjectGuid> <MainSource>IOFireDAC.dpk</MainSource> @@ -18,16 +18,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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> @@ -49,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -91,20 +69,6 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> @@ -123,12 +87,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -208,12 +166,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> - <Platform value="OSX32">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Brokers/IBX/D10_2/DclIOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D10_2/DclIOIBX.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/IBX/D10_2/DclIOIBX.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -18,26 +18,11 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> - <Base_Win64>true</Base_Win64> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''"> <Cfg_1>true</Cfg_1> <CfgParent>Base</CfgParent> @@ -54,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -96,28 +69,11 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <DCC_UsePackage>vcl;vcldb;IOCore;IOIBX;$(DCC_UsePackage)</DCC_UsePackage> </PropertyGroup> - <PropertyGroup Condition="'$(Base_Win64)'!=''"> - <DCC_UsePackage>vcl;vcldb;$(DCC_UsePackage)</DCC_UsePackage> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1)'!=''"> <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> <DCC_DebugInformation>0</DCC_DebugInformation> @@ -132,12 +88,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -206,11 +156,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Brokers/IBX/D10_2/IOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D10_2/IOIBX.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/IBX/D10_2/IOIBX.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -1,4 +1,4 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectGuid>{5758E177-7F72-4DD5-A3A7-513F90CFCA65}</ProjectGuid> <MainSource>IOIBX.dpk</MainSource> @@ -18,16 +18,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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> @@ -49,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -90,20 +68,6 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> @@ -122,12 +86,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -198,11 +156,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Brokers/IBX/D2010/DclIOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D2010/DclIOIBX.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/IBX/D2010/DclIOIBX.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -54,14 +54,14 @@ <BuildConfiguration Include="Base"> <Key>Base</Key> </BuildConfiguration> + <BuildConfiguration Include="Debug"> + <Key>Cfg_2</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> <BuildConfiguration Include="Release"> <Key>Cfg_1</Key> <CfgParent>Base</CfgParent> </BuildConfiguration> - <BuildConfiguration Include="Debug"> - <Key>Cfg_2</Key> - <CfgParent>Base</CfgParent> - </BuildConfiguration> </ItemGroup> <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/> <ProjectExtensions> Modified: trunk/Source/Brokers/XML/D10_2/DclIOXML.dproj =================================================================== --- trunk/Source/Brokers/XML/D10_2/DclIOXML.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/XML/D10_2/DclIOXML.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -18,26 +18,11 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> - <Base_Win64>true</Base_Win64> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''"> <Cfg_1>true</Cfg_1> <CfgParent>Base</CfgParent> @@ -54,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> - <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <Cfg_2_Win32>true</Cfg_2_Win32> <CfgParent>Cfg_2</CfgParent> @@ -97,28 +70,11 @@ <BT_BuildType>Debug</BT_BuildType> <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> - <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> - <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> - <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> - <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <DCC_UsePackage>vclx;vcl;IOXML;$(DCC_UsePackage)</DCC_UsePackage> </PropertyGroup> - <PropertyGroup Condition="'$(Base_Win64)'!=''"> - <DCC_UsePackage>vclx;vcl;$(DCC_UsePackage)</DCC_UsePackage> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1)'!=''"> <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> <DCC_DebugInformation>0</DCC_DebugInformation> @@ -133,12 +89,6 @@ <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> - <DCC_RemoteDebug>true</DCC_RemoteDebug> - </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> @@ -206,11 +156,7 @@ </Delphi.Personality> <Platforms> <Platform value="Android">False</Platform> - <Platform value="iOSDevice32">False</Platform> - <Platform value="iOSDevice64">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="Win32">True</Platform> - <Platform value="Win64">False</Platform> </Platforms> </BorlandProject> <ProjectFileVersion>12</ProjectFileVersion> Modified: trunk/Source/Brokers/XML/D10_2/IOXML.dproj =================================================================== --- trunk/Source/Brokers/XML/D10_2/IOXML.dproj 2018-08-31 06:59:50 UTC (rev 983) +++ trunk/Source/Brokers/XML/D10_2/IOXML.dproj 2018-09-01 09:54:36 UTC (rev 984) @@ -1,4 +1,4 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectGuid>{24846E7C-894C-484E-950C-B528292DF63E}</ProjectGuid> <MainSource>IOXML.dpk</MainSource> @@ -18,16 +18,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> - <Base_iOSDevice32>true</Base_iOSDevice32> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> - <Base_iOSDevice64>true</Base_iOSDevice64> - <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> @@ -49,18 +39,6 @@ <CfgParent>Base</CfgParent> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> - <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> - <CfgParent>Cfg_2</CfgParent> - <Cfg_2>true</Cfg_2> - <Base>true<... [truncated message content] |
From: <car...@us...> - 2018-08-31 06:59:52
|
Revision: 983 http://sourceforge.net/p/instantobjects/code/983 Author: carlobar Date: 2018-08-31 06:59:50 +0000 (Fri, 31 Aug 2018) Log Message: ----------- Added failure test for date 1974-09-30 Modified Paths: -------------- trunk/Tests/TestInstantExposer.pas trunk/Tests/ubmock/src/fpcunit.pas Modified: trunk/Tests/TestInstantExposer.pas =================================================================== --- trunk/Tests/TestInstantExposer.pas 2017-04-04 15:28:27 UTC (rev 982) +++ trunk/Tests/TestInstantExposer.pas 2018-08-31 06:59:50 UTC (rev 983) @@ -33,11 +33,12 @@ interface uses - fpcunit, testregistry, InstantXML, InstantPresentation; + fpcunit, testregistry, InstantXML, InstantPresentation, DB; type TTestExposer = class(TTestCase) private + procedure AssignNameField(const Exp: TDataSet); protected FConn: TInstantXMLConnector; FAcc: TXMLFilesAccessor; @@ -46,6 +47,7 @@ procedure TearDown; override; published procedure TestStoreAndRetrieveContact; + procedure TestStoreAndRetrievePerson; procedure TestStoreAndRetrievePicture; procedure TestStoreAndRetrieveContactPhones; // procedure TestOrderBy; @@ -55,8 +57,19 @@ implementation uses - SysUtils, Classes, ShellAPI, InstantPersistence, TestModel, DB, Graphics; + SysUtils, Classes, ShellAPI, InstantPersistence, TestModel, Graphics; +const + DEF_NAME = 'AName'; + DEF_NAME_UNICODE = '网站导航'; + DEF_CITY = 'Milan (€)'; + ADDRESS_STREET = 'Street'; + ADDRESS_STREET_UNICODE = '链接'; + DEF_HOME = 'Home'; + DEF_OFFICE = 'Office'; + DEF_NUM_HOME = '012 12345678'; + DEF_NUM_OFFICE = '012-234-56781'; + { TTestXMLBroker } procedure TTestExposer.SetUp; @@ -107,17 +120,9 @@ end; procedure TTestExposer.TestStoreAndRetrieveContact; -const - DEF_NAME = 'AName'; - DEF_NAME_UNICODE = '网站导航'; - DEF_CITY = 'Milan (€)'; - ADDRESS_STREET = 'Street'; - ADDRESS_STREET_UNICODE = '链接'; var c: TContact; old_id: string; - t: TPhone; - DataSetField: TDataSetField; Field: TField; begin FExp.ObjectClass := TContact; @@ -125,20 +130,13 @@ try FExp.Subject := c; FExp.Edit; - Field := FExp.FieldByName('Name'); - if not FConn.UseUnicode then - begin - Field.Value := DEF_NAME; - AssertEquals(DEF_NAME, c.Name); - end - else - begin - Field.Value := DEF_NAME_UNICODE; - AssertEquals(DEF_NAME_UNICODE, c.Name); - end; + //Test Name (Unicode) + AssignNameField(FExp); + //Test Address.City (Unicode) Field := FExp.FieldByName('Address.City'); Field.Value := DEF_CITY; AssertEquals(DEF_CITY, c.Address.City); + //Test Address.Street (Unicode) Field := FExp.FieldByName('Address.Street'); if not FConn.UseUnicode then begin @@ -150,6 +148,7 @@ Field.Value := ADDRESS_STREET_UNICODE; AssertEquals(ADDRESS_STREET_UNICODE, c.Address.Street); end; + FExp.Post; if not FConn.UseUnicode then begin @@ -190,12 +189,25 @@ end; end; +procedure TTestExposer.AssignNameField(const Exp: TDataSet); +var + Field: TField; +begin + Field := FExp.FieldByName('Name'); + if not FConn.UseUnicode then + begin + Field.Value := DEF_NAME; + AssertEquals(DEF_NAME, Field.Value); + end + else + begin + Field.Value := DEF_NAME_UNICODE; + AssertEquals(DEF_NAME_UNICODE, Field.Value); + end; +end; + procedure TTestExposer.FieldSetValue; -const - DEF_NAME = 'AName'; - DEF_NAME_UNICODE = '链接'; var - Field: TField; c: TContact; begin FExp.ObjectClass := TContact; @@ -203,17 +215,8 @@ try FExp.Subject := c; FExp.Edit; - Field := FExp.FieldByName('Name'); - if not FConn.UseUnicode then - begin - Field.Value := DEF_NAME; - AssertEquals(DEF_NAME, Field.Value); - end - else - begin - Field.Value := DEF_NAME_UNICODE; - AssertEquals(DEF_NAME_UNICODE, Field.Value); - end; + //Test Name (Unicode) + AssignNameField(FExp); finally FreeAndNil(c); end; @@ -220,19 +223,10 @@ end; procedure TTestExposer.TestStoreAndRetrieveContactPhones; -const - DEF_NAME = 'AName'; - DEF_NAME_UNICODE = '链接'; - DEF_HOME = 'Home'; - DEF_OFFICE = 'Office'; - DEF_NUM_HOME = '012 12345678'; - DEF_NUM_OFFICE = '012-234-56781'; var c: TContact; old_id: string; - t: TPhone; DataSetField: TDataSetField; - Field: TField; begin FExp.ObjectClass := TContact; c := TContact.Create; @@ -239,18 +233,8 @@ try FExp.Subject := c; FExp.Edit; - Field := FExp.FieldByName('Name'); - if not FConn.UseUnicode then - begin - Field.Value := DEF_NAME; - AssertEquals(DEF_NAME, c.Name); - end - else - begin - Field.Value := DEF_NAME_UNICODE; - AssertEquals(DEF_NAME_UNICODE, c.Name); - end; - Field := FExp.FieldByName('Address.City'); + //Test Name (Unicode) + AssignNameField(FExp); DataSetField := FExp.FieldByName('Phones') as TDataSetField; DataSetField.NestedDataSet.Append; DataSetField.NestedDataSet.FieldByName('Name').Value := DEF_HOME; @@ -292,14 +276,52 @@ end; end; +procedure TTestExposer.TestStoreAndRetrievePerson; +var + p: TPerson; + old_id: string; + Field: TField; + LBirthDate: TDateTime; +begin + FExp.ObjectClass := TPerson; + p := TPerson.Create; + try + FExp.Subject := p; + FExp.Edit; + //Test Name (Unicode) + AssignNameField(FExp); + LBirthDate := EncodeDate(1974, 09, 30); + //Test BirthDate from 01/01/1900 to Today + //LBirthDate := EncodeDate(1900, 01, 01); + //while True do + begin + Field := FExp.FieldByName('BirthDate'); + Field.Value := LBirthDate; + AssertEqualsDateTime(LBirthDate, p.BirthDate); + LBirthDate := LBirthDate + 1; + //if LBirthDate >= Date then + //Break; + end; + FExp.Post; + old_id := p.id; + finally + FreeAndNil(p); + end; + AssertNull(p); + p := TPerson.Retrieve(old_id); + try + AssertNotNull('Object not retrieved', p); + AssertEquals(old_id, p.Id); + AssertEquals(LBirthDate, p.BirthDate); + finally + FreeAndNil(p); + end; +end; + procedure TTestExposer.TestStoreAndRetrievePicture; -const - DEF_NAME = 'AName'; - DEF_NAME_UNICODE = '链接'; var c: TPerson; Field: TField; - old_id: string; BlobContentBefore, BlobContentAfter: string; begin FExp.ObjectClass := TPerson; Modified: trunk/Tests/ubmock/src/fpcunit.pas =================================================================== --- trunk/Tests/ubmock/src/fpcunit.pas 2017-04-04 15:28:27 UTC (rev 982) +++ trunk/Tests/ubmock/src/fpcunit.pas 2018-08-31 06:59:50 UTC (rev 983) @@ -73,6 +73,7 @@ class procedure AssertEquals(Expected, Actual: int64); overload; class procedure AssertEquals(const AMessage: string; Expected, Actual: currency); overload; class procedure AssertEquals(Expected, Actual: currency); overload; + class procedure AssertEqualsDateTime(Expected, Actual: TDateTime); overload; class procedure AssertEquals(const AMessage: string; Expected, Actual, Delta: double); overload; class procedure AssertEquals(Expected, Actual, Delta: double); overload; class procedure AssertEquals(const AMessage: string; Expected, Actual: boolean); overload; @@ -425,6 +426,12 @@ AssertEquals('', Expected, Actual); end; +class procedure TAssert.AssertEqualsDateTime(Expected, Actual: TDateTime); +begin + if Expected <> Actual then + AssertEquals('', DateToStr(Expected), DateToStr(Actual)); +end; + class procedure TAssert.AssertEquals(const AMessage: string; Expected, Actual, Delta: double); begin AssertTrue(AMessage + ComparisonMsg(FloatToStr(Expected),FloatToStr(Actual)), |
From: <car...@us...> - 2017-04-04 15:28:37
|
Revision: 982 http://sourceforge.net/p/instantobjects/code/982 Author: carlobar Date: 2017-04-04 15:28:27 +0000 (Tue, 04 Apr 2017) Log Message: ----------- Added supporto for Delphi 10.2 Tokyo Updated demos Modified Paths: -------------- trunk/Source/Brokers/XML/D10_1/IOXML.dproj Added Paths: ----------- trunk/Demos/Intro/DemoData.pas trunk/Demos/Intro/Intro_Icon.ico trunk/Demos/Intro/RandomData.pas trunk/Demos/PrimerCross/Primer_D10.mdr trunk/Demos/PrimerCross/Primer_D10.tst trunk/Demos/PrimerCross/Primer_D10_2.dpr trunk/Demos/PrimerCross/Primer_D10_2.dproj trunk/Demos/PrimerCross/Primer_D10_2.mdr trunk/Demos/PrimerCross/Primer_D10_2.res trunk/Demos/PrimerCross/Primer_D10_2.xml trunk/Demos/PrimerFireMonkey/Pictures/ trunk/Demos/PrimerFireMonkey/Pictures/man01.bmp trunk/Demos/PrimerFireMonkey/Pictures/man01.emf trunk/Demos/PrimerFireMonkey/Pictures/man01.jpg trunk/Demos/PrimerFireMonkey/Pictures/man01.png trunk/Demos/PrimerFireMonkey/Pictures/man02.bmp trunk/Demos/PrimerFireMonkey/Pictures/man02.emf trunk/Demos/PrimerFireMonkey/Pictures/man02.jpg trunk/Demos/PrimerFireMonkey/Pictures/man02.png trunk/Demos/PrimerFireMonkey/Pictures/man03.bmp trunk/Demos/PrimerFireMonkey/Pictures/man03.emf trunk/Demos/PrimerFireMonkey/Pictures/man03.jpg trunk/Demos/PrimerFireMonkey/Pictures/man03.png trunk/Demos/PrimerFireMonkey/Pictures/man04.bmp trunk/Demos/PrimerFireMonkey/Pictures/man04.emf trunk/Demos/PrimerFireMonkey/Pictures/man04.jpg trunk/Demos/PrimerFireMonkey/Pictures/man04.png trunk/Demos/PrimerFireMonkey/Pictures/man05.bmp trunk/Demos/PrimerFireMonkey/Pictures/man05.emf trunk/Demos/PrimerFireMonkey/Pictures/man05.jpg trunk/Demos/PrimerFireMonkey/Pictures/man05.png trunk/Demos/PrimerFireMonkey/Pictures/woman01.bmp trunk/Demos/PrimerFireMonkey/Pictures/woman01.emf trunk/Demos/PrimerFireMonkey/Pictures/woman01.jpg trunk/Demos/PrimerFireMonkey/Pictures/woman01.png trunk/Demos/PrimerFireMonkey/Pictures/woman02.bmp trunk/Demos/PrimerFireMonkey/Pictures/woman02.emf trunk/Demos/PrimerFireMonkey/Pictures/woman02.jpg trunk/Demos/PrimerFireMonkey/Pictures/woman02.png trunk/Demos/PrimerFireMonkey/Pictures/woman03.bmp trunk/Demos/PrimerFireMonkey/Pictures/woman03.emf trunk/Demos/PrimerFireMonkey/Pictures/woman03.jpg trunk/Demos/PrimerFireMonkey/Pictures/woman03.png trunk/Demos/PrimerFireMonkey/Pictures/woman04.bmp trunk/Demos/PrimerFireMonkey/Pictures/woman04.emf trunk/Demos/PrimerFireMonkey/Pictures/woman04.jpg trunk/Demos/PrimerFireMonkey/Pictures/woman04.png trunk/Demos/PrimerFireMonkey/Pictures/woman05.bmp trunk/Demos/PrimerFireMonkey/Pictures/woman05.emf trunk/Demos/PrimerFireMonkey/Pictures/woman05.jpg trunk/Demos/PrimerFireMonkey/Pictures/woman05.png trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.mdr trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.res trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.mdr trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.res trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.mdr trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.res trunk/Demos/PrimerFireMonkey/Source/ trunk/Demos/PrimerFireMonkey/Source/DemoData.pas trunk/Demos/PrimerFireMonkey/Source/Main.fmx trunk/Demos/PrimerFireMonkey/Source/Main.pas trunk/Demos/PrimerFireMonkey/Source/Model.pas trunk/Demos/PrimerFireMonkey/Source/RandomData.pas trunk/SVN_PROPSET.BAT trunk/Source/Brokers/ADO/D10_2/ trunk/Source/Brokers/ADO/D10_2/DclIOADO.dpk trunk/Source/Brokers/ADO/D10_2/DclIOADO.dproj trunk/Source/Brokers/ADO/D10_2/DclIOADO.res trunk/Source/Brokers/ADO/D10_2/IOADO.dpk trunk/Source/Brokers/ADO/D10_2/IOADO.dproj trunk/Source/Brokers/ADO/D10_2/IOADO.res trunk/Source/Brokers/DBX/D10_2/ trunk/Source/Brokers/DBX/D10_2/DclIODBX.dpk trunk/Source/Brokers/DBX/D10_2/DclIODBX.dproj trunk/Source/Brokers/DBX/D10_2/DclIODBX.res trunk/Source/Brokers/DBX/D10_2/IODBX.dpk trunk/Source/Brokers/DBX/D10_2/IODBX.dproj trunk/Source/Brokers/DBX/D10_2/IODBX.res trunk/Source/Brokers/FireDAC/D10_2/ trunk/Source/Brokers/FireDAC/D10_2/DclIOFireDAC.dpk trunk/Source/Brokers/FireDAC/D10_2/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10_2/DclIOFireDAC.res trunk/Source/Brokers/FireDAC/D10_2/IOFireDAC.dpk trunk/Source/Brokers/FireDAC/D10_2/IOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10_2/IOFireDAC.res trunk/Source/Brokers/IBX/D10_2/ trunk/Source/Brokers/IBX/D10_2/DclIOIBX.dpk trunk/Source/Brokers/IBX/D10_2/DclIOIBX.dproj trunk/Source/Brokers/IBX/D10_2/DclIOIBX.res trunk/Source/Brokers/IBX/D10_2/IOIBX.dpk trunk/Source/Brokers/IBX/D10_2/IOIBX.dproj trunk/Source/Brokers/IBX/D10_2/IOIBX.res trunk/Source/Brokers/XML/D10_2/ trunk/Source/Brokers/XML/D10_2/DclIOXML.dpk trunk/Source/Brokers/XML/D10_2/DclIOXML.dproj trunk/Source/Brokers/XML/D10_2/DclIOXML.res trunk/Source/Brokers/XML/D10_2/IOXML.dpk trunk/Source/Brokers/XML/D10_2/IOXML.dproj trunk/Source/Brokers/XML/D10_2/IOXML.res trunk/Source/Catalogs/IBFb/D10_2/ trunk/Source/Catalogs/IBFb/D10_2/IOIBFbCatalog.dpk trunk/Source/Catalogs/IBFb/D10_2/IOIBFbCatalog.dproj trunk/Source/Catalogs/IBFb/D10_2/IOIBFbCatalog.res trunk/Source/Catalogs/MSSql/D10_2/ trunk/Source/Catalogs/MSSql/D10_2/IOMSSqlCatalog.dpk trunk/Source/Catalogs/MSSql/D10_2/IOMSSqlCatalog.dproj trunk/Source/Catalogs/MSSql/D10_2/IOMSSqlCatalog.res trunk/Source/Catalogs/MySQL/D10_2/ trunk/Source/Catalogs/MySQL/D10_2/IOMySQLCatalog.dpk trunk/Source/Catalogs/MySQL/D10_2/IOMySQLCatalog.dproj trunk/Source/Catalogs/MySQL/D10_2/IOMySQLCatalog.res trunk/Source/Core/D10_2/ trunk/Source/Core/D10_2/IOCore.dpk trunk/Source/Core/D10_2/IOCore.dproj trunk/Source/Core/D10_2/IOCore.res trunk/Source/Core/InstantDataBrowser.pas trunk/Source/Design/D10_2/ trunk/Source/Design/D10_2/DclIOCore.dpk trunk/Source/Design/D10_2/DclIOCore.dproj trunk/Source/Design/D10_2/DclIOCore.res trunk/Source/PackageGroups/D10_2/ trunk/Source/PackageGroups/D10_2/DesignTimePackages.groupproj trunk/Source/PackageGroups/D10_2/RunTimePackages.groupproj trunk/Tests/DUnit/Projects/ trunk/Tests/DUnit/Projects/TestIO/ trunk/Tests/DUnit/Projects/TestIO/TestIO.dpr trunk/Tests/DUnit/Projects/TestIO/TestIO.dproj trunk/Tests/DUnit/Projects/TestIO/TestIO.res trunk/Tests/DUnitX/ trunk/Tests/DUnitX/TestProject.dpr trunk/Tests/DUnitX/TestProject.dproj trunk/Tests/DUnitX/TestProject.res trunk/Tests/DUnitX/TestUnit.pas trunk/Tests/NotRefCountIObject.pas trunk/Tests/TestIO_D10_1.dpr trunk/Tests/TestIO_D10_1.dproj trunk/Tests/TestIO_D10_1.mdrt trunk/Tests/TestIO_D10_1.mdx trunk/Tests/TestIO_D10_1.mdxt trunk/Tests/TestIO_D10_2.dpr trunk/Tests/TestIO_D10_2.dproj trunk/Tests/TestIO_D10_2.mdr trunk/Tests/TestIO_D10_2.mdrt trunk/Tests/TestIO_D10_2.mdx trunk/Tests/TestIO_D10_2.mdxt trunk/Tests/TestIO_D10_2.res trunk/Tests/ubMockObject.pas Added: trunk/Demos/Intro/DemoData.pas =================================================================== --- trunk/Demos/Intro/DemoData.pas (rev 0) +++ trunk/Demos/Intro/DemoData.pas 2017-04-04 15:28:27 UTC (rev 982) @@ -0,0 +1,93 @@ +unit DemoData; + +interface + +{$IFDEF LINUX} +{$I '../../Source/InstantDefines.inc'} +{$ELSE} +{$I '..\..\Source\InstantDefines.inc'} +{$ENDIF} + +uses + Classes, Model, InstantPersistence, RandomData; + +function CreateRandomCompany(ContactPerson: TPerson): TCompany; +function CreateRandomPerson: TPerson; + +implementation + +uses + SysUtils, +{$IFDEF MSWINDOWS} + Windows, +{$ENDIF} +{$IFDEF LINUX} + QDialogs, +{$ENDIF} + InstantUtils; + +function CreateRandomAddress: TAddress; +begin + Result := TAddress.Create; + try + Result.Street := RandomStreet; + Result.City := RandomCity; + Result.PostalCode := RandomNumber(6); + except + Result.Free; + raise; + end; +end; + +procedure CreateRandomPhones(Contact: TContact; Names: array of string); +var + I: Integer; + Phone: TPhone; +begin + for I := Low(Names) to High(Names) do + if Random(3) > 0 then + begin + Phone := TPhone.Create; + try + Phone.Name := Names[I]; + Phone.Number := RandomNumber(10); + Contact.AddPhone(Phone); + except + Phone.Free; + raise; + end; + end; +end; + +function CreateRandomCompany(ContactPerson: TPerson): TCompany; +begin + Result := TCompany.Create; + try + Result.Name := RandomCompanyName; + Result.Address := CreateRandomAddress; + CreateRandomPhones(Result, ['Business', 'Fax', 'Mobile']); + Result.ContactPerson := ContactPerson; + except + Result.Free; + raise; + end; +end; + +function CreateRandomPerson: TPerson; +var + Gender: TGender; +begin + Result := TPerson.Create; + try + Gender := TGender(Random(2)); + Result.Name := RandomFullName(Gender); + Result.DateOfBirth := Date - (20 * 365 + Random(365 * 50)); // 20 - 70 years old + Result.Address := CreateRandomAddress; + CreateRandomPhones(Result, ['Home', 'Mobile']); + except + Result.Free; + raise; + end; +end; + +end. Property changes on: trunk/Demos/Intro/DemoData.pas ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: trunk/Demos/Intro/Intro_Icon.ico =================================================================== (Binary files differ) Index: trunk/Demos/Intro/Intro_Icon.ico =================================================================== --- trunk/Demos/Intro/Intro_Icon.ico 2017-04-04 14:40:13 UTC (rev 981) +++ trunk/Demos/Intro/Intro_Icon.ico 2017-04-04 15:28:27 UTC (rev 982) Property changes on: trunk/Demos/Intro/Intro_Icon.ico ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/Intro/RandomData.pas =================================================================== --- trunk/Demos/Intro/RandomData.pas (rev 0) +++ trunk/Demos/Intro/RandomData.pas 2017-04-04 15:28:27 UTC (rev 982) @@ -0,0 +1,242 @@ +unit RandomData; + +interface + +{$IFDEF LINUX} +{$I '../../Source/InstantDefines.inc'} +{$ELSE} +{$I '..\..\Source\InstantDefines.inc'} +{$ENDIF} + +type + TGender = (gnMale, gnFemale); + +function RandomName: string; +function RandomCompanyName: string; +function RandomEmail(const PersonName, DomainName: string): string; +function RandomFirstName(Gender: TGender): string; +function RandomFullName(Gender: TGender): string; +function RandomLastName: string; +function RandomNumber(Len: Integer): string; +function RandomStreet: string; +function RandomCity: string; + +implementation + +uses + SysUtils, InstantUtils; + +const + Letters = ['a'..'z']; + Vowels = ['a', 'e', 'i', 'o', 'u', 'y']; + Consonants = Letters - Vowels; + + SmartPrefixes: array[0..19] of string = ( + 'cor', 'pri', 'pre', 'neo', 'new', 'or', 'hi', 'inter', + 'u', 'i', 'core', 'xo', 'xe', 'xor', 'xer', 'qua', 'gen', + 'in', 're', 'tri'); + + SmartSuffixes: array[0..12] of string = ( + 'teq', 'tex', 'tec', 'nix', 'lix', 'tor', 'max', 'time', 'qua', + 'paq', 'pac', 'nic', 'nec'); + + FirstNames: array[TGender, 0..24] of string = (( + 'Anthony', 'Brian', 'Charles', 'Christopher', 'Daniel', 'David', 'Donald', + 'Edward', 'George', 'James', 'Jason', 'Jeff', 'John', 'Joseph', 'Kenneth', + 'Kevin', 'Mark', 'Michael', 'Paul', 'Richard', 'Robert', 'Ronald', 'Steven', + 'Thomas', 'William'), ( + 'Barbara', 'Betty', 'Carol', 'Deborah', 'Donna', 'Dorothy', 'Elizabeth', + 'Helen', 'Jennifer', 'Karen', 'Kimberly', 'Laura', 'Linda', 'Lisa', + 'Margaret', 'Maria', 'Mary', 'Michelle', 'Nancy', 'Patricia', 'Ruth', + 'Sandra', 'Sarah', 'Sharon', 'Susan')); + + LastNames: array[0..49] of string = ( + 'Adams', 'Allen', 'Anderson', 'Baker', 'Brown', 'Campbell', 'Carter', + 'Clark', 'Collins', 'Davis', 'Edwards', 'Evans', 'Garcia', 'Gonzalez', + 'Green', 'Hall', 'Harris', 'Hernandez', 'Hill', 'Jackson', 'Johnson', + 'Jones', 'King', 'Lee', 'Lewis', 'Lopez', 'Martin', 'Martinez', 'Miller', + 'Mitchell', 'Moore', 'Nelson', 'Parker', 'Perez', 'Phillips', 'Roberts', + 'Robinson', 'Rodriguez', 'Scott', 'Smith', 'Taylor', 'Thomas', 'Thompson', + 'Turner', 'Walker', 'White', 'Williams', 'Wilson', 'Wright', 'Young'); + + Adjectives: array[0..19] of string = ( + 'Intelligent', 'Smart', 'Wise', 'Bright', 'Essential', 'Basic', 'Happy', + 'Precise', 'Fast', 'Express', 'Simple', 'Good', 'Deluxe', 'Perfect', + 'Star', 'Future', 'Millenium', 'Solid', 'Sure', 'Great'); + + CompanySuffixes: array[0..19] of string = ( + 'Computers', 'Computing', 'Software', 'Technologies', 'Consulting', 'Food', + 'Furniture', 'Textiles', 'Wear', 'Toys', 'Adventures', 'Services', 'Tools', + 'Accessories', 'Entertainment', 'Flowers', 'Equipment', 'Items', + 'Architecture', 'Knowledge'); + + CompanyTypes: array[0..2] of string = ( + 'Corp.', 'Inc.', 'Ltd.'); + + StreetPrefixes: array[0..3] of string = ( + 'North', 'East', 'South', 'West'); + + StreetBeginnings: array[0..16] of string = ( + 'Salt', 'Sun', 'Moon', 'Stone', 'Rock', 'Clear', 'White', 'Green', + 'Corn', 'Shore', 'Cotton', 'Oak', 'Water', 'Bright', 'New', 'Old', + 'Apple'); + + StreetEndings: array[0..6] of string = ( + 'wood', 'dale', 'land', 'bridge', 'lake', 'hill', 'field'); + + StreetTypes: array[0..7] of string = ( + 'Street', 'Road', 'Avenue', 'Place', 'Court', 'Boulevard', 'Drive', + 'Parkway'); + + Cities: array[0..29] of string = ( + 'Alabama', 'Atlanta', 'Boston', 'Chicago', 'Cincinnati', 'Dallas', 'Denver', + 'Detroit', 'Houston', 'Indianapolis', 'Kansas City', 'Las Vegas', + 'Los Angeles', 'Memphis', 'Miami', 'Minneapolis', 'Nashville', + 'New Orleans', 'New York', 'Oklahoma', 'Omaha', 'Philadelphia', + 'Pittsburgh', 'Portland', 'San Diego', 'San Fransisco', 'Seattle', 'Tampa', + 'Utah', 'Washington'); + + DomainSuffixes: array[0..4] of string = ( + 'com', 'org', 'net', 'edu', 'gov'); + +function RandomStr(List: array of string): string; +begin + Result := List[Random(Length(List))]; +end; + +function RandomLetter: Char; +begin + Result := Chr(Ord('a') + Random(Ord('z') - Ord('a'))); +end; + +function RandomConsonant: Char; +begin + repeat + Result := RandomLetter; + until InstantCharInSet(Result, Consonants); +end; + +function RandomVowel: Char; +begin + repeat + Result := RandomLetter; + until InstantCharInSet(Result, Vowels); +end; + +function RandomName: string; + + function SmartName: string; + begin + Result := RandomStr(SmartPrefixes) + RandomStr(SmartSuffixes); + end; + + function CombiName: string; + begin + Result := RandomConsonant + RandomVowel; + if Odd(Random(2)) then + Result := Result + RandomConsonant; + Result := Result + RandomStr(SmartSuffixes); + end; + + function TripletName: string; + var + I: Integer; + begin + Result := ''; + for I := 1 to 3 do + begin + Result := Result + RandomConsonant + RandomVowel; + if Random(10) = 1 then + Result := Result + RandomConsonant; + end; + end; + +begin + case Random(3) of + 0: Result := SmartName; + 1: Result := CombiName; + 2: Result := TripletName; + end; + Result[1] := UpCase(Result[1]); +end; + +function RandomCompanyName: string; +begin + if Random(3) = 0 then + Result := RandomStr(Adjectives) + else + Result := RandomName; + Result := Result + ' ' + RandomStr(CompanySuffixes) + ' ' + + RandomStr(CompanyTypes); +end; + +function RandomEmail(const PersonName, DomainName: string): string; +var + Name, FirstName, LastName, Suffix: string; + I: Integer; +begin + I := Pos(' ', PersonName); + if I > 0 then + begin + FirstName := Copy(PersonName, 1, Pred(I)); + LastName := PersonName; + Delete(LastName, 1, I); + end else + begin + FirstName := PersonName; + LastName := ''; + end; + case Random(3) of + 0: Name := FirstName + '.' + LastName; + 1: Name := Copy(FirstName, 1, 1) + Copy(LastName, 1, 1); + 2: Name := Copy(FirstName, 1, 1) + '_' + LastName; + end; + if Random(10) <> 0 then // 9 of 10 have .com + Suffix := DomainSuffixes[0] else + Suffix := RandomStr(DomainSuffixes); + Result := LowerCase(Name + '@' + DomainName + '.' + Suffix); +end; + +function RandomFirstName(Gender: TGender): string; +begin + Result := FirstNames[Gender, Random(Length(FirstNames[gnMale]))]; +end; + +function RandomFullName(Gender: TGender): string; +begin + Result := RandomFirstName(Gender) + ' ' + RandomLastName; +end; + +function RandomLastName: string; +begin + Result := RandomStr(LastNames); +end; + +function RandomNumber(Len: Integer): string; +begin + Result := ''; + while Len > 0 do + begin + Result := Result + Chr(Ord('0') + Random(10)); + Dec(Len); + end; +end; + +function RandomStreet: string; +begin + if Random(8) = 0 then + Result := RandomStr(StreetPrefixes) + ' ' else + Result := ''; + Result := Result + + RandomStr(StreetBeginnings) + + RandomStr(StreetEndings) + ' ' + + RandomStr(StreetTypes) + ' ' + + IntToStr((Random(499) + 1) div (Random(9) + 1) + 1); +end; + +function RandomCity: string; +begin + Result := RandomStr(Cities); +end; + +end. Property changes on: trunk/Demos/Intro/RandomData.pas ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10.mdr =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_D10.mdr =================================================================== --- trunk/Demos/PrimerCross/Primer_D10.mdr 2017-04-04 14:40:13 UTC (rev 981) +++ trunk/Demos/PrimerCross/Primer_D10.mdr 2017-04-04 15:28:27 UTC (rev 982) Property changes on: trunk/Demos/PrimerCross/Primer_D10.mdr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10.tst =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_D10.tst =================================================================== --- trunk/Demos/PrimerCross/Primer_D10.tst 2017-04-04 14:40:13 UTC (rev 981) +++ trunk/Demos/PrimerCross/Primer_D10.tst 2017-04-04 15:28:27 UTC (rev 982) Property changes on: trunk/Demos/PrimerCross/Primer_D10.tst ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10_2.dpr =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_2.dpr (rev 0) +++ trunk/Demos/PrimerCross/Primer_D10_2.dpr 2017-04-04 15:28:27 UTC (rev 982) @@ -0,0 +1,82 @@ +(* + * InstantObjects + * Primer Demo - with "internal storage" of Part and Parts + * Model.pas unit is located in Model folder + * + *) + +(* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is: Seleqt InstantObjects + * + * The Initial Developer of the Original Code is: Seleqt + * + * Portions created by the Initial Developer are Copyright (C) 2001-2003 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Carlo Barazzetta, Nando Dessena + * + * ***** END LICENSE BLOCK ***** *) + +program Primer_D10_2; + +{$IFDEF LINUX} +{$I '../../Source/InstantDefines.inc'} +{$ELSE} +{$I '..\..\Source\InstantDefines.inc'} +{$ENDIF} + + +uses + Forms, + Main in 'Main.pas' {MainForm}, + Model in 'Model\Model.pas', + ContactView in 'ContactView.pas' {ContactViewForm: TFrame}, + BasicView in 'BasicView.pas' {BasicViewForm: TFrame}, + BasicEdit in 'BasicEdit.pas' {BasicEditForm}, + ContactEdit in 'ContactEdit.pas' {ContactEditForm}, + PersonEdit in 'PersonEdit.pas' {PersonEditForm}, + CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm}, + DemoData in 'DemoData.pas', + ContactFilterEdit in 'ContactFilterEdit.pas' {ContactFilterEditForm}, + MainData in 'MainData.pas' {MainDataModule: TDataModule}, + ContactBrowse in 'ContactBrowse.pas' {ContactBrowseForm}, + CompanyBrowse in 'CompanyBrowse.pas' {CompanyBrowseForm}, + PerformanceView in 'PerformanceView.pas' {PerformanceViewForm: TFrame}, + Welcome in 'Welcome.pas' {WelcomeForm}, + PersonBrowse in 'PersonBrowse.pas' {PersonBrowseForm}, + BasicBrowse in 'BasicBrowse.pas' {BasicBrowseForm}, + CountryBrowse in 'CountryBrowse.pas' {CountryBrowseForm}, + DemoDataRequest in 'DemoDataRequest.pas' {DemoDataRequestForm}, + ContactSort in 'ContactSort.pas' {ContactSortForm}, + CategoryBrowse in 'CategoryBrowse.pas' {CategoryBrowseForm}, + HelpView in 'HelpView.pas' {HelpViewForm: TFrame}, + QueryView in 'QueryView.pas' {QueryViewForm: TFrame}, + RandomData in 'RandomData.pas', + Stopwatch in 'Stopwatch.pas', + Utility in 'Utility.pas', + Vcl.Themes, + Vcl.Styles; + +{$R *.res} +{$R *.mdr} {Model} + +begin + Application.Initialize; + Application.Title := 'InstantObjects Primer Demo (Delphi 10.2 Tokyo version)'; + Application.CreateForm(TMainForm, MainForm); + Application.CreateForm(TMainDataModule, MainDataModule); + Application.Run; +end. Property changes on: trunk/Demos/PrimerCross/Primer_D10_2.dpr ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10_2.dproj =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_2.dproj (rev 0) +++ trunk/Demos/PrimerCross/Primer_D10_2.dproj 2017-04-04 15:28:27 UTC (rev 982) @@ -0,0 +1,658 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid> + <MainSource>Primer_D10_2.dpr</MainSource> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> + <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName> + <ProjectVersion>18.2</ProjectVersion> + <Config Condition="'$(Config)'==''">Release</Config> + <Base>True</Base> + <AppType>Application</AppType> + <FrameworkType>VCL</FrameworkType> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> + <Base_iOSDevice32>true</Base_iOSDevice32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> + <Base_iOSDevice64>true</Base_iOSDevice64> + <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="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> + <Base_Win64>true</Base_Win64> + <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="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> + <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> + <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <Icon_MainIcon>Primer_D10_Icon.ico</Icon_MainIcon> + <SanitizedProjectName>Primer_D10_2</SanitizedProjectName> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;IBX;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_MajorVer>2</VerInfo_MajorVer> + <VerInfo_Locale>1030</VerInfo_Locale> + <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys> + <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\FireDAC;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <DCC_UsePackage>vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclimg;vclactnband;adortl;vcldbx;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;vclie;xmlrtl;inet;dsnap;inetdb;IndySystem;IndyCore;IndyProtocols;DbxClientDriver;inetdbxpress;inetdbbde;DataSnapServer;dbxcds;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;vclib;ibxpress;intrawebdb_100_140;Intraweb_100_140;dsnapcon;vclribbon;VclSmp;soaprtl;TeeUI;TeeDB;Tee;vcltouch;webdsnap;websnap;rbRIDE1114;rbIDE1114;rbRAP1114;rbRCL1114;dclRBADO1114;rbADO1114;rbDB1114;rbDAD1114;dclRBBDE1114;rbDBDE1114;rbBDE1114;dclRBDBE1114;rbDBE1114;dclRBE1114;rbCIDE1114;dclRBIBE1114;rbIBE1114;rbUSERDesign1114;rbUSER1114;ActionBandExtensionsD2010;UniSynEdit_R2010;wPDF3_D2010;WPViewPDF_D2010;IOCore;Jcl;JclVcl;JvCoreD14R;JvSystemD14R;JvStdCtrlsD14R;JvAppFrmD14R;JvBandsD14R;JvDBD14R;JvDlgsD14R;JvBDED14R;JvCmpD14R;JvCryptD14R;JvCtrlsD14R;JvCustomD14R;JvDockingD14R;JvDotNetCtrlsD14R;JvEDID14R;JvGlobusD14R;JvHMID14R;JvInterpreterD14R;JvJansD14R;JvManagedThreadsD14R;JvMMD14R;JvNetD14R;JvPageCompsD14R;JvPluginD14R;JvPrintPreviewD14R;JvRuntimeDesignD14R;JvTimeFrameworkD14R;JvValidatorsD14R;JvWizardD14R;JvXPCtrlsD14R;rbDIDE1114;IOIBX;IOXML;IODBX;IOBDE;IOADO;ISRtl5;ISVcl5;ISOpenOffice5;ISFLib5;$(DCC_UsePackage)</DCC_UsePackage> + <DCC_DependencyCheckOutputName>Primer_DXE.exe</DCC_DependencyCheckOutputName> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44> + <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_Locale>1033</VerInfo_Locale> + <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win64)'!=''"> + <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150> + <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <Version>7.0</Version> + <DCC_DebugInformation>0</DCC_DebugInformation> + <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <BT_BuildType>Debug</BT_BuildType> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <VerInfo_Locale>1033</VerInfo_Locale> + <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_DebugDCUs>true</DCC_DebugDCUs> + <Version>7.0</Version> + <DCC_Define>DEBUG;IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys> + <VerInfo_Locale>1033</VerInfo_Locale> + </PropertyGroup> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>VCLApplication</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Parameters/> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">True</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">2</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">1030</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName">InstantObjects.org</VersionInfoKeys> + <VersionInfoKeys Name="FileDescription">Primer Demo</VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"/> + <VersionInfoKeys Name="LegalCopyright">MPL public license</VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"/> + <VersionInfoKeys Name="OriginalFilename"/> + <VersionInfoKeys Name="ProductName"/> + <VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"/> + </VersionInfoKeys> + <Source> + <Source Name="MainSource">Primer_D10_2.dpr</Source> + </Source> + <Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k230.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp230.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <ModelSupport>False</ModelSupport> + <Platforms> + <Platform value="iOSDevice32">False</Platform> + <Platform value="iOSDevice64">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + <Deployment Version="3"> + <DeployFile LocalName="Primer_D10_2.exe" Configuration="Release" Class="ProjectOutput"> + <Platform Name="Win32"> + <RemoteName>Primer_D10_2.exe</RemoteName> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployClass Name="AdditionalDebugSymbols"> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + <Platform Name="Win32"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidClassesDexFile"> + <Platform Name="Android"> + <RemoteDir>classes</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidGDBServer"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeArmeabiFile"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeMipsFile"> + <Platform Name="Android"> + <RemoteDir>library\lib\mips</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeX86File"/> + <DeployClass Name="AndroidServiceOutput"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidSplashImageDef"> + <Platform Name="Android"> + <RemoteDir>res\drawable</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidSplashStyles"> + <Platform Name="Android"> + <RemoteDir>res\values</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_DefaultAppIcon"> + <Platform Name="Android"> + <RemoteDir>res\drawable</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon144"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xxhdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon36"> + <Platform Name="Android"> + <RemoteDir>res\drawable-ldpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon48"> + <Platform Name="Android"> + <RemoteDir>res\drawable-mdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon72"> + <Platform Name="Android"> + <RemoteDir>res\drawable-hdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon96"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xhdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage426"> + <Platform Name="Android"> + <RemoteDir>res\drawable-small</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage470"> + <Platform Name="Android"> + <RemoteDir>res\drawable-normal</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage640"> + <Platform Name="Android"> + <RemoteDir>res\drawable-large</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage960"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xlarge</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DebugSymbols"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DependencyFramework"> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DependencyModule"> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + <Extensions>.dll;.bpl</Extensions> + </Platform> + </DeployClass> + <DeployClass Required="true" Name="DependencyPackage"> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + <Extensions>.bpl</Extensions> + </Platform> + </DeployClass> + <DeployClass Name="File"> + <Platform Name="Android"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>0</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>0</Operation> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch1024"> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch1536"> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch2048"> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch768"> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch320"> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch640"> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch640x1136"> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectAndroidManifest"> + <Platform Name="Android"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSDeviceDebug"> + <Platform Name="iOSDevice32"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSDeviceResourceRules"/> + <DeployClass Name="ProjectiOSEntitlements"/> + <DeployClass Name="ProjectiOSInfoPList"/> + <DeployClass Name="ProjectiOSResource"> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectOSXEntitlements"/> + <DeployClass Name="ProjectOSXInfoPList"/> + <DeployClass Name="ProjectOSXResource"> + <Platform Name="OSX32"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Required="true" Name="ProjectOutput"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="Linux64"> + <Operation>1</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectUWPManifest"> + <Platform Name="Win32"> + <Operation>1</Operation> + </Platform> + <Platform Name="Win64"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="UWP_DelphiLogo150"> + <Platform Name="Win32"> + <RemoteDir>Assets</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="Win64"> + <RemoteDir>Assets</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="UWP_DelphiLogo44"> + <Platform Name="Win32"> + <RemoteDir>Assets</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="Win64"> + <RemoteDir>Assets</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/> + <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/> + <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> + </Deployment> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="Main.pas"> + <Form>MainForm</Form> + </DCCReference> + <DCCReference Include="Model\Model.pas"/> + <DCCReference Include="ContactView.pas"> + <Form>ContactViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="BasicView.pas"> + <Form>BasicViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="BasicEdit.pas"> + <Form>BasicEditForm</Form> + </DCCReference> + <DCCReference Include="ContactEdit.pas"> + <Form>ContactEditForm</Form> + </DCCReference> + <DCCReference Include="PersonEdit.pas"> + <Form>PersonEditForm</Form> + </DCCReference> + <DCCReference Include="CompanyEdit.pas"> + <Form>CompanyEditForm</Form> + </DCCReference> + <DCCReference Include="DemoData.pas"/> + <DCCReference Include="ContactFilterEdit.pas"> + <Form>ContactFilterEditForm</Form> + </DCCReference> + <DCCReference Include="MainData.pas"> + <Form>MainDataModule</Form> + <DesignClass>TDataModule</DesignClass> + </DCCReference> + <DCCReference Include="ContactBrowse.pas"> + <Form>ContactBrowseForm</Form> + </DCCReference> + <DCCReference Include="CompanyBrowse.pas"> + <Form>CompanyBrowseForm</Form> + </DCCReference> + <DCCReference Include="PerformanceView.pas"> + <Form>PerformanceViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="Welcome.pas"> + <Form>WelcomeForm</Form> + </DCCReference> + <DCCReference Include="PersonBrowse.pas"> + <Form>PersonBrowseForm</Form> + </DCCReference> + <DCCReference Include="BasicBrowse.pas"> + <Form>BasicBrowseForm</Form> + </DCCReference> + <DCCReference Include="CountryBrowse.pas"> + <Form>CountryBrowseForm</Form> + </DCCReference> + <DCCReference Include="DemoDataRequest.pas"> + <Form>DemoDataRequestForm</Form> + </DCCReference> + <DCCReference Include="ContactSort.pas"> + <Form>ContactSortForm</Form> + </DCCReference> + <DCCReference Include="CategoryBrowse.pas"> + <Form>CategoryBrowseForm</Form> + </DCCReference> + <DCCReference Include="HelpView.pas"> + <Form>HelpViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="QueryView.pas"> + <Form>QueryViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="RandomData.pas"/> + <DCCReference Include="Stopwatch.pas"/> + <DCCReference Include="Utility.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"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> + <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/> +</Project> Property changes on: trunk/Demos/PrimerCross/Primer_D10_2.dproj ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10_2.mdr =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_D10_2.mdr =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_2.mdr 2017-04-04 14:40:13 UTC (rev 981) +++ trunk/Demos/PrimerCross/Primer_D10_2.mdr 2017-04-04 15:28:27 UTC (rev 982) Property ... [truncated message content] |
From: <car...@us...> - 2017-04-04 14:40:15
|
Revision: 981 http://sourceforge.net/p/instantobjects/code/981 Author: carlobar Date: 2017-04-04 14:40:13 +0000 (Tue, 04 Apr 2017) Log Message: ----------- Fixed project properties Modified Paths: -------------- trunk/Demos/PrimerCross/Primer_D10_1.dproj trunk/Demos/PrimerCross/Primer_D10_1.res trunk/Source/Brokers/DBX/D10_1/IODBX.dproj trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dpk trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj Modified: trunk/Demos/PrimerCross/Primer_D10_1.dproj =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_1.dproj 2017-04-04 14:12:47 UTC (rev 980) +++ trunk/Demos/PrimerCross/Primer_D10_1.dproj 2017-04-04 14:40:13 UTC (rev 981) @@ -5,7 +5,7 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName> - <ProjectVersion>18.1</ProjectVersion> + <ProjectVersion>18.2</ProjectVersion> <Config Condition="'$(Config)'==''">Release</Config> <Base>True</Base> <AppType>Application</AppType> @@ -31,6 +31,11 @@ <CfgParent>Base</CfgParent> <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="'$(Config)'=='Release' or '$(Cfg_1)'!=''"> <Cfg_1>true</Cfg_1> <CfgParent>Base</CfgParent> @@ -91,12 +96,18 @@ <BT_BuildType>Debug</BT_BuildType> </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44> + <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <VerInfo_MajorVer>1</VerInfo_MajorVer> <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <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> + <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys> </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win64)'!=''"> + <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150> + <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44> + </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1)'!=''"> <Version>7.0</Version> <DCC_DebugInformation>0</DCC_DebugInformation> @@ -108,9 +119,10 @@ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <BT_BuildType>Debug</BT_BuildType> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <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> + <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys> <VerInfo_MajorVer>1</VerInfo_MajorVer> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2)'!=''"> @@ -130,7 +142,7 @@ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <VerInfo_MajorVer>1</VerInfo_MajorVer> - <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys> <VerInfo_Locale>1033</VerInfo_Locale> </PropertyGroup> <ProjectExtensions> @@ -266,6 +278,14 @@ <Extensions>.framework</Extensions> </Platform> </DeployClass> + <DeployClass Name="ProjectUWPManifest"> + <Platform Name="Win32"> + <Operation>1</Operation> + </Platform> + <Platform Name="Win64"> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="iPhone_Launch640"> <Platform Name="iOSSimulator"> <Operation>1</Operation> @@ -368,6 +388,16 @@ <Operation>1</Operation> </Platform> </DeployClass> + <DeployClass Name="UWP_DelphiLogo44"> + <Platform Name="Win32"> + <RemoteDir>Assets</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="Win64"> + <RemoteDir>Assets</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectiOSEntitlements"/> <DeployClass Name="AndroidGDBServer"> <Platform Name="Android"> @@ -383,6 +413,16 @@ </DeployClass> <DeployClass Name="ProjectOSXInfoPList"/> <DeployClass Name="ProjectOSXEntitlements"/> + <DeployClass Name="UWP_DelphiLogo150"> + <Platform Name="Win32"> + <RemoteDir>Assets</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="Win64"> + <RemoteDir>Assets</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="iPad_Launch2048"> <Platform Name="iOSSimulator"> <Operation>1</Operation> Modified: trunk/Demos/PrimerCross/Primer_D10_1.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/D10_1/IODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10_1/IODBX.dproj 2017-04-04 14:12:47 UTC (rev 980) +++ trunk/Source/Brokers/DBX/D10_1/IODBX.dproj 2017-04-04 14:40:13 UTC (rev 981) @@ -73,7 +73,7 @@ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> <DllSuffix>_D24</DllSuffix> <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> - <DCC_Description>InstantObjects dbExpress Run-Time Support (Delphi 10 Berlin)</DCC_Description> + <DCC_Description>InstantObjects dbExpress Run-Time Support (Delphi 10.1 Berlin)</DCC_Description> <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> <RuntimeOnlyPackage>true</RuntimeOnlyPackage> <GenPackage>true</GenPackage> Modified: trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj =================================================================== --- trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj 2017-04-04 14:12:47 UTC (rev 980) +++ trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj 2017-04-04 14:40:13 UTC (rev 981) @@ -74,7 +74,7 @@ <DCC_TypedAtParameter>true</DCC_TypedAtParameter> <DllSuffix>_D24</DllSuffix> <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace> - <DCC_Description>InstantObjects FireDAC Run-Time Support (Delphi 10 Berlin)</DCC_Description> + <DCC_Description>InstantObjects FireDAC Run-Time Support (Delphi 10.1 Berlin)</DCC_Description> <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> <RuntimeOnlyPackage>true</RuntimeOnlyPackage> <DCC_N>false</DCC_N> Modified: trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj 2017-04-04 14:12:47 UTC (rev 980) +++ trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj 2017-04-04 14:40:13 UTC (rev 981) @@ -73,7 +73,7 @@ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> <DllSuffix>_D24</DllSuffix> <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> - <DCC_Description>InstantObjects IBX Run-Time Support (Delphi 10 Berlin)</DCC_Description> + <DCC_Description>InstantObjects IBX Run-Time Support (Delphi 10.1 Berlin)</DCC_Description> <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;IBX;$(DCC_Namespace)</DCC_Namespace> <RuntimeOnlyPackage>true</RuntimeOnlyPackage> <GenPackage>true</GenPackage> Modified: trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj =================================================================== --- trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj 2017-04-04 14:12:47 UTC (rev 980) +++ trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj 2017-04-04 14:40:13 UTC (rev 981) @@ -74,7 +74,7 @@ <DCC_TypedAtParameter>true</DCC_TypedAtParameter> <DllSuffix>_D24</DllSuffix> <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> - <DCC_Description>InstantObjects Catalog for InterBase and Firebird (Delphi 10 Berlin)</DCC_Description> + <DCC_Description>InstantObjects Catalog for InterBase and Firebird (Delphi 10.1 Berlin)</DCC_Description> <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> <RuntimeOnlyPackage>true</RuntimeOnlyPackage> <DCC_N>false</DCC_N> Modified: trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dpk =================================================================== --- trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dpk 2017-04-04 14:12:47 UTC (rev 980) +++ trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dpk 2017-04-04 14:40:13 UTC (rev 981) @@ -25,7 +25,7 @@ {$IMAGEBASE $400000} {$DEFINE DEBUG} {$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'InstantObjects Catalog for MySQL (Delphi 10 Berlin)'} +{$DESCRIPTION 'InstantObjects Catalog for MySQL (Delphi 10.1 Berlin)'} {$LIBSUFFIX '_D24'} {$RUNONLY} {$IMPLICITBUILD OFF} Modified: trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj =================================================================== --- trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj 2017-04-04 14:12:47 UTC (rev 980) +++ trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj 2017-04-04 14:40:13 UTC (rev 981) @@ -74,7 +74,7 @@ <DCC_TypedAtParameter>true</DCC_TypedAtParameter> <DllSuffix>_D24</DllSuffix> <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> - <DCC_Description>InstantObjects Catalog for MySQL (Delphi 10 Berlin)</DCC_Description> + <DCC_Description>InstantObjects Catalog for MySQL (Delphi 10.1 Berlin)</DCC_Description> <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> <RuntimeOnlyPackage>true</RuntimeOnlyPackage> <DCC_N>false</DCC_N> |
From: <car...@us...> - 2017-04-04 14:12:50
|
Revision: 980 http://sourceforge.net/p/instantobjects/code/980 Author: carlobar Date: 2017-04-04 14:12:47 +0000 (Tue, 04 Apr 2017) Log Message: ----------- Fixed libsuffix problems with Berlin package compilation Modified Paths: -------------- trunk/Source/InstantDefines.inc Modified: trunk/Source/InstantDefines.inc =================================================================== --- trunk/Source/InstantDefines.inc 2017-04-04 14:00:04 UTC (rev 979) +++ trunk/Source/InstantDefines.inc 2017-04-04 14:12:47 UTC (rev 980) @@ -227,7 +227,6 @@ {$DEFINE D22+} {$DEFINE D23} {$DEFINE D23+} - {$LIBSUFFIX '_D23'} {$ENDIF} // Delphi 10.1 Berlin @@ -251,9 +250,32 @@ {$DEFINE D23+} {$DEFINE D24} {$DEFINE D24+} - {$LIBSUFFIX '_D23'} {$ENDIF} +// Delphi 10.2 Tokyo +{$IFDEF VER320} + {$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 D25} + {$DEFINE D25+} +{$ENDIF} + {$IFDEF FPC} {$DEFINE D5+} {$DEFINE D6+} |
From: <car...@us...> - 2017-04-04 14:00:06
|
Revision: 979 http://sourceforge.net/p/instantobjects/code/979 Author: carlobar Date: 2017-04-04 14:00:04 +0000 (Tue, 04 Apr 2017) Log Message: ----------- Fixed xml encoding for object's Id into containers. Modified Paths: -------------- trunk/Source/Core/InstantPersistence.pas Modified: trunk/Source/Core/InstantPersistence.pas =================================================================== --- trunk/Source/Core/InstantPersistence.pas 2017-03-16 08:57:46 UTC (rev 978) +++ trunk/Source/Core/InstantPersistence.pas 2017-04-04 14:00:04 UTC (rev 979) @@ -5489,7 +5489,7 @@ begin InstantXMLProducer.WriteStartTag( ObjectReferenceList.RefItems[I].ObjectClassName); - InstantXMLProducer.WriteData(ObjectReferenceList.RefItems[I].ObjectId); + InstantXMLProducer.WriteEscapedData(ObjectReferenceList.RefItems[I].ObjectId); InstantXMLProducer.WriteEndTag; end; InstantXMLProducer.WriteEndTag; |
From: <car...@us...> - 2017-03-16 08:57:48
|
Revision: 978 http://sourceforge.net/p/instantobjects/code/978 Author: carlobar Date: 2017-03-16 08:57:46 +0000 (Thu, 16 Mar 2017) Log Message: ----------- Updated project GUID'S and demos Modified Paths: -------------- trunk/Demos/Intro/CompanyEdit.dfm trunk/Demos/Intro/ContactEdit.dfm trunk/Demos/Intro/Intro.dpr trunk/Demos/Intro/Intro.dproj trunk/Demos/Intro/Intro.mdr trunk/Demos/Intro/Intro.res trunk/Demos/Intro/Main.dfm trunk/Demos/Intro/Main.pas trunk/Demos/Intro/PersonEdit.dfm trunk/Demos/Intro/PersonEdit.pas trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj trunk/Source/Brokers/ADO/D10_1/IOADO.dproj trunk/Source/Brokers/BDE/InstantBDE.pas trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj trunk/Source/Brokers/DBX/D10_1/IODBX.dproj trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dproj trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj trunk/Source/Brokers/IBX/DXE6/IOIBX.dproj trunk/Source/Brokers/XML/D10_1/DclIOXML.dproj trunk/Source/Brokers/XML/D10_1/IOXML.dproj trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dproj trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj trunk/Source/Core/D10_1/IOCore.dproj trunk/Source/Design/D10_1/DclIOCore.dproj Modified: trunk/Demos/Intro/CompanyEdit.dfm =================================================================== --- trunk/Demos/Intro/CompanyEdit.dfm 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/CompanyEdit.dfm 2017-03-16 08:57:46 UTC (rev 978) @@ -1,5 +1,4 @@ inherited CompanyEditForm: TCompanyEditForm - Height = 268 Caption = 'Company' OldCreateOrder = True PixelsPerInch = 96 @@ -11,21 +10,10 @@ Height = 13 Caption = 'ContactPerson' end - inherited DBGrid1: TDBGrid - TabOrder = 5 - end - inherited OkButton: TButton - Top = 208 - TabOrder = 6 - end - inherited CancelButton: TButton - Top = 208 - TabOrder = 7 - end - object DBLookupComboBox1: TDBLookupComboBox [13] + object DBLookupComboBox1: TDBLookupComboBox [10] Left = 8 Top = 184 - Width = 145 + Width = 184 Height = 21 DataField = 'ContactPerson' DataSource = ContactSource @@ -34,6 +22,9 @@ ListSource = PersonsSource TabOrder = 4 end + inherited DBGrid1: TDBGrid + TabOrder = 7 + end inherited ContactExposer: TInstantExposer FieldOptions = [foObjects, foThorough] ObjectClassName = 'TCompany' @@ -56,6 +47,7 @@ AutoOpen = True Command.Strings = ( 'SELECT * FROM TPerson') + Connector = MainForm.InstantXMLConnector Left = 136 Top = 208 end Modified: trunk/Demos/Intro/ContactEdit.dfm =================================================================== --- trunk/Demos/Intro/ContactEdit.dfm 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/ContactEdit.dfm 2017-03-16 08:57:46 UTC (rev 978) @@ -3,8 +3,8 @@ Top = 211 BorderStyle = bsDialog Caption = 'Contact' - ClientHeight = 206 - ClientWidth = 373 + ClientHeight = 272 + ClientWidth = 431 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -93,8 +93,8 @@ object DBGrid1: TDBGrid Left = 200 Top = 24 - Width = 169 - Height = 137 + Width = 223 + Height = 209 DataSource = PhonesSource TabOrder = 4 TitleFont.Charset = DEFAULT_CHARSET @@ -106,18 +106,19 @@ item Expanded = False FieldName = 'Name' - Width = 60 + Width = 78 Visible = True end item Expanded = False FieldName = 'Number' + Width = 103 Visible = True end> end object OkButton: TButton - Left = 208 - Top = 176 + Left = 268 + Top = 239 Width = 75 Height = 25 Caption = 'OK' @@ -127,8 +128,8 @@ OnClick = OkButtonClick end object CancelButton: TButton - Left = 288 - Top = 176 + Left = 348 + Top = 239 Width = 75 Height = 25 Cancel = True @@ -158,7 +159,6 @@ end object ContactExposerPhones: TDataSetField FieldName = 'Phones' - IncludeObjectField = False end end object ContactSource: TDataSource Modified: trunk/Demos/Intro/Intro.dpr =================================================================== --- trunk/Demos/Intro/Intro.dpr 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/Intro.dpr 2017-03-16 08:57:46 UTC (rev 978) @@ -4,6 +4,8 @@ Forms, Model in 'Model.pas', Main in 'Main.pas' {MainForm}, + DemoData in 'DemoData.pas', + RandomData in 'RandomData.pas', ContactEdit in 'ContactEdit.pas' {ContactEditForm}, PersonEdit in 'PersonEdit.pas' {PersonEditForm}, CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm}; Modified: trunk/Demos/Intro/Intro.dproj =================================================================== --- trunk/Demos/Intro/Intro.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/Intro.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,103 +1,209 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <ProjectGuid>{5e7fed32-48a7-4d66-a1ed-fbf2fb9c43c1}</ProjectGuid> - <MainSource>Intro.dpr</MainSource> - <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> - <DCC_DependencyCheckOutputName>Intro.exe</DCC_DependencyCheckOutputName> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <Version>7.0</Version> - <DCC_WriteableConstants>True</DCC_WriteableConstants> - <DCC_Optimize>False</DCC_Optimize> - <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames> - <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> - <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_UnitSearchPath> - <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ResourcePath> - <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ObjPath> - <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_IncludePath> - <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE> - <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE> - <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <Version>7.0</Version> - <DCC_WriteableConstants>True</DCC_WriteableConstants> - <DCC_Optimize>False</DCC_Optimize> - <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames> - <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> - <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_UnitSearchPath> - <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ResourcePath> - <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ObjPath> - <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_IncludePath> - <DCC_Define>DEBUG</DCC_Define> - <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE> - <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE> - <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST> - </PropertyGroup> - <ProjectExtensions> - <Borland.Personality>Delphi.Personality</Borland.Personality> - <Borland.ProjectType>VCLApplication</Borland.ProjectType> - <BorlandProject> -<BorlandProject xmlns=""> <Delphi.Personality> <Parameters> - <Parameters Name="UseLauncher">False</Parameters> - <Parameters Name="LoadAllSymbols">True</Parameters> - <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> - </Parameters> - <Language> - <Language Name="ProjectLang">$00000406</Language> - </Language> - <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">1030</VersionInfo> - <VersionInfo Name="CodePage">1252</VersionInfo> - </VersionInfo> - <VersionInfoKeys> - <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> - <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> - <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> - <VersionInfoKeys Name="InternalName"></VersionInfoKeys> - <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> - <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> - <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> - <VersionInfoKeys Name="ProductName"></VersionInfoKeys> - <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> - <VersionInfoKeys Name="Comments"></VersionInfoKeys> - </VersionInfoKeys> - <Source> - <Source Name="MainSource">Intro.dpr</Source> - </Source> - </Delphi.Personality> </BorlandProject></BorlandProject> - </ProjectExtensions> - <ItemGroup /> - <ItemGroup> - <DelphiCompile Include="Intro.dpr"> - <MainSource>MainSource</MainSource> - </DelphiCompile> - <DCCReference Include="CompanyEdit.pas"> - <Form>CompanyEditForm</Form> - </DCCReference> - <DCCReference Include="ContactEdit.pas"> - <Form>ContactEditForm</Form> - </DCCReference> - <DCCReference Include="Main.pas"> - <Form>MainForm</Form> - </DCCReference> - <DCCReference Include="Model.pas" /> - <DCCReference Include="PersonEdit.pas"> - <Form>PersonEditForm</Form> - </DCCReference> - </ItemGroup> - <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> -</Project> \ No newline at end of file + <PropertyGroup> + <ProjectGuid>{5e7fed32-48a7-4d66-a1ed-fbf2fb9c43c1}</ProjectGuid> + <MainSource>Intro.dpr</MainSource> + <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration> + <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> + <DCC_DependencyCheckOutputName>Intro.exe</DCC_DependencyCheckOutputName> + <FrameworkType>VCL</FrameworkType> + <ProjectVersion>18.1</ProjectVersion> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Release</Config> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + <AppType>Application</AppType> + </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="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> + <Base_Win64>true</Base_Win64> + <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)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''"> + <Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64> + <CfgParent>Cfg_1</CfgParent> + <Cfg_1>true</Cfg_1> + <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="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\XML;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <SanitizedProjectName>Intro</SanitizedProjectName> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_Locale>1030</VerInfo_Locale> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_Locale>1033</VerInfo_Locale> + <Icon_MainIcon>Intro_Icon.ico</Icon_MainIcon> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win64)'!=''"> + <Icon_MainIcon>Intro_Icon.ico</Icon_MainIcon> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <Version>7.0</Version> + <DCC_WriteableConstants>True</DCC_WriteableConstants> + <DCC_Optimize>False</DCC_Optimize> + <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames> + <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_IncludePath)</DCC_IncludePath> + <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE> + <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE> + <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''"> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_Locale>1033</VerInfo_Locale> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <AppEnableHighDPI>true</AppEnableHighDPI> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <Version>7.0</Version> + <DCC_WriteableConstants>True</DCC_WriteableConstants> + <DCC_Optimize>False</DCC_Optimize> + <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames> + <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> + <DCC_UnitSearchPath>..\..\Source\Brokers\BDE;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_IncludePath)</DCC_IncludePath> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE> + <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE> + <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <AppEnableHighDPI>true</AppEnableHighDPI> + </PropertyGroup> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>VCLApplication</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ProjectLang">$00000406</Language> + </Language> + <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">1030</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> + <Source> + <Source Name="MainSource">Intro.dpr</Source> + </Source> + <Excluded_Packages> + <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\17.0\Bpl\FrameViewer10.bpl">(untitled)</Excluded_Packages> + <Excluded_Packages Name="$(BDS)\RBuilder\Lib\Win32\dclRBIBE1724.bpl">ReportBuilder Data Access for Interbase Express</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <Platforms> + <Platform value="iOSDevice64">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="Model.pas"/> + <DCCReference Include="Main.pas"> + <Form>MainForm</Form> + </DCCReference> + <DCCReference Include="DemoData.pas"/> + <DCCReference Include="RandomData.pas"/> + <DCCReference Include="ContactEdit.pas"> + <Form>ContactEditForm</Form> + </DCCReference> + <DCCReference Include="PersonEdit.pas"> + <Form>PersonEditForm</Form> + </DCCReference> + <DCCReference Include="CompanyEdit.pas"> + <Form>CompanyEditForm</Form> + </DCCReference> + <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> + <ItemGroup/> + <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> + <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/> + <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/> +</Project> Modified: trunk/Demos/Intro/Intro.mdr =================================================================== (Binary files differ) Modified: trunk/Demos/Intro/Intro.res =================================================================== (Binary files differ) Modified: trunk/Demos/Intro/Main.dfm =================================================================== --- trunk/Demos/Intro/Main.dfm 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/Main.dfm 2017-03-16 08:57:46 UTC (rev 978) @@ -1,10 +1,9 @@ object MainForm: TMainForm Left = 232 Top = 177 - BorderStyle = bsSingle - Caption = 'Demo' - ClientHeight = 309 - ClientWidth = 363 + Caption = 'InstantObjects simple demo' + ClientHeight = 311 + ClientWidth = 452 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -13,6 +12,10 @@ Font.Style = [] OldCreateOrder = False Position = poScreenCenter + OnCreate = FormCreate + DesignSize = ( + 452 + 311) PixelsPerInch = 96 TextHeight = 13 object DBNavigator1: TDBNavigator @@ -23,11 +26,12 @@ DataSource = ContactsSource TabOrder = 0 end - object DBGrid1: TDBGrid + object ContactGrid: TDBGrid Left = 8 Top = 40 - Width = 345 + Width = 439 Height = 233 + Anchors = [akLeft, akTop, akRight, akBottom] DataSource = ContactsSource TabOrder = 1 TitleFont.Charset = DEFAULT_CHARSET @@ -35,11 +39,12 @@ TitleFont.Height = -11 TitleFont.Name = 'MS Sans Serif' TitleFont.Style = [] + OnDblClick = ContactGridDblClick Columns = < item Expanded = False FieldName = 'Name' - Width = 97 + Width = 158 Visible = True end item @@ -51,50 +56,54 @@ item Expanded = False FieldName = 'Phones' + Width = 118 Visible = True end> end object AddPersonButton: TButton - Left = 8 + Left = 131 Top = 280 Width = 75 Height = 25 + Anchors = [akRight, akBottom] Caption = 'Add Person' TabOrder = 2 OnClick = AddPersonButtonClick end object AddCompanyButton: TButton - Left = 88 + Left = 211 Top = 280 Width = 75 Height = 25 + Anchors = [akRight, akBottom] Caption = 'Add Company' TabOrder = 3 OnClick = AddCompanyButtonClick end object EditContactButton: TButton - Left = 168 + Left = 291 Top = 280 Width = 75 Height = 25 + Anchors = [akRight, akBottom] Caption = 'Edit Contact' TabOrder = 4 OnClick = EditContactButtonClick end object ExploreButton: TButton - Left = 248 + Left = 371 Top = 280 Width = 75 Height = 25 + Anchors = [akRight, akBottom] Caption = 'Explore' TabOrder = 5 OnClick = ExploreButtonClick end object ContactSelector: TInstantSelector - AutoOpen = True Command.Strings = ( - 'SELECT * FROM ANY TContact') - Connector = InstantBDEConnector1 + 'SELECT * FROM ANY TContact ORDER BY Name') + Connector = InstantXMLConnector Left = 88 Top = 232 end @@ -103,22 +112,14 @@ Left = 120 Top = 232 end - object InstantBDEConnector1: TInstantBDEConnector + object InstantXMLConnector: TInstantXMLConnector IsDefault = True - Connection = Database1 + Connection = XMLFileAccessor Left = 56 Top = 232 end - object Database1: TDatabase - DatabaseName = 'DemoDatabase' - DriverName = 'STANDARD' - LoginPrompt = False - Params.Strings = ( - 'PATH=.\Database' - 'DEFAULT DRIVER=PARADOX' - 'ENABLE BCD=FALSE') - SessionName = 'Default' - TransIsolation = tiDirtyRead + object XMLFileAccessor: TXMLFilesAccessor + RootFolder = '\' Left = 24 Top = 232 end Modified: trunk/Demos/Intro/Main.pas =================================================================== --- trunk/Demos/Intro/Main.pas 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/Main.pas 2017-03-16 08:57:46 UTC (rev 978) @@ -5,28 +5,31 @@ uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Db, InstantPresentation, InstantPersistence, Grids, DBGrids, - ExtCtrls, DBCtrls, Model, DBTables, InstantBDE, InstantBrokers; + ExtCtrls, DBCtrls, Model, InstantBrokers, InstantXML; type TMainForm = class(TForm) DBNavigator1: TDBNavigator; - DBGrid1: TDBGrid; + ContactGrid: TDBGrid; ContactSelector: TInstantSelector; ContactsSource: TDataSource; AddPersonButton: TButton; AddCompanyButton: TButton; EditContactButton: TButton; - InstantBDEConnector1: TInstantBDEConnector; - Database1: TDatabase; ExploreButton: TButton; + InstantXMLConnector: TInstantXMLConnector; + XMLFileAccessor: TXMLFilesAccessor; procedure AddPersonButtonClick(Sender: TObject); procedure AddCompanyButtonClick(Sender: TObject); procedure EditContactButtonClick(Sender: TObject); procedure ExploreButtonClick(Sender: TObject); + procedure FormCreate(Sender: TObject); + procedure ContactGridDblClick(Sender: TObject); private function EditContact(Contact: TContact): Boolean; + procedure CreateRandomContacts(Count: Integer); + procedure EditCurrentContact; public - { Public declarations } end; var @@ -34,7 +37,8 @@ implementation -uses CompanyEdit, ContactEdit, PersonEdit, InstantExplorer; +uses CompanyEdit, ContactEdit, PersonEdit, InstantExplorer, + RandomData, Contnrs, DemoData; {$R *.DFM} @@ -86,6 +90,11 @@ procedure TMainForm.EditContactButtonClick(Sender: TObject); begin + EditCurrentContact; +end; + +procedure TMainForm.EditCurrentContact; +begin if EditContact(ContactSelector.CurrentObject as TContact) then ContactSelector.Refresh; end; @@ -95,4 +104,59 @@ InstantExploreObject(ContactSelector.CurrentObject); end; +procedure TMainForm.FormCreate(Sender: TObject); +begin + XMLFileAccessor.RootFolder := ExtractFilePath(Application.ExeName)+PathDelim+'Database'; + InstantXMLConnector.Connect; + ContactSelector.Open; + if ContactSelector.Eof then + begin + ContactSelector.Close; + try + //First Time: create of Random Data + CreateRandomContacts(100); + finally + ContactSelector.Open; + end; + end; +end; + +procedure TMainForm.ContactGridDblClick(Sender: TObject); +begin + EditCurrentContact; +end; + +procedure TMainForm.CreateRandomContacts(Count: Integer); +var + I: Integer; + LCompany: TCompany; + LPerson: TPerson; +begin + GetAsyncKeyState(VK_ESCAPE); + Randomize; + InstantDefaultConnector.StartTransaction; + try + for I := 0 to Pred(Count) do + begin + //Create a new person + LPerson := nil; + LCompany := nil; + try + LPerson := CreateRandomPerson; + LPerson.Store; + //Create a new company + LCompany := CreateRandomCompany(LPerson); + LCompany.Store; + finally + LPerson.Free; + LCompany.Free; + end; + end; + InstantDefaultConnector.CommitTransaction; + except + InstantDefaultConnector.RollbackTransaction; + raise; + end; +end; + end. Modified: trunk/Demos/Intro/PersonEdit.dfm =================================================================== --- trunk/Demos/Intro/PersonEdit.dfm 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/PersonEdit.dfm 2017-03-16 08:57:46 UTC (rev 978) @@ -1,7 +1,8 @@ inherited PersonEditForm: TPersonEditForm - Height = 270 Caption = 'Person' + ClientHeight = 237 OldCreateOrder = True + ExplicitHeight = 266 PixelsPerInch = 96 TextHeight = 13 object Label6: TLabel [5] @@ -10,7 +11,6 @@ Width = 55 Height = 13 Caption = 'DateOfBirth' - FocusControl = DBEdit5 end inherited DBGrid1: TDBGrid TabOrder = 5 @@ -18,15 +18,17 @@ inherited OkButton: TButton Top = 208 TabOrder = 6 + ExplicitTop = 208 end inherited CancelButton: TButton Top = 208 TabOrder = 7 + ExplicitTop = 208 end object DBEdit5: TDBEdit [13] Left = 8 Top = 184 - Width = 112 + Width = 95 Height = 21 DataField = 'DateOfBirth' DataSource = ContactSource Modified: trunk/Demos/Intro/PersonEdit.pas =================================================================== --- trunk/Demos/Intro/PersonEdit.pas 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/PersonEdit.pas 2017-03-16 08:57:46 UTC (rev 978) @@ -5,7 +5,7 @@ uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ContactEdit, Db, InstantPresentation, StdCtrls, Grids, DBGrids, Mask, - DBCtrls; + DBCtrls, Vcl.ComCtrls; type TPersonEditForm = class(TContactEditForm) Modified: trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{25086FF7-139E-40BB-9278-EDE3F344302B}</ProjectGuid> + <ProjectGuid>{2B6A9D5C-7E98-40CA-AB37-BAA86CEE7C7C}</ProjectGuid> <MainSource>DclIOADO.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/ADO/D10_1/IOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10_1/IOADO.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/ADO/D10_1/IOADO.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{A15C8D03-E537-4203-982B-A812DB31354A}</ProjectGuid> + <ProjectGuid>{1D42880F-45BE-4D04-A1A4-BA58B5768107}</ProjectGuid> <MainSource>IOADO.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/BDE/InstantBDE.pas =================================================================== --- trunk/Source/Brokers/BDE/InstantBDE.pas 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/BDE/InstantBDE.pas 2017-03-16 08:57:46 UTC (rev 978) @@ -43,7 +43,7 @@ interface uses - Classes, Db, DBTables, SysUtils, InstantPersistence, InstantCommand, + Classes, Db, SysUtils, InstantPersistence, InstantCommand, InstantBrokers, InstantMetadata, InstantTypes, InstantConsts; type Modified: trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{842285A6-913E-48EA-828B-CC991BAB45A2}</ProjectGuid> + <ProjectGuid>{7FC38828-3D71-48B7-8479-F8D95FA79BF6}</ProjectGuid> <MainSource>DclIODBX.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/DBX/D10_1/IODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10_1/IODBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/DBX/D10_1/IODBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{6826D1DF-E0FF-43C6-BE04-D34587C58280}</ProjectGuid> + <ProjectGuid>{A492F54E-3D8B-4AB4-8E75-8ED6947FF116}</ProjectGuid> <MainSource>IODBX.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dproj =================================================================== --- trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{7ECBEBD9-43A5-439E-8FBB-4B27DC40A0DD}</ProjectGuid> + <ProjectGuid>{906189DF-7DA5-49AA-AA11-B81FCDF412D2}</ProjectGuid> <MainSource>DclIOFireDAC.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj =================================================================== --- trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{50885E3B-26BC-4A4D-B07A-520421576DE5}</ProjectGuid> + <ProjectGuid>{D9C3A285-3C8C-4D2E-81B8-DF3D1B309F65}</ProjectGuid> <MainSource>IOFireDAC.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{04708EEE-5D69-4308-8BED-42B0C0B84A8F}</ProjectGuid> + <ProjectGuid>{FDA89D48-CF91-4858-9F0C-3EC1AD97D78D}</ProjectGuid> <MainSource>DclIOIBX.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{10FA0CC6-3FB0-4675-BB2B-751EBC259085}</ProjectGuid> + <ProjectGuid>{06D579BC-F163-41F2-8C4E-D6CA74F53A9D}</ProjectGuid> <MainSource>IOIBX.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/IBX/DXE6/IOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/DXE6/IOIBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/IBX/DXE6/IOIBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -13,11 +13,6 @@ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''"> - <Base_Android>true</Base_Android> - <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> @@ -57,10 +52,6 @@ <DCC_E>false</DCC_E> <DCC_F>false</DCC_F> </PropertyGroup> - <PropertyGroup Condition="'$(Base_Android)'!=''"> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> @@ -146,9 +137,6 @@ </Excluded_Packages> </Delphi.Personality> <Platforms> - <Platform value="Android" ActiveMobileDevice="4df786101d45bf99">False</Platform> - <Platform value="iOSDevice">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="Win32">True</Platform> <Platform value="Win64">False</Platform> </Platforms> Modified: trunk/Source/Brokers/XML/D10_1/DclIOXML.dproj =================================================================== --- trunk/Source/Brokers/XML/D10_1/DclIOXML.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/XML/D10_1/DclIOXML.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{C584DD0D-996D-48AA-92D7-CA8FBBAED5CC}</ProjectGuid> + <ProjectGuid>{03439244-E09D-4688-9148-9ECE3FAFDA2D}</ProjectGuid> <MainSource>DclIOXML.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/XML/D10_1/IOXML.dproj =================================================================== --- trunk/Source/Brokers/XML/D10_1/IOXML.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/XML/D10_1/IOXML.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{2C0CED56-B8D8-4009-9CD4-F41B37A09EBB}</ProjectGuid> + <ProjectGuid>{A7D47D1D-3833-44BD-A52F-3D176F35811C}</ProjectGuid> <MainSource>IOXML.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj =================================================================== --- trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{8F975D2A-74E9-46FA-8665-2FFE658AE6CF}</ProjectGuid> + <ProjectGuid>{DD39F374-C8AC-4A44-B3BE-219C900E2DDD}</ProjectGuid> <MainSource>IOIBFbCatalog.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dproj =================================================================== --- trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{D79EB136-1196-4C33-842B-FCD304B70B90}</ProjectGuid> + <ProjectGuid>{37B6762C-756F-45CE-9421-BFD7D9FC105F}</ProjectGuid> <MainSource>IOMSSqlCatalog.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj =================================================================== --- trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{FA68923A-B9AB-4354-A220-A68A7F55E6D7}</ProjectGuid> + <ProjectGuid>{AA738A23-6D5F-4F61-A87E-F1500C31B316}</ProjectGuid> <MainSource>IOMySQLCatalog.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Core/D10_1/IOCore.dproj =================================================================== --- trunk/Source/Core/D10_1/IOCore.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Core/D10_1/IOCore.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.1</ProjectVersion> + <ProjectVersion>18.2</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> @@ -240,4 +240,5 @@ </ProjectExtensions> <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> + <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/> </Project> Modified: trunk/Source/Design/D10_1/DclIOCore.dproj =================================================================== --- trunk/Source/Design/D10_1/DclIOCore.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Design/D10_1/DclIOCore.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{C573F984-7F86-4505-A31B-4EF4D14A0112}</ProjectGuid> + <ProjectGuid>{A7DD82C0-2950-4DEE-90F8-71608CED3E8B}</ProjectGuid> <MainSource>DclIOCore.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> |
From: <car...@us...> - 2016-05-31 18:37:52
|
Revision: 977 http://sourceforge.net/p/instantobjects/code/977 Author: carlobar Date: 2016-05-31 18:37:50 +0000 (Tue, 31 May 2016) Log Message: ----------- Added support for Delphi 10.1 Berlin Added Paths: ----------- trunk/Demos/PrimerCross/Primer_D10_1.dpr trunk/Demos/PrimerCross/Primer_D10_1.dproj trunk/Demos/PrimerCross/Primer_D10_1.mdr trunk/Demos/PrimerCross/Primer_D10_1.res trunk/Demos/PrimerCross/Primer_D10_1.xml Added: trunk/Demos/PrimerCross/Primer_D10_1.dpr =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_1.dpr (rev 0) +++ trunk/Demos/PrimerCross/Primer_D10_1.dpr 2016-05-31 18:37:50 UTC (rev 977) @@ -0,0 +1,82 @@ +(* + * InstantObjects + * Primer Demo - with "internal storage" of Part and Parts + * Model.pas unit is located in Model folder + * + *) + +(* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is: Seleqt InstantObjects + * + * The Initial Developer of the Original Code is: Seleqt + * + * Portions created by the Initial Developer are Copyright (C) 2001-2003 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Carlo Barazzetta, Nando Dessena + * + * ***** END LICENSE BLOCK ***** *) + +program Primer_D10_1; + +{$IFDEF LINUX} +{$I '../../Source/InstantDefines.inc'} +{$ELSE} +{$I '..\..\Source\InstantDefines.inc'} +{$ENDIF} + + +uses + Forms, + Main in 'Main.pas' {MainForm}, + Model in 'Model\Model.pas', + ContactView in 'ContactView.pas' {ContactViewForm: TFrame}, + BasicView in 'BasicView.pas' {BasicViewForm: TFrame}, + BasicEdit in 'BasicEdit.pas' {BasicEditForm}, + ContactEdit in 'ContactEdit.pas' {ContactEditForm}, + PersonEdit in 'PersonEdit.pas' {PersonEditForm}, + CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm}, + DemoData in 'DemoData.pas', + ContactFilterEdit in 'ContactFilterEdit.pas' {ContactFilterEditForm}, + MainData in 'MainData.pas' {MainDataModule: TDataModule}, + ContactBrowse in 'ContactBrowse.pas' {ContactBrowseForm}, + CompanyBrowse in 'CompanyBrowse.pas' {CompanyBrowseForm}, + PerformanceView in 'PerformanceView.pas' {PerformanceViewForm: TFrame}, + Welcome in 'Welcome.pas' {WelcomeForm}, + PersonBrowse in 'PersonBrowse.pas' {PersonBrowseForm}, + BasicBrowse in 'BasicBrowse.pas' {BasicBrowseForm}, + CountryBrowse in 'CountryBrowse.pas' {CountryBrowseForm}, + DemoDataRequest in 'DemoDataRequest.pas' {DemoDataRequestForm}, + ContactSort in 'ContactSort.pas' {ContactSortForm}, + CategoryBrowse in 'CategoryBrowse.pas' {CategoryBrowseForm}, + HelpView in 'HelpView.pas' {HelpViewForm: TFrame}, + QueryView in 'QueryView.pas' {QueryViewForm: TFrame}, + RandomData in 'RandomData.pas', + Stopwatch in 'Stopwatch.pas', + Utility in 'Utility.pas', + Vcl.Themes, + Vcl.Styles; + +{$R *.res} +{$R *.mdr} {Model} + +begin + Application.Initialize; + Application.Title := 'InstantObjects Primer Demo (Delphi 10.1 Berlin version)'; + Application.CreateForm(TMainForm, MainForm); + Application.CreateForm(TMainDataModule, MainDataModule); + Application.Run; +end. Property changes on: trunk/Demos/PrimerCross/Primer_D10_1.dpr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10_1.dproj =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_1.dproj (rev 0) +++ trunk/Demos/PrimerCross/Primer_D10_1.dproj 2016-05-31 18:37:50 UTC (rev 977) @@ -0,0 +1,618 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid> + <MainSource>Primer_D10_1.dpr</MainSource> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> + <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName> + <ProjectVersion>18.1</ProjectVersion> + <Config Condition="'$(Config)'==''">Release</Config> + <Base>True</Base> + <AppType>Application</AppType> + <FrameworkType>VCL</FrameworkType> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> + <Base_iOSDevice32>true</Base_iOSDevice32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> + <Base_iOSDevice64>true</Base_iOSDevice64> + <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="('$(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="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> + <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> + <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <Icon_MainIcon>Primer_D10_Icon.ico</Icon_MainIcon> + <SanitizedProjectName>Primer_D10_1</SanitizedProjectName> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;IBX;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_MajorVer>2</VerInfo_MajorVer> + <VerInfo_Locale>1030</VerInfo_Locale> + <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys> + <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\FireDAC;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <DCC_UsePackage>vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclimg;vclactnband;adortl;vcldbx;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;vclie;xmlrtl;inet;dsnap;inetdb;IndySystem;IndyCore;IndyProtocols;DbxClientDriver;inetdbxpress;inetdbbde;DataSnapServer;dbxcds;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;vclib;ibxpress;intrawebdb_100_140;Intraweb_100_140;dsnapcon;vclribbon;VclSmp;soaprtl;TeeUI;TeeDB;Tee;vcltouch;webdsnap;websnap;rbRIDE1114;rbIDE1114;rbRAP1114;rbRCL1114;dclRBADO1114;rbADO1114;rbDB1114;rbDAD1114;dclRBBDE1114;rbDBDE1114;rbBDE1114;dclRBDBE1114;rbDBE1114;dclRBE1114;rbCIDE1114;dclRBIBE1114;rbIBE1114;rbUSERDesign1114;rbUSER1114;ActionBandExtensionsD2010;UniSynEdit_R2010;wPDF3_D2010;WPViewPDF_D2010;IOCore;Jcl;JclVcl;JvCoreD14R;JvSystemD14R;JvStdCtrlsD14R;JvAppFrmD14R;JvBandsD14R;JvDBD14R;JvDlgsD14R;JvBDED14R;JvCmpD14R;JvCryptD14R;JvCtrlsD14R;JvCustomD14R;JvDockingD14R;JvDotNetCtrlsD14R;JvEDID14R;JvGlobusD14R;JvHMID14R;JvInterpreterD14R;JvJansD14R;JvManagedThreadsD14R;JvMMD14R;JvNetD14R;JvPageCompsD14R;JvPluginD14R;JvPrintPreviewD14R;JvRuntimeDesignD14R;JvTimeFrameworkD14R;JvValidatorsD14R;JvWizardD14R;JvXPCtrlsD14R;rbDIDE1114;IOIBX;IOXML;IODBX;IOBDE;IOADO;ISRtl5;ISVcl5;ISOpenOffice5;ISFLib5;$(DCC_UsePackage)</DCC_UsePackage> + <DCC_DependencyCheckOutputName>Primer_DXE.exe</DCC_DependencyCheckOutputName> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <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)'!=''"> + <Version>7.0</Version> + <DCC_DebugInformation>0</DCC_DebugInformation> + <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <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> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_DebugDCUs>true</DCC_DebugDCUs> + <Version>7.0</Version> + <DCC_Define>DEBUG;IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + <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> + </PropertyGroup> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>VCLApplication</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Parameters/> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">True</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">2</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">1030</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName">InstantObjects.org</VersionInfoKeys> + <VersionInfoKeys Name="FileDescription">Primer Demo</VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"/> + <VersionInfoKeys Name="LegalCopyright">MPL public license</VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"/> + <VersionInfoKeys Name="OriginalFilename"/> + <VersionInfoKeys Name="ProductName"/> + <VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"/> + </VersionInfoKeys> + <Source> + <Source Name="MainSource">Primer_D10_1.dpr</Source> + </Source> + <Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k230.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp230.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <ModelSupport>False</ModelSupport> + <Platforms> + <Platform value="iOSDevice32">False</Platform> + <Platform value="iOSDevice64">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + <Deployment Version="3"> + <DeployFile LocalName="Primer_D10_1.exe" Configuration="Release" Class="ProjectOutput"> + <Platform Name="Win32"> + <RemoteName>Primer_D10_1.exe</RemoteName> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployClass Name="ProjectiOSDeviceResourceRules"/> + <DeployClass Name="ProjectOSXResource"> + <Platform Name="OSX32"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidClassesDexFile"> + <Platform Name="Android"> + <RemoteDir>classes</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon144"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xxhdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AdditionalDebugSymbols"> + <Platform Name="Win32"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>0</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeMipsFile"> + <Platform Name="Android"> + <RemoteDir>library\lib\mips</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch768"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Required="true" Name="ProjectOutput"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="Linux64"> + <Operation>1</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DependencyFramework"> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch640"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeX86File"/> + <DeployClass Name="ProjectiOSDeviceDebug"> + <Platform Name="iOSDevice64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch1024"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch320"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSInfoPList"/> + <DeployClass Name="AndroidLibnativeArmeabiFile"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DebugSymbols"> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch1536"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage470"> + <Platform Name="Android"> + <RemoteDir>res\drawable-normal</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon96"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xhdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage640"> + <Platform Name="Android"> + <RemoteDir>res\drawable-large</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch640x1136"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSEntitlements"/> + <DeployClass Name="AndroidGDBServer"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon72"> + <Platform Name="Android"> + <RemoteDir>res\drawable-hdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectOSXInfoPList"/> + <DeployClass Name="ProjectOSXEntitlements"/> + <DeployClass Name="iPad_Launch2048"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidSplashStyles"> + <Platform Name="Android"> + <RemoteDir>res\values</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage426"> + <Platform Name="Android"> + <RemoteDir>res\drawable-small</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidSplashImageDef"> + <Platform Name="Android"> + <RemoteDir>res\drawable</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSResource"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectAndroidManifest"> + <Platform Name="Android"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_DefaultAppIcon"> + <Platform Name="Android"> + <RemoteDir>res\drawable</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="File"> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>0</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>0</Operation> + </Platform> + <Platform Name="Android"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidServiceOutput"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Required="true" Name="DependencyPackage"> + <Platform Name="Win32"> + <Operation>0</Operation> + <Extensions>.bpl</Extensions> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon48"> + <Platform Name="Android"> + <RemoteDir>res\drawable-mdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage960"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xlarge</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon36"> + <Platform Name="Android"> + <RemoteDir>res\drawable-ldpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DependencyModule"> + <Platform Name="Win32"> + <Operation>0</Operation> + <Extensions>.dll;.bpl</Extensions> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + </DeployClass> + <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/> + <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/> + <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> + </Deployment> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="Main.pas"> + <Form>MainForm</Form> + </DCCReference> + <DCCReference Include="Model\Model.pas"/> + <DCCReference Include="ContactView.pas"> + <Form>ContactViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="BasicView.pas"> + <Form>BasicViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="BasicEdit.pas"> + <Form>BasicEditForm</Form> + </DCCReference> + <DCCReference Include="ContactEdit.pas"> + <Form>ContactEditForm</Form> + </DCCReference> + <DCCReference Include="PersonEdit.pas"> + <Form>PersonEditForm</Form> + </DCCReference> + <DCCReference Include="CompanyEdit.pas"> + <Form>CompanyEditForm</Form> + </DCCReference> + <DCCReference Include="DemoData.pas"/> + <DCCReference Include="ContactFilterEdit.pas"> + <Form>ContactFilterEditForm</Form> + </DCCReference> + <DCCReference Include="MainData.pas"> + <Form>MainDataModule</Form> + <DesignClass>TDataModule</DesignClass> + </DCCReference> + <DCCReference Include="ContactBrowse.pas"> + <Form>ContactBrowseForm</Form> + </DCCReference> + <DCCReference Include="CompanyBrowse.pas"> + <Form>CompanyBrowseForm</Form> + </DCCReference> + <DCCReference Include="PerformanceView.pas"> + <Form>PerformanceViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="Welcome.pas"> + <Form>WelcomeForm</Form> + </DCCReference> + <DCCReference Include="PersonBrowse.pas"> + <Form>PersonBrowseForm</Form> + </DCCReference> + <DCCReference Include="BasicBrowse.pas"> + <Form>BasicBrowseForm</Form> + </DCCReference> + <DCCReference Include="CountryBrowse.pas"> + <Form>CountryBrowseForm</Form> + </DCCReference> + <DCCReference Include="DemoDataRequest.pas"> + <Form>DemoDataRequestForm</Form> + </DCCReference> + <DCCReference Include="ContactSort.pas"> + <Form>ContactSortForm</Form> + </DCCReference> + <DCCReference Include="CategoryBrowse.pas"> + <Form>CategoryBrowseForm</Form> + </DCCReference> + <DCCReference Include="HelpView.pas"> + <Form>HelpViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="QueryView.pas"> + <Form>QueryViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="RandomData.pas"/> + <DCCReference Include="Stopwatch.pas"/> + <DCCReference Include="Utility.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"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> + <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/> +</Project> Property changes on: trunk/Demos/PrimerCross/Primer_D10_1.dproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10_1.mdr =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_D10_1.mdr =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_1.mdr 2016-05-31 18:34:19 UTC (rev 976) +++ trunk/Demos/PrimerCross/Primer_D10_1.mdr 2016-05-31 18:37:50 UTC (rev 977) Property changes on: trunk/Demos/PrimerCross/Primer_D10_1.mdr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10_1.res =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_D10_1.res =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_1.res 2016-05-31 18:34:19 UTC (rev 976) +++ trunk/Demos/PrimerCross/Primer_D10_1.res 2016-05-31 18:37:50 UTC (rev 977) Property changes on: trunk/Demos/PrimerCross/Primer_D10_1.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10_1.xml =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_1.xml (rev 0) +++ trunk/Demos/PrimerCross/Primer_D10_1.xml 2016-05-31 18:37:50 UTC (rev 977) @@ -0,0 +1,54 @@ +<TInstantConnectionDefs> + <TInstantIBXConnectionDef> + <Name>IBX_Firebird</Name> + <IsBuilt>TRUE</IsBuilt> + <BlobStreamFormat>sfXML</BlobStreamFormat> + <LoginPrompt>FALSE</LoginPrompt> + <ConnectionString>127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB</ConnectionString> + <Options></Options> + <Params>user_name=SYSDBA +password=masterkey +lc_ctype=ISO8859_1</Params> + </TInstantIBXConnectionDef> + <TInstantXMLConnectionDef> + <Name>XmlDB</Name> + <IsBuilt>TRUE</IsBuilt> + <RootFolder>.\XmlDB</RootFolder> + </TInstantXMLConnectionDef> + <TInstantDBXConnectionDef> + <Name>DBX_Firebird</Name> + <IsBuilt>TRUE</IsBuilt> + <BlobStreamFormat>sfXML</BlobStreamFormat> + <LoginPrompt>FALSE</LoginPrompt> + <ConnectionName>FBConnection</ConnectionName> + <DriverName>Firebird</DriverName> + <Params>DriverName=Firebird +Database=127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB +RoleName=RoleName +User_Name=sysdba +Password=masterkey +ServerCharSet= +SQLDialect=3 +ErrorResourceFile= +LocaleCode=0000 +BlobSize=-1 +CommitRetain=False +WaitOnLocks=True +IsolationLevel=ReadCommitted +Trim Char=False +</Params> + </TInstantDBXConnectionDef> + <TInstantFireDACConnectionDef> + <Name>FireDAC_Firebird</Name> + <IsBuilt>TRUE</IsBuilt> + <BlobStreamFormat>sfXML</BlobStreamFormat> + <Database>C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB</Database> + <HostName>127.0.0.1</HostName> + <LoginPrompt>FALSE</LoginPrompt> + <Password>masterkey</Password> + <Port>0</Port> + <Protocol>FB</Protocol> + <UseDelimitedIdents>FALSE</UseDelimitedIdents> + <UserName>SYSDBA</UserName> + </TInstantFireDACConnectionDef> +</TInstantConnectionDefs> Property changes on: trunk/Demos/PrimerCross/Primer_D10_1.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property |
From: <car...@us...> - 2016-05-31 18:34:24
|
Revision: 976 http://sourceforge.net/p/instantobjects/code/976 Author: carlobar Date: 2016-05-31 18:34:19 +0000 (Tue, 31 May 2016) Log Message: ----------- Added support for Delphi 10.1 Berlin Modified Paths: -------------- trunk/Docs/Changes.txt Added Paths: ----------- trunk/Source/Brokers/ADO/D10/DclIOADO.res trunk/Source/Brokers/ADO/D10/IOADO.res trunk/Source/Brokers/ADO/D10_1/ trunk/Source/Brokers/ADO/D10_1/DclIOADO.dpk trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj trunk/Source/Brokers/ADO/D10_1/DclIOADO.res trunk/Source/Brokers/ADO/D10_1/IOADO.dpk trunk/Source/Brokers/ADO/D10_1/IOADO.dproj trunk/Source/Brokers/ADO/D10_1/IOADO.res trunk/Source/Brokers/DBX/D10/IODBX.res trunk/Source/Brokers/DBX/D10_1/ trunk/Source/Brokers/DBX/D10_1/DclIODBX.dpk trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj trunk/Source/Brokers/DBX/D10_1/DclIODBX.res trunk/Source/Brokers/DBX/D10_1/IODBX.dpk trunk/Source/Brokers/DBX/D10_1/IODBX.dproj trunk/Source/Brokers/DBX/D10_1/IODBX.res trunk/Source/Brokers/FireDAC/D10_1/ trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dpk trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.res trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dpk trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.res trunk/Source/Brokers/IBX/D10_1/ trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dpk trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dproj trunk/Source/Brokers/IBX/D10_1/DclIOIBX.res trunk/Source/Brokers/IBX/D10_1/IOIBX.dpk trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj trunk/Source/Brokers/IBX/D10_1/IOIBX.res trunk/Source/Brokers/XML/D10_1/ trunk/Source/Brokers/XML/D10_1/DclIOXML.dpk trunk/Source/Brokers/XML/D10_1/DclIOXML.dproj trunk/Source/Brokers/XML/D10_1/DclIOXML.res trunk/Source/Brokers/XML/D10_1/IOXML.dpk trunk/Source/Brokers/XML/D10_1/IOXML.dproj trunk/Source/Brokers/XML/D10_1/IOXML.res trunk/Source/Catalogs/IBFb/D10_1/ trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dpk trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.res trunk/Source/Catalogs/MSSql/D10_1/ trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dpk trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dproj trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.res trunk/Source/Catalogs/MySQL/D10_1/ trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dpk trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.res trunk/Source/Core/D10_1/ trunk/Source/Core/D10_1/IOCore.dpk trunk/Source/Core/D10_1/IOCore.dproj trunk/Source/Core/D10_1/IOCore.res trunk/Source/Design/D10_1/ trunk/Source/Design/D10_1/DclIOCore.dpk trunk/Source/Design/D10_1/DclIOCore.dproj trunk/Source/Design/D10_1/DclIOCore.res trunk/Source/PackageGroups/D10_1/ trunk/Source/PackageGroups/D10_1/DesignTimePackages.groupproj trunk/Source/PackageGroups/D10_1/RunTimePackages.groupproj trunk/Tests/TestIO_D10_1.mdr trunk/Tests/TestIO_D10_1.res Modified: trunk/Docs/Changes.txt =================================================================== --- trunk/Docs/Changes.txt 2016-05-31 17:36:59 UTC (rev 975) +++ trunk/Docs/Changes.txt 2016-05-31 18:34:19 UTC (rev 976) @@ -1,5 +1,7 @@ VERSION HISTORY --------------- +Version 2.5 (2.5.0.0) (2016-05-31) +- Added support for Delphi 10.1 Berlin Version 2.4 (2.4.0.0) (2015-09-01) - Added support for Delphi 10 Seattle Added: trunk/Source/Brokers/ADO/D10/DclIOADO.res =================================================================== (Binary files differ) Index: trunk/Source/Brokers/ADO/D10/DclIOADO.res =================================================================== --- trunk/Source/Brokers/ADO/D10/DclIOADO.res 2016-05-31 17:36:59 UTC (rev 975) +++ trunk/Source/Brokers/ADO/D10/DclIOADO.res 2016-05-31 18:34:19 UTC (rev 976) Property changes on: trunk/Source/Brokers/ADO/D10/DclIOADO.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Source/Brokers/ADO/D10/IOADO.res =================================================================== (Binary files differ) Index: trunk/Source/Brokers/ADO/D10/IOADO.res =================================================================== --- trunk/Source/Brokers/ADO/D10/IOADO.res 2016-05-31 17:36:59 UTC (rev 975) +++ trunk/Source/Brokers/ADO/D10/IOADO.res 2016-05-31 18:34:19 UTC (rev 976) Property changes on: trunk/Source/Brokers/ADO/D10/IOADO.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Source/Brokers/ADO/D10_1/DclIOADO.dpk =================================================================== --- trunk/Source/Brokers/ADO/D10_1/DclIOADO.dpk (rev 0) +++ trunk/Source/Brokers/ADO/D10_1/DclIOADO.dpk 2016-05-31 18:34:19 UTC (rev 976) @@ -0,0 +1,41 @@ +package DclIOADO; + +{$R *.res} +{$R '..\InstantADO.dcr'} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS ON} +{$RANGECHECKS ON} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'InstantObjects ADO Design-Time Support (Delphi 10.1 Berlin)'} +{$LIBSUFFIX '_D24'} +{$DESIGNONLY} +{$IMPLICITBUILD OFF} + +requires + rtl, + IOADO; + +contains + InstantADOReg in '..\InstantADOReg.pas'; + +end. Property changes on: trunk/Source/Brokers/ADO/D10_1/DclIOADO.dpk ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj (rev 0) +++ trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj 2016-05-31 18:34:19 UTC (rev 976) @@ -0,0 +1,212 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{25086FF7-139E-40BB-9278-EDE3F344302B}</ProjectGuid> + <MainSource>DclIOADO.dpk</MainSource> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Debug</Config> + <TargetedPlatforms>1</TargetedPlatforms> + <AppType>Package</AppType> + <FrameworkType>None</FrameworkType> + <ProjectVersion>19.0</ProjectVersion> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''"> + <Base_Android>true</Base_Android> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> + <Base_iOSDevice32>true</Base_iOSDevice32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> + <Base_iOSDevice64>true</Base_iOSDevice64> + <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="('$(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="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> + <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> + <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <SanitizedProjectName>DclIOADO</SanitizedProjectName> + <DesignOnlyPackage>true</DesignOnlyPackage> + <DCC_ImageBase>00400000</DCC_ImageBase> + <DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> + <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> + <DCC_Description>InstantObjects ADO Design-Time Support (Delphi 10.1 Berlin)</DCC_Description> + <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck> + <DCC_RangeChecking>true</DCC_RangeChecking> + <DCC_N>false</DCC_N> + <DCC_K>false</DCC_K> + <GenDll>true</GenDll> + <DCC_S>false</DCC_S> + <DCC_F>false</DCC_F> + <GenPackage>true</GenPackage> + <DllSuffix>_D24</DllSuffix> + <DCC_E>false</DCC_E> + <VerInfo_Locale>1033</VerInfo_Locale> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Android)'!=''"> + <EnabledSysJars>android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar</EnabledSysJars> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <DCC_UsePackage>IOADO;$(DCC_UsePackage)</DCC_UsePackage> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> + <DCC_DebugInformation>0</DCC_DebugInformation> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + <DCC_Optimize>false</DCC_Optimize> + <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + </PropertyGroup> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="..\InstantADO.dcr"/> + <DCCReference Include="rtl.dcp"/> + <DCCReference Include="IOADO.dcp"/> + <DCCReference Include="..\InstantADOReg.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> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>Package</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Source> + <Source Name="MainSource">DclIOADO.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)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <Platforms> + <Platform value="Android">False</Platform> + <Platform value="iOSDevice32">False</Platform> + <Platform value="iOSDevice64">False</Platform> + <Platform value="iOSSimulator">False</Platform> + <Platform value="OSX32">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> +</Project> Property changes on: trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Source/Brokers/ADO/D10_1/DclIOADO.res =================================================================== (Binary files differ) Index: trunk/Source/Brokers/ADO/D10_1/DclIOADO.res =================================================================== --- trunk/Source/Brokers/ADO/D10_1/DclIOADO.res 2016-05-31 17:36:59 UTC (rev 975) +++ trunk/Source/Brokers/ADO/D10_1/DclIOADO.res 2016-05-31 18:34:19 UTC (rev 976) Property changes on: trunk/Source/Brokers/ADO/D10_1/DclIOADO.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Source/Brokers/ADO/D10_1/IOADO.dpk =================================================================== --- trunk/Source/Brokers/ADO/D10_1/IOADO.dpk (rev 0) +++ trunk/Source/Brokers/ADO/D10_1/IOADO.dpk 2016-05-31 18:34:19 UTC (rev 976) @@ -0,0 +1,47 @@ +package IOADO; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST ON} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'InstantObjects ADO Run-Time Support (Delphi 10 Berlin)'} +{$LIBSUFFIX '_D24'} +{$RUNONLY} +{$IMPLICITBUILD OFF} + +requires + vcl, + vcldb, + adortl, + IOCore, + IOMSSqlCatalog; + +contains + InstantADOX in '..\InstantADOX.pas', + InstantADOJRO in '..\InstantADOJRO.pas', + InstantADOTools in '..\InstantADOTools.pas', + InstantADOConnectionDefEdit in '..\InstantADOConnectionDefEdit.pas' {InstantADOConnectionDefEditForm}, + InstantADO in '..\InstantADO.pas'; + +end. Property changes on: trunk/Source/Brokers/ADO/D10_1/IOADO.dpk ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Source/Brokers/ADO/D10_1/IOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10_1/IOADO.dproj (rev 0) +++ trunk/Source/Brokers/ADO/D10_1/IOADO.dproj 2016-05-31 18:34:19 UTC (rev 976) @@ -0,0 +1,216 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{A15C8D03-E537-4203-982B-A812DB31354A}</ProjectGuid> + <MainSource>IOADO.dpk</MainSource> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Debug</Config> + <TargetedPlatforms>1</TargetedPlatforms> + <AppType>Package</AppType> + <FrameworkType>VCL</FrameworkType> + <ProjectVersion>19.0</ProjectVersion> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''"> + <Base_Android>true</Base_Android> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> + <Base_iOSDevice32>true</Base_iOSDevice32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> + <Base_iOSDevice64>true</Base_iOSDevice64> + <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="('$(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="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> + <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> + <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <SanitizedProjectName>IOADO</SanitizedProjectName> + <DCC_ImageBase>00400000</DCC_ImageBase> + <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> + <DllSuffix>_D24</DllSuffix> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <DCC_Description>InstantObjects ADO Run-Time Support (Delphi 10 Berlin)</DCC_Description> + <DCC_WriteableConstants>true</DCC_WriteableConstants> + <RuntimeOnlyPackage>true</RuntimeOnlyPackage> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;Data.Win;$(DCC_Namespace)</DCC_Namespace> + <DCC_N>false</DCC_N> + <DCC_K>false</DCC_K> + <GenDll>true</GenDll> + <DCC_S>false</DCC_S> + <VerInfo_Locale>1033</VerInfo_Locale> + <GenPackage>true</GenPackage> + <DCC_F>false</DCC_F> + <DCC_E>false</DCC_E> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Android)'!=''"> + <EnabledSysJars>android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar</EnabledSysJars> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <DCC_Namespace>Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> + <DCC_DebugInformation>0</DCC_DebugInformation> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + <DCC_Optimize>false</DCC_Optimize> + <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + </PropertyGroup> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="vcl.dcp"/> + <DCCReference Include="vcldb.dcp"/> + <DCCReference Include="adortl.dcp"/> + <DCCReference Include="IOCore.dcp"/> + <DCCReference Include="IOMSSqlCatalog.dcp"/> + <DCCReference Include="..\InstantADOX.pas"/> + <DCCReference Include="..\InstantADOJRO.pas"/> + <DCCReference Include="..\InstantADOTools.pas"/> + <DCCReference Include="..\InstantADOConnectionDefEdit.pas"> + <Form>InstantADOConnectionDefEditForm</Form> + </DCCReference> + <DCCReference Include="..\InstantADO.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> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>Package</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Source> + <Source Name="MainSource">IOADO.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)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <Platforms> + <Platform value="Android">False</Platform> + <Platform value="iOSDevice32">False</Platform> + <Platform value="iOSDevice64">False</Platform> + <Platform value="iOSSimulator">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> +</Project> Property changes on: trunk/Source/Brokers/ADO/D10_1/IOADO.dproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Source/Brokers/ADO/D10_1/IOADO.res =================================================================== (Binary files differ) Index: trunk/Source/Brokers/ADO/D10_1/IOADO.res =================================================================== --- trunk/Source/Brokers/ADO/D10_1/IOADO.res 2016-05-31 17:36:59 UTC (rev 975) +++ trunk/Source/Brokers/ADO/D10_1/IOADO.res 2016-05-31 18:34:19 UTC (rev 976) Property changes on: trunk/Source/Brokers/ADO/D10_1/IOADO.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Source/Brokers/DBX/D10/IODBX.res =================================================================== (Binary files differ) Index: trunk/Source/Brokers/DBX/D10/IODBX.res =================================================================== --- trunk/Source/Brokers/DBX/D10/IODBX.res 2016-05-31 17:36:59 UTC (rev 975) +++ trunk/Source/Brokers/DBX/D10/IODBX.res 2016-05-31 18:34:19 UTC (rev 976) Property changes on: trunk/Source/Brokers/DBX/D10/IODBX.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Source/Brokers/DBX/D10_1/DclIODBX.dpk =================================================================== --- trunk/Source/Brokers/DBX/D10_1/DclIODBX.dpk (rev 0) +++ trunk/Source/Brokers/DBX/D10_1/DclIODBX.dpk 2016-05-31 18:34:19 UTC (rev 976) @@ -0,0 +1,45 @@ +package DclIODBX; + +{$R *.res} +{$R '..\InstantDBX.dcr'} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS ON} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'InstantObjects dbExpress Design-Time Support (Delphi 10.1 Berlin)'} +{$LIBSUFFIX '_D24'} +{$DESIGNONLY} +{$IMPLICITBUILD OFF} + +requires + rtl, + vcl, + dbrtl, + dbexpress, + IOCore, + IODBX; + +contains + InstantDBXReg in '..\InstantDBXReg.pas'; + +end. Property changes on: trunk/Source/Brokers/DBX/D10_1/DclIODBX.dpk ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj (rev 0) +++ trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj 2016-05-31 18:34:19 UTC (rev 976) @@ -0,0 +1,222 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{842285A6-913E-48EA-828B-CC991BAB45A2}</ProjectGuid> + <MainSource>DclIODBX.dpk</MainSource> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Debug</Config> + <TargetedPlatforms>1</TargetedPlatforms> + <AppType>Package</AppType> + <FrameworkType>VCL</FrameworkType> + <ProjectVersion>19.0</ProjectVersion> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''"> + <Base_Android>true</Base_Android> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> + <Base_iOSDevice32>true</Base_iOSDevice32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> + <Base_iOSDevice64>true</Base_iOSDevice64> + <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="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> + <Base_Win64>true</Base_Win64> + <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="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> + <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> + <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <SanitizedProjectName>DclIODBX</SanitizedProjectName> + <DCC_UsePackage>rtl;dbrtl;dbexpress;$(DCC_UsePackage)</DCC_UsePackage> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <DesignOnlyPackage>true</DesignOnlyPackage> + <DCC_TypedAtParameter>true</DCC_TypedAtParameter> + <DllSuffix>_D24</DllSuffix> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> + <DCC_Description>InstantObjects dbExpress Design-Time Support (Delphi 10.1 Berlin)</DCC_Description> + <DCC_ImageBase>00400000</DCC_ImageBase> + <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> + <DCC_N>false</DCC_N> + <DCC_K>false</DCC_K> + <GenDll>true</GenDll> + <DCC_S>false</DCC_S> + <VerInfo_Locale>1033</VerInfo_Locale> + <GenPackage>true</GenPackage> + <DCC_F>false</DCC_F> + <DCC_E>false</DCC_E> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Android)'!=''"> + <EnabledSysJars>android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar</EnabledSysJars> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <DCC_UsePackage>vcl;IOCore;IODBX;$(DCC_UsePackage)</DCC_UsePackage> + <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win64)'!=''"> + <DCC_UsePackage>vcl;$(DCC_UsePackage)</DCC_UsePackage> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> + <DCC_DebugInformation>0</DCC_DebugInformation> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + <DCC_Optimize>false</DCC_Optimize> + <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + </PropertyGroup> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="..\InstantDBX.dcr"/> + <DCCReference Include="rtl.dcp"/> + <DCCReference Include="vcl.dcp"/> + <DCCReference Include="dbrtl.dcp"/> + <DCCReference Include="dbexpress.dcp"/> + <DCCReference Include="IOCore.dcp"/> + <DCCReference Include="IODBX.dcp"/> + <DCCReference Include="..\InstantDBXReg.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> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>Package</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Source> + <Source Name="MainSource">DclIODBX.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)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <Platforms> + <Platform value="Android">False</Platform> + <Platform value="iOSDevice32">False</Platform> + <Platform value="iOSDevice64">False</Platform> + <Platform value="iOSSimulator">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> +</Project> Property changes on: trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Source/Brokers/DBX/D10_1/DclIODBX.res =================================================================== (Binary files differ) Index: trunk/Source/Brokers/DBX/D10_1/DclIODBX.res =================================================================== --- trunk/Source/Brokers/DBX/D10_1/DclIODBX.res 2016-05-31 17:36:59 UTC (rev 975) +++ trunk/Source/Brokers/DBX/D10_1/DclIODBX.res 2016-05-31 18:34:19 UTC (rev 976) Property changes on: trunk/Source/Brokers/DBX/D10_1/DclIODBX.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Source/Brokers/DBX/D10_1/IODBX.dpk =================================================================== --- trunk/Source/Brokers/DBX/D10_1/IODBX.dpk (rev 0) +++ trunk/Source/Brokers/DBX/D10_1/IODBX.dpk 2016-05-31 18:34:19 UTC (rev 976) @@ -0,0 +1,47 @@ +package IODBX; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'InstantObjects dbExpress Run-Time Support (Delphi 10 Berlin)'} +{$LIBSUFFIX '_D24'} +{$RUNONLY} +{$IMPLICITBUILD OFF} + +requires + rtl, + vcl, + dbrtl, + dbexpress, + IOCore, + IOIBFbCatalog, + IOMSSqlCatalog, + IOMySQLCatalog; + +contains + InstantDBXConnectionDefEdit in '..\InstantDBXConnectionDefEdit.pas' {InstantDBXConnectionDefEditForm}, + InstantDBX in '..\InstantDBX.pas'; + +end. Property changes on: trunk/Source/Brokers/DBX/D10_1/IODBX.dpk ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Source/Brokers/DBX/D10_1/IODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10_1/IODBX.dproj (rev 0) +++ trunk/Source/Brokers/DBX/D10_1/IODBX.dproj 2016-05-31 18:34:19 UTC (rev 976) @@ -0,0 +1,215 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{6826D1DF-E0FF-43C6-BE04-D34587C58280}</ProjectGuid> + <MainSource>IODBX.dpk</MainSource> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Debug</Config> + <TargetedPlatforms>1</TargetedPlatforms> + <AppType>Package</AppType> + <FrameworkType>VCL</FrameworkType> + <ProjectVersion>19.0</ProjectVersion> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''"> + <Base_Android>true</Base_Android> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> + <Base_iOSDevice32>true</Base_iOSDevice32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> + <Base_iOSDevice64>true</Base_iOSDevice64> + <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="('$(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="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> + <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> + <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <SanitizedProjectName>IODBX</SanitizedProjectName> + <DCC_ImageBase>00400000</DCC_ImageBase> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <DllSuffix>_D24</DllSuffix> + <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> + <DCC_Description>InstantObjects dbExpress Run-Time Support (Delphi 10 Berlin)</DCC_Description> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> + <RuntimeOnlyPackage>true</RuntimeOnlyPackage> + <GenPackage>true</GenPackage> + <DCC_N>false</DCC_N> + <DCC_S>false</DCC_S> + <GenDll>true</GenDll> + <DCC_K>false</DCC_K> + <VerInfo_Locale>1033</VerInfo_Locale> + <DCC_E>false</DCC_E> + <DCC_F>false</DCC_F> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Android)'!=''"> + <EnabledSysJars>android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar</EnabledSysJars> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Bas... [truncated message content] |
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> |
From: <car...@us...> - 2015-09-07 09:48:32
|
Revision: 974 http://sourceforge.net/p/instantobjects/code/974 Author: carlobar Date: 2015-09-07 09:48:26 +0000 (Mon, 07 Sep 2015) Log Message: ----------- Support for Delphi 10 completed Demo PrimerCross updated Modified Paths: -------------- trunk/Demos/PrimerCross/BasicBrowse.dfm trunk/Demos/PrimerCross/BasicBrowse.pas trunk/Demos/PrimerCross/BasicEdit.pas trunk/Demos/PrimerCross/BasicView.pas trunk/Demos/PrimerCross/CompanyEdit.dfm trunk/Demos/PrimerCross/CompanyEdit.pas trunk/Demos/PrimerCross/ContactSort.pas trunk/Demos/PrimerCross/ContactView.dfm trunk/Demos/PrimerCross/ContactView.pas trunk/Demos/PrimerCross/HelpViewK3.dfm trunk/Demos/PrimerCross/HelpViewK3.pas trunk/Demos/PrimerCross/Main.dfm trunk/Demos/PrimerCross/Main.pas trunk/Demos/PrimerCross/PerformanceView.pas trunk/Demos/PrimerCross/PersonEdit.dfm trunk/Demos/PrimerCross/PersonEdit.pas trunk/Demos/PrimerCross/Primer_DXE7.dproj trunk/Demos/PrimerCross/Primer_DXE8.dpr trunk/Demos/PrimerCross/Primer_DXE8.dproj trunk/Demos/PrimerCross/QueryView.dfm trunk/Demos/PrimerCross/Welcome.dfm trunk/Demos/PrimerCross/Welcome.pas trunk/Docs/Changes.txt trunk/Source/Brokers/ADO/D2010/DclIOADO.dproj trunk/Source/InstantDefines.inc trunk/Tests/TestIO_DXE7.dproj trunk/Tests/TestIO_DXE8.dproj Added Paths: ----------- trunk/Demos/PrimerCross/Primer_D10.dpr trunk/Demos/PrimerCross/Primer_D10.dproj trunk/Demos/PrimerCross/Primer_D10.res trunk/Demos/PrimerCross/Primer_D10.xml trunk/Demos/PrimerCross/Primer_D10_Icon.ico trunk/Demos/PrimerCross/Primer_DXE7.tst trunk/Demos/PrimerCross/Primer_DXE7_Icon.ico trunk/Demos/PrimerCross/Primer_DXE8_Icon.ico trunk/Source/Brokers/ADO/D10/ trunk/Source/Brokers/ADO/D10/DclIOADO.dpk trunk/Source/Brokers/ADO/D10/DclIOADO.dproj trunk/Source/Brokers/ADO/D10/IOADO.dpk trunk/Source/Brokers/ADO/D10/IOADO.dproj trunk/Source/Brokers/DBX/D10/ trunk/Source/Brokers/DBX/D10/DclIODBX.dpk trunk/Source/Brokers/DBX/D10/DclIODBX.dproj trunk/Source/Brokers/DBX/D10/DclIODBX.res trunk/Source/Brokers/DBX/D10/IODBX.dpk trunk/Source/Brokers/DBX/D10/IODBX.dproj trunk/Source/Brokers/FireDAC/D10/ trunk/Source/Brokers/FireDAC/D10/DclIOFireDAC.dpk trunk/Source/Brokers/FireDAC/D10/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10/DclIOFireDAC.res trunk/Source/Brokers/FireDAC/D10/IOFireDAC.dpk trunk/Source/Brokers/FireDAC/D10/IOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10/IOFireDAC.res trunk/Source/Brokers/IBX/D10/ trunk/Source/Brokers/IBX/D10/DclIOIBX.dpk trunk/Source/Brokers/IBX/D10/DclIOIBX.dproj trunk/Source/Brokers/IBX/D10/DclIOIBX.res trunk/Source/Brokers/IBX/D10/IOIBX.dpk trunk/Source/Brokers/IBX/D10/IOIBX.dproj trunk/Source/Brokers/IBX/D10/IOIBX.res trunk/Source/Brokers/XML/D10/ trunk/Source/Brokers/XML/D10/DclIOXML.dpk trunk/Source/Brokers/XML/D10/DclIOXML.dproj trunk/Source/Brokers/XML/D10/DclIOXML.res trunk/Source/Brokers/XML/D10/IOXML.dpk trunk/Source/Brokers/XML/D10/IOXML.dproj trunk/Source/Brokers/XML/D10/IOXML.res trunk/Source/Catalogs/IBFb/D10/ trunk/Source/Catalogs/IBFb/D10/IOIBFbCatalog.dpk trunk/Source/Catalogs/IBFb/D10/IOIBFbCatalog.dproj trunk/Source/Catalogs/IBFb/D10/IOIBFbCatalog.res trunk/Source/Catalogs/MSSql/D10/ trunk/Source/Catalogs/MSSql/D10/IOMSSqlCatalog.dpk trunk/Source/Catalogs/MSSql/D10/IOMSSqlCatalog.dproj trunk/Source/Catalogs/MSSql/D10/IOMSSqlCatalog.res trunk/Source/Catalogs/MySQL/D10/ trunk/Source/Catalogs/MySQL/D10/IOMySQLCatalog.dpk trunk/Source/Catalogs/MySQL/D10/IOMySQLCatalog.dproj trunk/Source/Catalogs/MySQL/D10/IOMySQLCatalog.res trunk/Source/Core/D10/ trunk/Source/Core/D10/IOCore.dpk trunk/Source/Core/D10/IOCore.dproj trunk/Source/Core/D10/IOCore.res trunk/Source/Design/D10/ trunk/Source/Design/D10/DclIOCore.dpk trunk/Source/Design/D10/DclIOCore.dproj trunk/Source/Design/D10/DclIOCore.res trunk/Source/PackageGroups/D10/ trunk/Source/PackageGroups/D10/DesignTimePackages.groupproj trunk/Source/PackageGroups/D10/RunTimePackages.groupproj trunk/Tests/TestIO_D10.dpr trunk/Tests/TestIO_D10.dproj trunk/Tests/TestIO_D10.mdr trunk/Tests/TestIO_D10.mdrt trunk/Tests/TestIO_D10.mdx trunk/Tests/TestIO_D10.mdxt trunk/Tests/TestIO_D10.res Modified: trunk/Demos/PrimerCross/BasicBrowse.dfm =================================================================== --- trunk/Demos/PrimerCross/BasicBrowse.dfm 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/BasicBrowse.dfm 2015-09-07 09:48:26 UTC (rev 974) @@ -6,11 +6,7 @@ BorderIcons = [biSystemMenu] Caption = 'Browse' Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [] + ParentFont = True KeyPreview = True OldCreateOrder = False Position = poScreenCenter Modified: trunk/Demos/PrimerCross/BasicBrowse.pas =================================================================== --- trunk/Demos/PrimerCross/BasicBrowse.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/BasicBrowse.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -163,6 +163,7 @@ procedure TBasicBrowseForm.FormCreate(Sender: TObject); begin {$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); LoadMultipleImages(ActionImages,'BROWSEACTIONIMAGES',HInstance); BorderStyle := bsSingle; SelectItem.Default := True; Modified: trunk/Demos/PrimerCross/BasicEdit.pas =================================================================== --- trunk/Demos/PrimerCross/BasicEdit.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/BasicEdit.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -143,6 +143,7 @@ begin inherited; {$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); BorderStyle := bsSingle; {$ENDIF} {$IFDEF LINUX} Modified: trunk/Demos/PrimerCross/BasicView.pas =================================================================== --- trunk/Demos/PrimerCross/BasicView.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/BasicView.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -67,7 +67,9 @@ procedure TBasicViewForm.FormCreate(Sender: TObject); begin - ; +{$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); +{$ENDIF} end; procedure TBasicViewForm.FormHide(Sender: TObject); Modified: trunk/Demos/PrimerCross/CompanyEdit.dfm =================================================================== --- trunk/Demos/PrimerCross/CompanyEdit.dfm 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/CompanyEdit.dfm 2015-09-07 09:48:26 UTC (rev 974) @@ -95,7 +95,7 @@ TitleFont.Charset = DEFAULT_CHARSET TitleFont.Color = clWindowText TitleFont.Height = -11 - TitleFont.Name = 'MS Sans Serif' + TitleFont.Name = 'Arial' TitleFont.Style = [] Columns = < item Modified: trunk/Demos/PrimerCross/CompanyEdit.pas =================================================================== --- trunk/Demos/PrimerCross/CompanyEdit.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/CompanyEdit.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -172,6 +172,10 @@ begin inherited; {$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); + Font.Height := -11; + EmployeeGrid.TitleFont.Assign(Screen.IconFont); + LoadMultipleImages(ActionImages,'COMPANYEDITACTIONIMAGES',HInstance); {$ENDIF} {$IFDEF LINUX} Modified: trunk/Demos/PrimerCross/ContactSort.pas =================================================================== --- trunk/Demos/PrimerCross/ContactSort.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/ContactSort.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -56,6 +56,7 @@ procedure TContactSortForm.FormCreate(Sender: TObject); begin {$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); BorderStyle := bsDialog; {$ENDIF} {$IFDEF LINUX} Modified: trunk/Demos/PrimerCross/ContactView.dfm =================================================================== --- trunk/Demos/PrimerCross/ContactView.dfm 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/ContactView.dfm 2015-09-07 09:48:26 UTC (rev 974) @@ -188,12 +188,7 @@ Width = 627 Height = 432 Align = alClient - Font.Charset = ANSI_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Arial' - Font.Style = [] - ParentFont = False + ParentFont = True TabHeight = 18 TabOrder = 0 TabWidth = 30 Modified: trunk/Demos/PrimerCross/ContactView.pas =================================================================== --- trunk/Demos/PrimerCross/ContactView.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/ContactView.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -412,6 +412,10 @@ Caption := 'Contacts'; ContactGrid.OnDrawColumnCell := ContactGridDrawColumnCell; {$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); + Font.Height := -11; + ContactGrid.TitleFont.Assign(Screen.IconFont); + LoadMultipleImages(ActionImages,'CONTACTACTIONIMAGES',HInstance); LoadMultipleImages(ExplorerImages,'EXPLORERCONTACTIMAGES',HInstance); {$ENDIF} Modified: trunk/Demos/PrimerCross/HelpViewK3.dfm =================================================================== --- trunk/Demos/PrimerCross/HelpViewK3.dfm 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/HelpViewK3.dfm 2015-09-07 09:48:26 UTC (rev 974) @@ -1,9 +1,6 @@ inherited HelpViewForm: THelpViewForm Width = 486 VertScrollBar.Range = 37 - Font.Height = 19 - Font.Name = 'adobe-helvetica' - ParentFont = False object TextBrowser: TTextBrowser Left = 0 Top = 37 Modified: trunk/Demos/PrimerCross/HelpViewK3.pas =================================================================== --- trunk/Demos/PrimerCross/HelpViewK3.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/HelpViewK3.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -3,7 +3,8 @@ interface uses - SysUtils, Classes, BasicView, QForms, QControls, QComCtrls, QActnList; + SysUtils, Classes, BasicView, QForms, QControls, QComCtrls, QActnList, + ActnList, Controls, ComCtrls, ToolWin; type THelpViewForm = class(TBasicViewForm) @@ -24,6 +25,11 @@ procedure THelpViewForm.FormCreate(Sender: TObject); begin inherited; +{$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); + Font.Height = 19 + Font.Name = 'adobe-helvetica' +{$ENDIF} Caption := 'Overview'; acIndex.Execute; end; Modified: trunk/Demos/PrimerCross/Main.dfm =================================================================== --- trunk/Demos/PrimerCross/Main.dfm 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/Main.dfm 2015-09-07 09:48:26 UTC (rev 974) @@ -2,6 +2,8 @@ Left = 254 Top = 225 Caption = 'InstantObjects Primer' + ClientHeight = 181 + ClientWidth = 304 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -18,8 +20,9 @@ object SideBarSplitter: TSplitter Left = 88 Top = 26 - Height = 139 + Height = 136 ResizeStyle = rsLine + ExplicitHeight = 139 end object ToolBar: TToolBar Left = 0 @@ -45,7 +48,7 @@ end object StatusBar: TStatusBar Left = 0 - Top = 165 + Top = 162 Width = 304 Height = 19 Panels = < @@ -61,7 +64,7 @@ Left = 0 Top = 26 Width = 88 - Height = 139 + Height = 136 Align = alLeft BevelOuter = bvNone BorderStyle = bsSingle @@ -79,19 +82,14 @@ Left = 0 Top = 8 Width = 84 - Height = 127 + Height = 124 Align = alClient BorderStyle = bsNone Color = clAppWorkSpace Columns = <> - Font.Charset = DEFAULT_CHARSET - Font.Color = clCaptionText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [] IconOptions.AutoArrange = True ReadOnly = True - ParentFont = False + ParentFont = True TabOrder = 0 OnSelectItem = SideBarSelectItem end @@ -100,7 +98,7 @@ Left = 91 Top = 26 Width = 213 - Height = 139 + Height = 136 Align = alClient BevelOuter = bvNone TabOrder = 3 @@ -127,19 +125,14 @@ Width = 32 Height = 16 Caption = 'Title' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWhite - Font.Height = -13 - Font.Name = 'MS Sans Serif' - Font.Style = [fsBold] - ParentFont = False + ParentFont = True end end object WorkClientPanel: TPanel Left = 0 Top = 31 Width = 213 - Height = 108 + Height = 105 Align = alClient BevelOuter = bvNone TabOrder = 1 Modified: trunk/Demos/PrimerCross/Main.pas =================================================================== --- trunk/Demos/PrimerCross/Main.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/Main.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -528,6 +528,12 @@ begin Caption := Application.Title; {$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); + WorkTitleLabel.Color := clHighLightText; + WorkTitleLabel.Font.Height := -13; + WorkTitleLabel.Font.Style := [fsBold]; + SideBar.Font.Color := clCaptionText; + LoadMultipleImages(SideBarImages,'MAINSIDEBARIMAGES',HInstance); LoadMultipleImages(ActionImages,'MAINACTIONIMAGES',HInstance); with SideBar do Modified: trunk/Demos/PrimerCross/PerformanceView.pas =================================================================== --- trunk/Demos/PrimerCross/PerformanceView.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/PerformanceView.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -457,10 +457,9 @@ begin Caption := 'Performance'; InfoMemo.BorderStyle := bsNone; - SetTitleLabel(TitleLabel); - SetTitleLabel(ConnectionLabel); {$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); TestResultListView.OnEdited := TestResultListViewEditedVCL; TestResultListView.SortType := stText; {$ENDIF} @@ -468,6 +467,8 @@ TestResultListView.OnEdited := TestResultListViewEditedCLX; TestResultListView.Columns[0].Width := 180; {$ENDIF} + SetTitleLabel(TitleLabel); + SetTitleLabel(ConnectionLabel); end; procedure TPerformanceViewForm.FormHide(Sender: TObject); Modified: trunk/Demos/PrimerCross/PersonEdit.dfm =================================================================== --- trunk/Demos/PrimerCross/PersonEdit.dfm 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/PersonEdit.dfm 2015-09-07 09:48:26 UTC (rev 974) @@ -133,7 +133,7 @@ TitleFont.Charset = DEFAULT_CHARSET TitleFont.Color = clWindowText TitleFont.Height = -11 - TitleFont.Name = 'MS Sans Serif' + TitleFont.Name = 'Arial' TitleFont.Style = [] Columns = < item Modified: trunk/Demos/PrimerCross/PersonEdit.pas =================================================================== --- trunk/Demos/PrimerCross/PersonEdit.pas 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/PersonEdit.pas 2015-09-07 09:48:26 UTC (rev 974) @@ -178,6 +178,10 @@ begin inherited; {$IFDEF MSWINDOWS} + Font.Assign(Screen.IconFont); + Font.Height := -11; + EmailsGrid.TitleFont.Assign(Screen.IconFont); + LoadMultipleImages(EmployerToolImages,'PERSONEMPLOYERTOOLIMAGES',HInstance); {$IFNDEF VER130} PictureImage.Proportional := True; Added: trunk/Demos/PrimerCross/Primer_D10.dpr =================================================================== --- trunk/Demos/PrimerCross/Primer_D10.dpr (rev 0) +++ trunk/Demos/PrimerCross/Primer_D10.dpr 2015-09-07 09:48:26 UTC (rev 974) @@ -0,0 +1,82 @@ +(* + * InstantObjects + * Primer Demo - with "internal storage" of Part and Parts + * Model.pas unit is located in Model folder + * + *) + +(* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is: Seleqt InstantObjects + * + * The Initial Developer of the Original Code is: Seleqt + * + * Portions created by the Initial Developer are Copyright (C) 2001-2003 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Carlo Barazzetta, Nando Dessena + * + * ***** END LICENSE BLOCK ***** *) + +program Primer_D10; + +{$IFDEF LINUX} +{$I '../../Source/InstantDefines.inc'} +{$ELSE} +{$I '..\..\Source\InstantDefines.inc'} +{$ENDIF} + + +uses + Forms, + Main in 'Main.pas' {MainForm}, + Model in 'Model\Model.pas', + ContactView in 'ContactView.pas' {ContactViewForm: TFrame}, + BasicView in 'BasicView.pas' {BasicViewForm: TFrame}, + BasicEdit in 'BasicEdit.pas' {BasicEditForm}, + ContactEdit in 'ContactEdit.pas' {ContactEditForm}, + PersonEdit in 'PersonEdit.pas' {PersonEditForm}, + CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm}, + DemoData in 'DemoData.pas', + ContactFilterEdit in 'ContactFilterEdit.pas' {ContactFilterEditForm}, + MainData in 'MainData.pas' {MainDataModule: TDataModule}, + ContactBrowse in 'ContactBrowse.pas' {ContactBrowseForm}, + CompanyBrowse in 'CompanyBrowse.pas' {CompanyBrowseForm}, + PerformanceView in 'PerformanceView.pas' {PerformanceViewForm: TFrame}, + Welcome in 'Welcome.pas' {WelcomeForm}, + PersonBrowse in 'PersonBrowse.pas' {PersonBrowseForm}, + BasicBrowse in 'BasicBrowse.pas' {BasicBrowseForm}, + CountryBrowse in 'CountryBrowse.pas' {CountryBrowseForm}, + DemoDataRequest in 'DemoDataRequest.pas' {DemoDataRequestForm}, + ContactSort in 'ContactSort.pas' {ContactSortForm}, + CategoryBrowse in 'CategoryBrowse.pas' {CategoryBrowseForm}, + HelpView in 'HelpView.pas' {HelpViewForm: TFrame}, + QueryView in 'QueryView.pas' {QueryViewForm: TFrame}, + RandomData in 'RandomData.pas', + Stopwatch in 'Stopwatch.pas', + Utility in 'Utility.pas', + Vcl.Themes, + Vcl.Styles; + +{$R *.res} +{$R *.mdr} {Model} + +begin + Application.Initialize; + Application.Title := 'InstantObjects Primer Demo (Delphi 10 Seattle version)'; + Application.CreateForm(TMainForm, MainForm); + Application.CreateForm(TMainDataModule, MainDataModule); + Application.Run; +end. Property changes on: trunk/Demos/PrimerCross/Primer_D10.dpr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10.dproj =================================================================== --- trunk/Demos/PrimerCross/Primer_D10.dproj (rev 0) +++ trunk/Demos/PrimerCross/Primer_D10.dproj 2015-09-07 09:48:26 UTC (rev 974) @@ -0,0 +1,619 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid> + <MainSource>Primer_D10.dpr</MainSource> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> + <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName> + <ProjectVersion>18.0</ProjectVersion> + <Config Condition="'$(Config)'==''">Release</Config> + <Base>True</Base> + <AppType>Application</AppType> + <FrameworkType>VCL</FrameworkType> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> + <Base_iOSDevice32>true</Base_iOSDevice32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> + <Base_iOSDevice64>true</Base_iOSDevice64> + <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="('$(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="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> + <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> + <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <Icon_MainIcon>Primer_D10_Icon.ico</Icon_MainIcon> + <SanitizedProjectName>Primer_D10</SanitizedProjectName> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;IBX;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_MajorVer>2</VerInfo_MajorVer> + <VerInfo_Locale>1030</VerInfo_Locale> + <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys> + <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\FireDAC;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <DCC_UsePackage>vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclimg;vclactnband;adortl;vcldbx;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;vclie;xmlrtl;inet;dsnap;inetdb;IndySystem;IndyCore;IndyProtocols;DbxClientDriver;inetdbxpress;inetdbbde;DataSnapServer;dbxcds;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;vclib;ibxpress;intrawebdb_100_140;Intraweb_100_140;dsnapcon;vclribbon;VclSmp;soaprtl;TeeUI;TeeDB;Tee;vcltouch;webdsnap;websnap;rbRIDE1114;rbIDE1114;rbRAP1114;rbRCL1114;dclRBADO1114;rbADO1114;rbDB1114;rbDAD1114;dclRBBDE1114;rbDBDE1114;rbBDE1114;dclRBDBE1114;rbDBE1114;dclRBE1114;rbCIDE1114;dclRBIBE1114;rbIBE1114;rbUSERDesign1114;rbUSER1114;ActionBandExtensionsD2010;UniSynEdit_R2010;wPDF3_D2010;WPViewPDF_D2010;IOCore;Jcl;JclVcl;JvCoreD14R;JvSystemD14R;JvStdCtrlsD14R;JvAppFrmD14R;JvBandsD14R;JvDBD14R;JvDlgsD14R;JvBDED14R;JvCmpD14R;JvCryptD14R;JvCtrlsD14R;JvCustomD14R;JvDockingD14R;JvDotNetCtrlsD14R;JvEDID14R;JvGlobusD14R;JvHMID14R;JvInterpreterD14R;JvJansD14R;JvManagedThreadsD14R;JvMMD14R;JvNetD14R;JvPageCompsD14R;JvPluginD14R;JvPrintPreviewD14R;JvRuntimeDesignD14R;JvTimeFrameworkD14R;JvValidatorsD14R;JvWizardD14R;JvXPCtrlsD14R;rbDIDE1114;IOIBX;IOXML;IODBX;IOBDE;IOADO;ISRtl5;ISVcl5;ISOpenOffice5;ISFLib5;$(DCC_UsePackage)</DCC_UsePackage> + <DCC_DependencyCheckOutputName>Primer_DXE.exe</DCC_DependencyCheckOutputName> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <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)'!=''"> + <Version>7.0</Version> + <DCC_DebugInformation>0</DCC_DebugInformation> + <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <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> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_DebugDCUs>true</DCC_DebugDCUs> + <Version>7.0</Version> + <DCC_Define>DEBUG;IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + <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> + </PropertyGroup> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>VCLApplication</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Parameters/> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">True</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">2</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">1030</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName">InstantObjects.org</VersionInfoKeys> + <VersionInfoKeys Name="FileDescription">Primer Demo</VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"/> + <VersionInfoKeys Name="LegalCopyright">MPL public license</VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"/> + <VersionInfoKeys Name="OriginalFilename"/> + <VersionInfoKeys Name="ProductName"/> + <VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"/> + </VersionInfoKeys> + <Source> + <Source Name="MainSource">Primer_D10.dpr</Source> + </Source> + <Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k230.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp230.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <ModelSupport>False</ModelSupport> + <Platforms> + <Platform value="iOSDevice32">False</Platform> + <Platform value="iOSDevice64">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + <Deployment Version="2"> + <DeployFile LocalName="Primer_D10.exe" Configuration="Release" Class="ProjectOutput"> + <Platform Name="Win32"> + <RemoteName>Primer_D10.exe</RemoteName> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployClass Name="DependencyModule"> + <Platform Name="Win32"> + <Operation>0</Operation> + <Extensions>.dll;.bpl</Extensions> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + </DeployClass> + <DeployClass Name="ProjectOSXResource"> + <Platform Name="OSX32"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidClassesDexFile"> + <Platform Name="Android"> + <RemoteDir>classes</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon144"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xxhdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AdditionalDebugSymbols"> + <Platform Name="Win32"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>0</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeMipsFile"> + <Platform Name="Android"> + <RemoteDir>library\lib\mips</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch768"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Required="true" Name="ProjectOutput"> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DependencyFramework"> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch640"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeX86File"> + <Platform Name="Android"> + <RemoteDir>library\lib\x86</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSDeviceDebug"> + <Platform Name="iOSDevice64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch1024"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch320"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSInfoPList"/> + <DeployClass Name="AndroidLibnativeArmeabiFile"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DebugSymbols"> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch1536"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage470"> + <Platform Name="Android"> + <RemoteDir>res\drawable-normal</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon96"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xhdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage640"> + <Platform Name="Android"> + <RemoteDir>res\drawable-large</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch640x1136"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSEntitlements"/> + <DeployClass Name="AndroidGDBServer"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon72"> + <Platform Name="Android"> + <RemoteDir>res\drawable-hdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectOSXInfoPList"/> + <DeployClass Name="ProjectOSXEntitlements"/> + <DeployClass Name="iPad_Launch2048"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidSplashStyles"> + <Platform Name="Android"> + <RemoteDir>res\values</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage426"> + <Platform Name="Android"> + <RemoteDir>res\drawable-small</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidSplashImageDef"> + <Platform Name="Android"> + <RemoteDir>res\drawable</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSResource"> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectAndroidManifest"> + <Platform Name="Android"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_DefaultAppIcon"> + <Platform Name="Android"> + <RemoteDir>res\drawable</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="File"> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>0</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>0</Operation> + </Platform> + <Platform Name="Android"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidServiceOutput"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Required="true" Name="DependencyPackage"> + <Platform Name="Win32"> + <Operation>0</Operation> + <Extensions>.bpl</Extensions> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon48"> + <Platform Name="Android"> + <RemoteDir>res\drawable-mdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage960"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xlarge</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon36"> + <Platform Name="Android"> + <RemoteDir>res\drawable-ldpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSDeviceResourceRules"/> + <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/> + <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/> + <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> + </Deployment> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="Main.pas"> + <Form>MainForm</Form> + </DCCReference> + <DCCReference Include="Model\Model.pas"/> + <DCCReference Include="ContactView.pas"> + <Form>ContactViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="BasicView.pas"> + <Form>BasicViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="BasicEdit.pas"> + <Form>BasicEditForm</Form> + </DCCReference> + <DCCReference Include="ContactEdit.pas"> + <Form>ContactEditForm</Form> + </DCCReference> + <DCCReference Include="PersonEdit.pas"> + <Form>PersonEditForm</Form> + </DCCReference> + <DCCReference Include="CompanyEdit.pas"> + <Form>CompanyEditForm</Form> + </DCCReference> + <DCCReference Include="DemoData.pas"/> + <DCCReference Include="ContactFilterEdit.pas"> + <Form>ContactFilterEditForm</Form> + </DCCReference> + <DCCReference Include="MainData.pas"> + <Form>MainDataModule</Form> + <DesignClass>TDataModule</DesignClass> + </DCCReference> + <DCCReference Include="ContactBrowse.pas"> + <Form>ContactBrowseForm</Form> + </DCCReference> + <DCCReference Include="CompanyBrowse.pas"> + <Form>CompanyBrowseForm</Form> + </DCCReference> + <DCCReference Include="PerformanceView.pas"> + <Form>PerformanceViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="Welcome.pas"> + <Form>WelcomeForm</Form> + </DCCReference> + <DCCReference Include="PersonBrowse.pas"> + <Form>PersonBrowseForm</Form> + </DCCReference> + <DCCReference Include="BasicBrowse.pas"> + <Form>BasicBrowseForm</Form> + </DCCReference> + <DCCReference Include="CountryBrowse.pas"> + <Form>CountryBrowseForm</Form> + </DCCReference> + <DCCReference Include="DemoDataRequest.pas"> + <Form>DemoDataRequestForm</Form> + </DCCReference> + <DCCReference Include="ContactSort.pas"> + <Form>ContactSortForm</Form> + </DCCReference> + <DCCReference Include="CategoryBrowse.pas"> + <Form>CategoryBrowseForm</Form> + </DCCReference> + <DCCReference Include="HelpView.pas"> + <Form>HelpViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="QueryView.pas"> + <Form>QueryViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="RandomData.pas"/> + <DCCReference Include="Stopwatch.pas"/> + <DCCReference Include="Utility.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"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> + <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/> +</Project> Property changes on: trunk/Demos/PrimerCross/Primer_D10.dproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10.res =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_D10.res =================================================================== --- trunk/Demos/PrimerCross/Primer_D10.res 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/Primer_D10.res 2015-09-07 09:48:26 UTC (rev 974) Property changes on: trunk/Demos/PrimerCross/Primer_D10.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10.xml =================================================================== --- trunk/Demos/PrimerCross/Primer_D10.xml (rev 0) +++ trunk/Demos/PrimerCross/Primer_D10.xml 2015-09-07 09:48:26 UTC (rev 974) @@ -0,0 +1,54 @@ +<TInstantConnectionDefs> + <TInstantIBXConnectionDef> + <Name>IBX_Firebird</Name> + <IsBuilt>TRUE</IsBuilt> + <BlobStreamFormat>sfXML</BlobStreamFormat> + <LoginPrompt>FALSE</LoginPrompt> + <ConnectionString>127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB</ConnectionString> + <Options></Options> + <Params>user_name=SYSDBA +password=masterkey +lc_ctype=ISO8859_1</Params> + </TInstantIBXConnectionDef> + <TInstantXMLConnectionDef> + <Name>XmlDB</Name> + <IsBuilt>TRUE</IsBuilt> + <RootFolder>.\XmlDB</RootFolder> + </TInstantXMLConnectionDef> + <TInstantDBXConnectionDef> + <Name>DBX_Firebird</Name> + <IsBuilt>TRUE</IsBuilt> + <BlobStreamFormat>sfXML</BlobStreamFormat> + <LoginPrompt>FALSE</LoginPrompt> + <ConnectionName>FBConnection</ConnectionName> + <DriverName>Firebird</DriverName> + <Params>DriverName=Firebird +Database=127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB +RoleName=RoleName +User_Name=sysdba +Password=masterkey +ServerCharSet= +SQLDialect=3 +ErrorResourceFile= +LocaleCode=0000 +BlobSize=-1 +CommitRetain=False +WaitOnLocks=True +IsolationLevel=ReadCommitted +Trim Char=False +</Params> + </TInstantDBXConnectionDef> + <TInstantFireDACConnectionDef> + <Name>FireDAC_Firebird</Name> + <IsBuilt>TRUE</IsBuilt> + <BlobStreamFormat>sfXML</BlobStreamFormat> + <Database>C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB</Database> + <HostName>127.0.0.1</HostName> + <LoginPrompt>FALSE</LoginPrompt> + <Password>masterkey</Password> + <Port>0</Port> + <Protocol>FB</Protocol> + <UseDelimitedIdents>FALSE</UseDelimitedIdents> + <UserName>SYSDBA</UserName> + </TInstantFireDACConnectionDef> +</TInstantConnectionDefs> Property changes on: trunk/Demos/PrimerCross/Primer_D10.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_D10_Icon.ico =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_D10_Icon.ico =================================================================== --- trunk/Demos/PrimerCross/Primer_D10_Icon.ico 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/Primer_D10_Icon.ico 2015-09-07 09:48:26 UTC (rev 974) Property changes on: trunk/Demos/PrimerCross/Primer_D10_Icon.ico ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/Demos/PrimerCross/Primer_DXE7.dproj =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE7.dproj 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/Primer_DXE7.dproj 2015-09-07 09:48:26 UTC (rev 974) @@ -72,7 +72,7 @@ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> - <Icon_MainIcon>Primer_DXE6_Icon.ico</Icon_MainIcon> + <Icon_MainIcon>Primer_DXE7_Icon.ico</Icon_MainIcon> <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> <VerInfo_MajorVer>1</VerInfo_MajorVer> Added: trunk/Demos/PrimerCross/Primer_DXE7.tst =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_DXE7.tst =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE7.tst 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/Primer_DXE7.tst 2015-09-07 09:48:26 UTC (rev 974) Property changes on: trunk/Demos/PrimerCross/Primer_DXE7.tst ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_DXE7_Icon.ico =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_DXE7_Icon.ico =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE7_Icon.ico 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/Primer_DXE7_Icon.ico 2015-09-07 09:48:26 UTC (rev 974) Property changes on: trunk/Demos/PrimerCross/Primer_DXE7_Icon.ico ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/Demos/PrimerCross/Primer_DXE8.dpr =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE8.dpr 2015-08-26 09:26:58 UTC (rev 973) +++ trunk/Demos/PrimerCross/Primer... [truncated message content] |
From: <car...@us...> - 2015-08-26 09:27:00
|
Revision: 973 http://sourceforge.net/p/instantobjects/code/973 Author: carlobar Date: 2015-08-26 09:26:58 +0000 (Wed, 26 Aug 2015) Log Message: ----------- Modified Paths: -------------- trunk/Source/Core/InstantExplorer.pas trunk/Source/Core/InstantPersistence.pas Added Paths: ----------- trunk/Docs/InstantObjectsLogo.png Property Changed: ---------------- trunk/Source/Brokers/ADO/DXE8/ trunk/Source/Brokers/DBX/DXE8/ trunk/Source/Brokers/FireDAC/DXE8/ trunk/Source/Brokers/IBX/DXE8/ trunk/Source/Brokers/XML/DXE8/ trunk/Source/Catalogs/IBFb/DXE8/ trunk/Source/Catalogs/MSSql/DXE8/ trunk/Source/Catalogs/MySQL/DXE8/ trunk/Source/Core/DXE8/ Added: trunk/Docs/InstantObjectsLogo.png =================================================================== (Binary files differ) Index: trunk/Docs/InstantObjectsLogo.png =================================================================== --- trunk/Docs/InstantObjectsLogo.png 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Docs/InstantObjectsLogo.png 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Docs/InstantObjectsLogo.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Index: trunk/Source/Brokers/ADO/DXE8 =================================================================== --- trunk/Source/Brokers/ADO/DXE8 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Brokers/ADO/DXE8 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Source/Brokers/ADO/DXE8 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.local Index: trunk/Source/Brokers/DBX/DXE8 =================================================================== --- trunk/Source/Brokers/DBX/DXE8 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Brokers/DBX/DXE8 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Source/Brokers/DBX/DXE8 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.local Index: trunk/Source/Brokers/FireDAC/DXE8 =================================================================== --- trunk/Source/Brokers/FireDAC/DXE8 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Brokers/FireDAC/DXE8 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Source/Brokers/FireDAC/DXE8 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.local Index: trunk/Source/Brokers/IBX/DXE8 =================================================================== --- trunk/Source/Brokers/IBX/DXE8 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Brokers/IBX/DXE8 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Source/Brokers/IBX/DXE8 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.local Index: trunk/Source/Brokers/XML/DXE8 =================================================================== --- trunk/Source/Brokers/XML/DXE8 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Brokers/XML/DXE8 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Source/Brokers/XML/DXE8 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.local Index: trunk/Source/Catalogs/IBFb/DXE8 =================================================================== --- trunk/Source/Catalogs/IBFb/DXE8 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Catalogs/IBFb/DXE8 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Source/Catalogs/IBFb/DXE8 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.local Index: trunk/Source/Catalogs/MSSql/DXE8 =================================================================== --- trunk/Source/Catalogs/MSSql/DXE8 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Catalogs/MSSql/DXE8 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Source/Catalogs/MSSql/DXE8 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.local Index: trunk/Source/Catalogs/MySQL/DXE8 =================================================================== --- trunk/Source/Catalogs/MySQL/DXE8 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Catalogs/MySQL/DXE8 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Source/Catalogs/MySQL/DXE8 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.local Index: trunk/Source/Core/DXE8 =================================================================== --- trunk/Source/Core/DXE8 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Core/DXE8 2015-08-26 09:26:58 UTC (rev 973) Property changes on: trunk/Source/Core/DXE8 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +*.local +*.stat Modified: trunk/Source/Core/InstantExplorer.pas =================================================================== --- trunk/Source/Core/InstantExplorer.pas 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Core/InstantExplorer.pas 2015-08-26 09:26:58 UTC (rev 973) @@ -1114,7 +1114,6 @@ var IsExpanded: Boolean; NodeData: TInstantExplorerNodeData; - Container: TInstantContainer; begin if not Assigned(Node) then Exit; Modified: trunk/Source/Core/InstantPersistence.pas =================================================================== --- trunk/Source/Core/InstantPersistence.pas 2015-06-07 10:38:54 UTC (rev 972) +++ trunk/Source/Core/InstantPersistence.pas 2015-08-26 09:26:58 UTC (rev 973) @@ -3723,7 +3723,6 @@ var L: Integer; LAnsiValue: AnsiString; - LValue: String; begin //Default Blob streaming is not based on UseUnicode setting. LAnsiValue := AnsiString(AValue); |
From: <car...@us...> - 2015-06-07 10:38:57
|
Revision: 972 http://sourceforge.net/p/instantobjects/code/972 Author: carlobar Date: 2015-06-07 10:38:54 +0000 (Sun, 07 Jun 2015) Log Message: ----------- Added a demo to compile InstantObjects with FireMonkey Modified Paths: -------------- trunk/Docs/Changes.txt trunk/ReleaseTools/InstantReplicateResource.bat Added Paths: ----------- trunk/Demos/PrimerFireMonkey/ trunk/Demos/PrimerFireMonkey/Projects/ trunk/Demos/PrimerFireMonkey/Projects/DXE3/ trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dpr trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj trunk/Demos/PrimerFireMonkey/Projects/DXE5/ trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dpr trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dproj trunk/Demos/PrimerFireMonkey/Projects/DXE7/ trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dpr trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dproj Removed Paths: ------------- trunk/Source/Brokers/FireDAC/InstantFireDAC.dcu trunk/Source/Brokers/FireDAC/InstantFireDACCatalog.dcu trunk/Source/Brokers/FireDAC/InstantFireDACConnectionDefEdit.dcu trunk/Source/Brokers/FireDAC/InstantFireDACReg.dcu Added: trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dpr =================================================================== --- trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dpr (rev 0) +++ trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dpr 2015-06-07 10:38:54 UTC (rev 972) @@ -0,0 +1,17 @@ +program PrimerFM; + +uses + FMX.Forms, + Model in '..\..\Source\Model.pas', + RandomData in '..\..\Source\RandomData.pas', + DemoData in '..\..\Source\DemoData.pas', + Main in '..\..\Source\Main.pas' {fmMain}; + +{$R *.res} +{$R *.mdr} {Model} + +begin + Application.Initialize; + Application.CreateForm(TfmMain, fmMain); + Application.Run; +end. Property changes on: trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dpr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj =================================================================== --- trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj (rev 0) +++ trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj 2015-06-07 10:38:54 UTC (rev 972) @@ -0,0 +1,162 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{D129B31D-FF25-4936-907F-60B1F02932DF}</ProjectGuid> + <ProjectVersion>14.3</ProjectVersion> + <FrameworkType>FMX</FrameworkType> + <MainSource>PrimerFM.dpr</MainSource> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Debug</Config> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + <AppType>Application</AppType> + </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="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> + <Base_Win64>true</Base_Win64> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Debug' 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)'=='Release' or '$(Cfg_2)'!=''"> + <Cfg_2>true</Cfg_2> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <DCC_Define>FMX;$(DCC_Define)</DCC_Define> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <VerInfo_Locale>1040</VerInfo_Locale> + <Manifest_File>None</Manifest_File> + <DCC_UsePackage>bindcompfmx;fmx;rtl;dbrtl;IndySystem;DbxClientDriver;bindcomp;inetdb;DBXInterBaseDriver;DataSnapCommon;DataSnapClient;DataSnapServer;DataSnapProviderClient;xmlrtl;ibxpress;DbxCommonDriver;IndyProtocols;DBXMySQLDriver;dbxcds;soaprtl;FMXTee;bindengine;DBXOracleDriver;dsnap;DBXInformixDriver;IndyCore;fmxase;CloudService;FmxTeeUI;DBXFirebirdDriver;inet;fmxobj;inetdbxpress;DBXSybaseASADriver;fmxdae;dbexpress;DataSnapIndy10ServerTransport;IPIndyImpl;$(DCC_UsePackage)</DCC_UsePackage> + <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> + <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon> + <DCC_UnitSearchPath>..\..\..\..\Source\Core;..\..\..\..\Source\Catalogs;..\..\..\..\Source\Brokers\XML;..\..\..\..\Source\Brokers\DBX;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput> + <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput> + <DCC_E>false</DCC_E> + <DCC_N>false</DCC_N> + <DCC_S>false</DCC_S> + <DCC_F>false</DCC_F> + <DCC_K>false</DCC_K> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <DCC_UsePackage>IOCore;ISRtl5;vcldbx;ActionBandExtensionsDXE2;IOXML;TeeDB;ISVcl5;vclib;inetdbbde;Tee;DBXOdbcDriver;svnui;DBXSybaseASEDriver;vclimg;UniSynEdit_RXE2;intrawebdb_120_160;fmi;vclactnband;vcldb;TeeUI;bindcompvcl;vcldsnap;ISFLib5;vclie;vcltouch;Intraweb_120_160;DBXDb2Driver;websnap;ISOpenOffice5;vclribbon;VclSmp;vcl;DataSnapConnectors;DBXMSSQLDriver;IODBX;dsnapcon;IOIBX;IOBDE;vclx;webdsnap;svn;bdertl;IOADO;adortl;$(DCC_UsePackage)</DCC_UsePackage> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_Locale>1033</VerInfo_Locale> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <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="'$(Base_Win64)'!=''"> + <DCC_UsePackage>TeeDB;vclib;Tee;DBXOdbcDriver;DBXSybaseASEDriver;vclimg;vclactnband;vcldb;TeeUI;bindcompvcl;vcldsnap;vclie;vcltouch;DBXDb2Driver;websnap;vclribbon;VclSmp;vcl;DataSnapConnectors;DBXMSSQLDriver;dsnapcon;vclx;webdsnap;adortl;$(DCC_UsePackage)</DCC_UsePackage> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + <DCC_Optimize>false</DCC_Optimize> + <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> + <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_Locale>1033</VerInfo_Locale> + <DCC_RemoteDebug>false</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_DebugInformation>false</DCC_DebugInformation> + </PropertyGroup> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="..\..\Source\Model.pas"/> + <DCCReference Include="..\..\Source\RandomData.pas"/> + <DCCReference Include="..\..\Source\DemoData.pas"/> + <DCCReference Include="..\..\Source\Main.pas"> + <Form>fmMain</Form> + </DCCReference> + <BuildConfiguration Include="Release"> + <Key>Cfg_2</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + <BuildConfiguration Include="Base"> + <Key>Base</Key> + </BuildConfiguration> + <BuildConfiguration Include="Debug"> + <Key>Cfg_1</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + </ItemGroup> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType/> + <BorlandProject> + <Delphi.Personality> + <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">1040</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> + <Source> + <Source Name="MainSource">PrimerFM.dpr</Source> + </Source> + <Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <Deployment/> + <Platforms> + <Platform value="OSX32">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> +</Project> Property changes on: trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dpr =================================================================== --- trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dpr (rev 0) +++ trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dpr 2015-06-07 10:38:54 UTC (rev 972) @@ -0,0 +1,17 @@ +program PrimerFM; + +uses + FMX.Forms, + Model in '..\..\Source\Model.pas', + RandomData in '..\..\Source\RandomData.pas', + DemoData in '..\..\Source\DemoData.pas', + Main in '..\..\Source\Main.pas' {fmMain}; + +{$R *.res} +{$R *.mdr} {Model} + +begin + Application.Initialize; + Application.CreateForm(TfmMain, fmMain); + Application.Run; +end. Property changes on: trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dpr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dproj =================================================================== --- trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dproj (rev 0) +++ trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dproj 2015-06-07 10:38:54 UTC (rev 972) @@ -0,0 +1,178 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{D129B31D-FF25-4936-907F-60B1F02932DF}</ProjectGuid> + <ProjectVersion>15.3</ProjectVersion> + <FrameworkType>FMX</FrameworkType> + <MainSource>PrimerFM.dpr</MainSource> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Debug</Config> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + <AppType>Application</AppType> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='OSX32' and '$(Base)'=='true') or '$(Base_OSX32)'!=''"> + <Base_OSX32>true</Base_OSX32> + <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="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> + <Base_Win64>true</Base_Win64> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Debug' 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)'=='Release' or '$(Cfg_2)'!=''"> + <Cfg_2>true</Cfg_2> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='OSX32' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX32)'!=''"> + <Cfg_2_OSX32>true</Cfg_2_OSX32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <DCC_Define>FMX;$(DCC_Define)</DCC_Define> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <VerInfo_Locale>1040</VerInfo_Locale> + <Manifest_File>None</Manifest_File> + <DCC_UsePackage>bindcompfmx;fmx;rtl;dbrtl;IndySystem;DbxClientDriver;bindcomp;inetdb;DBXInterBaseDriver;DataSnapCommon;DataSnapClient;DataSnapServer;DataSnapProviderClient;xmlrtl;ibxpress;DbxCommonDriver;IndyProtocols;DBXMySQLDriver;dbxcds;soaprtl;FMXTee;bindengine;DBXOracleDriver;dsnap;DBXInformixDriver;IndyCore;fmxase;CloudService;FmxTeeUI;DBXFirebirdDriver;inet;fmxobj;inetdbxpress;DBXSybaseASADriver;fmxdae;dbexpress;DataSnapIndy10ServerTransport;IPIndyImpl;$(DCC_UsePackage)</DCC_UsePackage> + <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> + <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon> + <DCC_UnitSearchPath>..\..\..\..\Source\Core;..\..\..\..\Source\Catalogs;..\..\..\..\Source\Brokers\XML;..\..\..\..\Source\Brokers\DBX;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput> + <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput> + <DCC_E>false</DCC_E> + <DCC_N>false</DCC_N> + <DCC_S>false</DCC_S> + <DCC_F>false</DCC_F> + <DCC_K>false</DCC_K> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_OSX32)'!=''"> + <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <DCC_UsePackage>IOCore;ISRtl5;vcldbx;ActionBandExtensionsDXE2;IOXML;TeeDB;ISVcl5;vclib;inetdbbde;Tee;DBXOdbcDriver;svnui;DBXSybaseASEDriver;vclimg;UniSynEdit_RXE2;intrawebdb_120_160;fmi;vclactnband;vcldb;TeeUI;bindcompvcl;vcldsnap;ISFLib5;vclie;vcltouch;Intraweb_120_160;DBXDb2Driver;websnap;ISOpenOffice5;vclribbon;VclSmp;vcl;DataSnapConnectors;DBXMSSQLDriver;IODBX;dsnapcon;IOIBX;IOBDE;vclx;webdsnap;svn;bdertl;IOADO;adortl;$(DCC_UsePackage)</DCC_UsePackage> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_Locale>1033</VerInfo_Locale> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win64)'!=''"> + <DCC_UsePackage>TeeDB;vclib;Tee;DBXOdbcDriver;DBXSybaseASEDriver;vclimg;vclactnband;vcldb;TeeUI;bindcompvcl;vcldsnap;vclie;vcltouch;DBXDb2Driver;websnap;vclribbon;VclSmp;vcl;DataSnapConnectors;DBXMSSQLDriver;dsnapcon;vclx;webdsnap;adortl;$(DCC_UsePackage)</DCC_UsePackage> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + <DCC_Optimize>false</DCC_Optimize> + <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> + <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_Locale>1033</VerInfo_Locale> + <DCC_RemoteDebug>false</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_DebugInformation>0</DCC_DebugInformation> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_OSX32)'!=''"> + <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns> + </PropertyGroup> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="..\..\Source\Model.pas"/> + <DCCReference Include="..\..\Source\RandomData.pas"/> + <DCCReference Include="..\..\Source\DemoData.pas"/> + <DCCReference Include="..\..\Source\Main.pas"> + <Form>fmMain</Form> + </DCCReference> + <BuildConfiguration Include="Release"> + <Key>Cfg_2</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + <BuildConfiguration Include="Base"> + <Key>Base</Key> + </BuildConfiguration> + <BuildConfiguration Include="Debug"> + <Key>Cfg_1</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + </ItemGroup> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType/> + <BorlandProject> + <Delphi.Personality> + <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">1040</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> + <Source> + <Source Name="MainSource">PrimerFM.dpr</Source> + </Source> + <Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <Deployment/> + <Platforms> + <Platform value="OSX32">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> +</Project> Property changes on: trunk/Demos/PrimerFireMonkey/Projects/DXE5/PrimerFM.dproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dpr =================================================================== --- trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dpr (rev 0) +++ trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dpr 2015-06-07 10:38:54 UTC (rev 972) @@ -0,0 +1,17 @@ +program PrimerFM; + +uses + FMX.Forms, + Model in '..\..\Source\Model.pas', + RandomData in '..\..\Source\RandomData.pas', + DemoData in '..\..\Source\DemoData.pas', + Main in '..\..\Source\Main.pas' {fmMain}; + +{$R *.res} +{$R *.mdr} {Model} + +begin + Application.Initialize; + Application.CreateForm(TfmMain, fmMain); + Application.Run; +end. Property changes on: trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dpr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dproj =================================================================== --- trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dproj (rev 0) +++ trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dproj 2015-06-07 10:38:54 UTC (rev 972) @@ -0,0 +1,268 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{D129B31D-FF25-4936-907F-60B1F02932DF}</ProjectGuid> + <ProjectVersion>16.1</ProjectVersion> + <FrameworkType>FMX</FrameworkType> + <MainSource>PrimerFM.dpr</MainSource> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Debug</Config> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + <AppType>Application</AppType> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''"> + <Base_Android>true</Base_Android> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice' and '$(Base)'=='true') or '$(Base_iOSDevice)'!=''"> + <Base_iOSDevice>true</Base_iOSDevice> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSSimulator' and '$(Base)'=='true') or '$(Base_iOSSimulator)'!=''"> + <Base_iOSSimulator>true</Base_iOSSimulator> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='OSX32' and '$(Base)'=='true') or '$(Base_OSX32)'!=''"> + <Base_OSX32>true</Base_OSX32> + <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="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> + <Base_Win64>true</Base_Win64> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Debug' 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)'=='Release' or '$(Cfg_2)'!=''"> + <Cfg_2>true</Cfg_2> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='OSX32' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX32)'!=''"> + <Cfg_2_OSX32>true</Cfg_2_OSX32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns> + <SanitizedProjectName>PrimerFM</SanitizedProjectName> + <DCC_Define>FMX;$(DCC_Define)</DCC_Define> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <VerInfo_Locale>1040</VerInfo_Locale> + <Manifest_File>None</Manifest_File> + <DCC_UsePackage>bindcompfmx;fmx;rtl;dbrtl;IndySystem;DbxClientDriver;bindcomp;inetdb;DBXInterBaseDriver;DataSnapCommon;DataSnapClient;DataSnapServer;DataSnapProviderClient;xmlrtl;ibxpress;DbxCommonDriver;IndyProtocols;DBXMySQLDriver;dbxcds;soaprtl;FMXTee;bindengine;DBXOracleDriver;dsnap;DBXInformixDriver;IndyCore;fmxase;CloudService;FmxTeeUI;DBXFirebirdDriver;inet;fmxobj;inetdbxpress;DBXSybaseASADriver;fmxdae;dbexpress;DataSnapIndy10ServerTransport;IPIndyImpl;$(DCC_UsePackage)</DCC_UsePackage> + <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> + <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon> + <DCC_UnitSearchPath>..\..\..\..\Source\Core;..\..\..\..\Source\Catalogs;..\..\..\..\Source\Brokers\XML;..\..\..\..\Source\Brokers\DBX;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput> + <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput> + <DCC_E>false</DCC_E> + <DCC_N>false</DCC_N> + <DCC_S>false</DCC_S> + <DCC_F>false</DCC_F> + <DCC_K>false</DCC_K> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Android)'!=''"> + <Android_LauncherIcon48>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png</Android_LauncherIcon48> + <AUP_READ_EXTERNAL_STORAGE>true</AUP_READ_EXTERNAL_STORAGE> + <Android_SplashImage426>$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png</Android_SplashImage426> + <AUP_WRITE_EXTERNAL_STORAGE>true</AUP_WRITE_EXTERNAL_STORAGE> + <AUP_CAMERA>true</AUP_CAMERA> + <Android_SplashImage470>$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png</Android_SplashImage470> + <AUP_READ_CALENDAR>true</AUP_READ_CALENDAR> + <AUP_ACCESS_FINE_LOCATION>true</AUP_ACCESS_FINE_LOCATION> + <Android_SplashImage960>$(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png</Android_SplashImage960> + <Android_LauncherIcon96>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_96x96.png</Android_LauncherIcon96> + <AUP_CALL_PHONE>true</AUP_CALL_PHONE> + <Android_LauncherIcon144>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png</Android_LauncherIcon144> + <AUP_ACCESS_COARSE_LOCATION>true</AUP_ACCESS_COARSE_LOCATION> + <BT_BuildType>Debug</BT_BuildType> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <AUP_INTERNET>true</AUP_INTERNET> + <Android_LauncherIcon72>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png</Android_LauncherIcon72> + <Android_SplashImage640>$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png</Android_SplashImage640> + <Android_LauncherIcon36>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png</Android_LauncherIcon36> + <AUP_READ_PHONE_STATE>true</AUP_READ_PHONE_STATE> + <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar;hardwareAccelerated=true</VerInfo_Keys> + <AUP_WRITE_CALENDAR>true</AUP_WRITE_CALENDAR> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice)'!=''"> + <iPhone_Spotlight80>$(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png</iPhone_Spotlight80> + <iPhone_AppIcon180>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_180x180.png</iPhone_AppIcon180> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <iPhone_Launch1242>$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1242x2208.png</iPhone_Launch1242> + <iPhone_AppIcon120>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png</iPhone_AppIcon120> + <iPad_Launch768x1024>$(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png</iPad_Launch768x1024> + <iPad_AppIcon152>$(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png</iPad_AppIcon152> + <iPhone_Launch2208>$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png</iPhone_Launch2208> + <iPad_SpotLight80>$(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png</iPad_SpotLight80> + <iPad_SpotLight40>$(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png</iPad_SpotLight40> + <iPhone_AppIcon60>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png</iPhone_AppIcon60> + <BT_BuildType>Debug</BT_BuildType> + <iPhone_AppIcon87>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_87x87.png</iPhone_AppIcon87> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <iPhone_Launch750>$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_750x1334.png</iPhone_Launch750> + <iPad_Launch1536x2048>$(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png</iPad_Launch1536x2048> + <iPhone_Spotlight40>$(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png</iPhone_Spotlight40> + <iPad_Launch1024x768>$(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png</iPad_Launch1024x768> + <iPad_Launch2048x1536>$(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png</iPad_Launch2048x1536> + <iPad_AppIcon76>$(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png</iPad_AppIcon76> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSSimulator)'!=''"> + <iPhone_AppIcon180>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_180x180.png</iPhone_AppIcon180> + <iPhone_AppIcon120>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png</iPhone_AppIcon120> + <iPhone_Spotlight80>$(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png</iPhone_Spotlight80> + <iPhone_Launch1242>$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1242x2208.png</iPhone_Launch1242> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <iPad_Launch768x1024>$(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png</iPad_Launch768x1024> + <iPad_AppIcon152>$(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png</iPad_AppIcon152> + <iPhone_Launch2208>$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png</iPhone_Launch2208> + <iPad_SpotLight80>$(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png</iPad_SpotLight80> + <iPad_SpotLight40>$(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png</iPad_SpotLight40> + <iPhone_AppIcon60>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png</iPhone_AppIcon60> + <iPad_Launch1536x2048>$(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png</iPad_Launch1536x2048> + <iPhone_AppIcon87>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_87x87.png</iPhone_AppIcon87> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <iPhone_Launch750>$(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_750x1334.png</iPhone_Launch750> + <iPhone_Spotlight40>$(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png</iPhone_Spotlight40> + <iPad_Launch1024x768>$(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png</iPad_Launch1024x768> + <iPad_Launch2048x1536>$(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png</iPad_Launch2048x1536> + <iPad_AppIcon76>$(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png</iPad_AppIcon76> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist</VerInfo_Keys> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_OSX32)'!=''"> + <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <DCC_UsePackage>IOCore;ISRtl5;vcldbx;ActionBandExtensionsDXE2;IOXML;TeeDB;ISVcl5;vclib;inetdbbde;Tee;DBXOdbcDriver;svnui;DBXSybaseASEDriver;vclimg;UniSynEdit_RXE2;intrawebdb_120_160;fmi;vclactnband;vcldb;TeeUI;bindcompvcl;vcldsnap;ISFLib5;vclie;vcltouch;Intraweb_120_160;DBXDb2Driver;websnap;ISOpenOffice5;vclribbon;VclSmp;vcl;DataSnapConnectors;DBXMSSQLDriver;IODBX;dsnapcon;IOIBX;IOBDE;vclx;webdsnap;svn;bdertl;IOADO;adortl;$(DCC_UsePackage)</DCC_UsePackage> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_Locale>1033</VerInfo_Locale> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win64)'!=''"> + <DCC_UsePackage>TeeDB;vclib;Tee;DBXOdbcDriver;DBXSybaseASEDriver;vclimg;vclactnband;vcldb;TeeUI;bindcompvcl;vcldsnap;vclie;vcltouch;DBXDb2Driver;websnap;vclribbon;VclSmp;vcl;DataSnapConnectors;DBXMSSQLDriver;dsnapcon;vclx;webdsnap;adortl;$(DCC_UsePackage)</DCC_UsePackage> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + <DCC_Optimize>false</DCC_Optimize> + <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> + <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_Locale>1033</VerInfo_Locale> + <DCC_RemoteDebug>false</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_DebugInformation>0</DCC_DebugInformation> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_OSX32)'!=''"> + <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns> + </PropertyGroup> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="..\..\Source\Model.pas"/> + <DCCReference Include="..\..\Source\RandomData.pas"/> + <DCCReference Include="..\..\Source\DemoData.pas"/> + <DCCReference Include="..\..\Source\Main.pas"> + <Form>fmMain</Form> + </DCCReference> + <BuildConfiguration Include="Release"> + <Key>Cfg_2</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + <BuildConfiguration Include="Base"> + <Key>Base</Key> + </BuildConfiguration> + <BuildConfiguration Include="Debug"> + <Key>Cfg_1</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + </ItemGroup> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType/> + <BorlandProject> + <Delphi.Personality> + <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">1040</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> + <Source> + <Source Name="MainSource">PrimerFM.dpr</Source> + </Source> + <Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <Deployment/> + <Platforms> + <Platform value="Android">False</Platform> + <Platform value="iOSDevice">False</Platform> + <Platform value="iOSSimulator" ActiveMobileDevice="iPhone">False</Platform> + <Platform value="OSX32">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> +</Project> Property changes on: trunk/Demos/PrimerFireMonkey/Projects/DXE7/PrimerFM.dproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/Docs/Changes.txt =================================================================== --- trunk/Docs/Changes.txt 2015-03-30 12:23:02 UTC (rev 971) +++ trunk/Docs/Changes.txt 2015-06-07 10:38:54 UTC (rev 972) @@ -1,6 +1,8 @@ VERSION HISTORY --------------- +Version 2.3 (2.3.0.0) (2015-04-08) +- Added support for Delphi XE8 - Added support for Delphi XE7 Version 2.2 (2.2.0.0) (2014-05-12) Modified: trunk/ReleaseTools/InstantReplicateResource.bat =================================================================== --- trunk/ReleaseTools/InstantReplicateResource.bat 2015-03-30 12:23:02 UTC (rev 971) +++ trunk/ReleaseTools/InstantReplicateResource.bat 2015-06-07 10:38:54 UTC (rev 972) @@ -10,261 +10,33 @@ pause > nul echo Copying... echo. -copy "InstantVersion.res" "..\Source\Brokers\DBISAM\D6\DclDBISAM.res" > nul -echo ..\Source\Brokers\DBISAM\D6\DclDBISAM.res -copy "InstantVersion.res" "..\Source\Brokers\DBISAM\D6\IODBISAM.res" > nul -echo ..\Source\Brokers\DBISAM\D6\IODBISAM.res -copy "InstantVersion.res" "..\Source\Brokers\DBISAM\D7\DclDBISAM.res" > nul -echo ..\Source\Brokers\DBISAM\D7\DclDBISAM.res -copy "InstantVersion.res" "..\Source\Brokers\DBISAM\D7\IODBISAM.res" > nul -echo ..\Source\Brokers\DBISAM\D7\IODBISAM.res -copy "InstantVersion.res" "..\Source\Brokers\FlashFiler\D5\DclIOff_D5.res" > nul -echo ..\Source\Brokers\FlashFiler\D5\DclIOff_D5.res -copy "InstantVersion.res" "..\Source\Brokers\FlashFiler\D5\ioff_D5.res" > nul -echo ..\Source\Brokers\FlashFiler\D5\ioff_D5.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D5\DclIOUIB_D5.res" > nul -echo ..\Source\Brokers\UIB\D5\DclIOUIB_D5.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D5\IOUIB_D5.res" > nul -echo ..\Source\Brokers\UIB\D5\IOUIB_D5.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D6\IOUIB.res" > nul -echo ..\Source\Brokers\UIB\D6\IOUIB.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D6\DclIOUIB.res" > nul -echo ..\Source\Brokers\UIB\D6\DclIOUIB.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D2005\IOUIB.res" > nul -echo ..\Source\Brokers\UIB\D2005\IOUIB.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D2005\DclIOUIB.res" > nul -echo ..\Source\Brokers\UIB\D2005\DclIOUIB.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D7\IOUIB.res" > nul -echo ..\Source\Brokers\UIB\D7\IOUIB.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D7\DclIOUIB.res" > nul -echo ..\Source\Brokers\UIB\D7\DclIOUIB.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D2006\IOUIB.res" > nul -echo ..\Source\Brokers\UIB\D2006\IOUIB.res -copy "InstantVersion.res" "..\Source\Brokers\UIB\D2006\DclIOUIB.res" > nul -echo ..\Source\Brokers\UIB\D2006\DclIOUIB.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D5\DclIOXML_D5.res" > nul -echo ..\Source\Brokers\XML\D5\DclIOXML_D5.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D5\Ioxml_D5.res" > nul -echo ..\Source\Brokers\XML\D5\Ioxml_D5.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D6\IOXML.res" > nul -echo ..\Source\Brokers\XML\D6\IOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D6\DclIOXML.res" > nul -echo ..\Source\Brokers\XML\D6\DclIOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D2005\IOXML.res" > nul -echo ..\Source\Brokers\XML\D2005\IOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D2005\DclIOXML.res" > nul -echo ..\Source\Brokers\XML\D2005\DclIOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D7\IOXML.res" > nul -echo ..\Source\Brokers\XML\D7\IOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D7\DclIOXML.res" > nul -echo ..\Source\Brokers\XML\D7\DclIOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D2006\IOXML.res" > nul -echo ..\Source\Brokers\XML\D2006\IOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D2006\DclIOXML.res" > nul -echo ..\Source\Brokers\XML\D2006\DclIOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D2007\IOXML.res" > nul -echo ..\Source\Brokers\XML\D2007\IOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\D2007\DclIOXML.res" > nul -echo ..\Source\Brokers\XML\D2007\DclIOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\k3\IOXML.res" > nul -echo ..\Source\Brokers\XML\k3\IOXML.res -copy "InstantVersion.res" "..\Source\Brokers\XML\k3\DclIOXML.res" > nul -echo ..\Source\Brokers\XML\k3\DclIOXML.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D5\DclIOIBX_D5.res" > nul -echo ..\Source\Brokers\IBX\D5\DclIOIBX_D5.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D5\Ioibx_D5.res" > nul -echo ..\Source\Brokers\IBX\D5\Ioibx_D5.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D6\IOIBX.res" > nul -echo ..\Source\Brokers\IBX\D6\IOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D6\DclIOIBX.res" > nul -echo ..\Source\Brokers\IBX\D6\DclIOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D2005\IOIBX.res" > nul -echo ..\Source\Brokers\IBX\D2005\IOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D2005\DclIOIBX.res" > nul -echo ..\Source\Brokers\IBX\D2005\DclIOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D7\IOIBX.res" > nul -echo ..\Source\Brokers\IBX\D7\IOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D7\DclIOIBX.res" > nul -echo ..\Source\Brokers\IBX\D7\DclIOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D2006\IOIBX.res" > nul -echo ..\Source\Brokers\IBX\D2006\IOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D2006\DclIOIBX.res" > nul -echo ..\Source\Brokers\IBX\D2006\DclIOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D2007\IOIBX.res" > nul -echo ..\Source\Brokers\IBX\D2007\IOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\IBX\D2007\DclIOIBX.res" > nul -echo ..\Source\Brokers\IBX\D2007\DclIOIBX.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D5\DclIOADO_D5.res" > nul -echo ..\Source\Brokers\ADO\D5\DclIOADO_D5.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D5\IOADO_D5.res" > nul -echo ..\Source\Brokers\ADO\D5\IOADO_D5.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D6\IOADO.res" > nul -echo ..\Source\Brokers\ADO\D6\IOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D6\DclIOADO.res" > nul -echo ..\Source\Brokers\ADO\D6\DclIOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D2005\IOADO.res" > nul -echo ..\Source\Brokers\ADO\D2005\IOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D2005\DclIOADO.res" > nul -echo ..\Source\Brokers\ADO\D2005\DclIOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D7\IOADO.res" > nul -echo ..\Source\Brokers\ADO\D7\IOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D7\DclIOADO.res" > nul -echo ..\Source\Brokers\ADO\D7\DclIOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D2006\IOADO.res" > nul -echo ..\Source\Brokers\ADO\D2006\IOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D2006\DclIOADO.res" > nul -echo ..\Source\Brokers\ADO\D2006\DclIOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D2007\IOADO.res" > nul -echo ..\Source\Brokers\ADO\D2007\IOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ADO\D2007\DclIOADO.res" > nul -echo ..\Source\Brokers\ADO\D2007\DclIOADO.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D5\DclIOZeosDBO_D5.res" > nul -echo ..\Source\Brokers\ZeosDBO\D5\DclIOZeosDBO_D5.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D5\IOZeosDBO_D5.res" > nul -echo ..\Source\Brokers\ZeosDBO\D5\IOZeosDBO_D5.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D6\IOZeosDBO.res" > nul -echo ..\Source\Brokers\ZeosDBO\D6\IOZeosDBO.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D6\DclIOZeosDBO.res" > nul -echo ..\Source\Brokers\ZeosDBO\D6\DclIOZeosDBO.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D2005\IOZeosDBO.res" > nul -echo ..\Source\Brokers\ZeosDBO\D2005\IOZeosDBO.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D2005\DclIOZeosDBO.res" > nul -echo ..\Source\Brokers\ZeosDBO\D2005\DclIOZeosDBO.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D7\IOZeosDBO.res" > nul -echo ..\Source\Brokers\ZeosDBO\D7\IOZeosDBO.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D7\DclIOZeosDBO.res" > nul -echo ..\Source\Brokers\ZeosDBO\D7\DclIOZeosDBO.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D2006\IOZeosDBO.res" > nul -echo ..\Source\Brokers\ZeosDBO\D2006\IOZeosDBO.res -copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D2006\DclIOZeosDBO.res" > nul -echo ..\Source\Brokers\ZeosDBO\D2006\DclIOZeosDBO.res -copy "InstantVersion.res" "..\Source\Brokers\ADS\D5\DclIOADS_D5.res" > nul -echo ..\Source\Brokers\ADS\D5\DclIOADS_D5.res -copy "InstantVersion.res" "..\Source\Brokers\ADS\D5\ioads_D5.res" > nul -echo ..\Source\Brokers\ADS\D5\ioads_D5.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D2005\DclIONexusDB.res" > nul -echo ..\Source\Brokers\NexusDb\D2005\DclIONexusDB.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D2005\IONexusDB.res" > nul -echo ..\Source\Brokers\NexusDb\D2005\IONexusDB.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D2006\DclIONexusDB.res" > nul -echo ..\Source\Brokers\NexusDb\D2006\DclIONexusDB.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D2006\IONexusDB.res" > nul -echo ..\Source\Brokers\NexusDb\D2006\IONexusDB.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D5\DclIONexusDB_D5.res" > nul -echo ..\Source\Brokers\NexusDb\D5\DclIONexusDB_D5.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D5\IONexusDB_D5.res" > nul -echo ..\Source\Brokers\NexusDb\D5\IONexusDB_D5.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D6\DclIONexusDB.res" > nul -echo ..\Source\Brokers\NexusDb\D6\DclIONexusDB.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D6\IONexusDB.res" > nul -echo ..\Source\Brokers\NexusDb\D6\IONexusDB.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D7\DclIONexusDB.res" > nul -echo ..\Source\Brokers\NexusDb\D7\DclIONexusDB.res -copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D7\IONexusDB.res" > nul -echo ..\Source\Brokers\NexusDb\D7\IONexusDB.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D5\DclIOBDE_D5.res" > nul -echo ..\Source\Brokers\BDE\D5\DclIOBDE_D5.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D5\Iobde_D5.res" > nul -echo ..\Source\Brokers\BDE\D5\Iobde_D5.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D6\IOBDE.res" > nul -echo ..\Source\Brokers\BDE\D6\IOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D6\DclIOBDE.res" > nul -echo ..\Source\Brokers\BDE\D6\DclIOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D2005\IOBDE.res" > nul -echo ..\Source\Brokers\BDE\D2005\IOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D2005\DclIOBDE.res" > nul -echo ..\Source\Brokers\BDE\D2005\DclIOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D7\IOBDE.res" > nul -echo ..\Source\Brokers\BDE\D7\IOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D7\DclIOBDE.res" > nul -echo ..\Source\Brokers\BDE\D7\DclIOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D2006\IOBDE.res" > nul -echo ..\Source\Brokers\BDE\D2006\IOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D2006\DclIOBDE.res" > nul -echo ..\Source\Brokers\BDE\D2006\DclIOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D2007\IOBDE.res" > nul -echo ..\Source\Brokers\BDE\D2007\IOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\BDE\D2007\DclIOBDE.res" > nul -echo ..\Source\Brokers\BDE\D2007\DclIOBDE.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D6\IODBX.res" > nul -echo ..\Source\Brokers\DBX\D6\IODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D6\DclIODBX.res" > nul -echo ..\Source\Brokers\DBX\D6\DclIODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D2005\IODBX.res" > nul -echo ..\Source\Brokers\DBX\D2005\IODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D2005\DclIODBX.res" > nul -echo ..\Source\Brokers\DBX\D2005\DclIODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D7\IODBX.res" > nul -echo ..\Source\Brokers\DBX\D7\IODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D7\DclIODBX.res" > nul -echo ..\Source\Brokers\DBX\D7\DclIODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D2006\IODBX.res" > nul -echo ..\Source\Brokers\DBX\D2006\IODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D2006\DclIODBX.res" > nul -echo ..\Source\Brokers\DBX\D2006\DclIODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D2007\IODBX.res" > nul -echo ..\Source\Brokers\DBX\D2007\IODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\D2007\DclIODBX.res" > nul -echo ..\Source\Brokers\DBX\D2007\DclIODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\K3\IODBX.res" > nul -echo ..\Source\Brokers\DBX\K3\IODBX.res -copy "InstantVersion.res" "..\Source\Brokers\DBX\K3\DclIODBX.res" > nul -echo ..\Source\Brokers\DBX\K3\DclIODBX.res -copy "InstantVersion.res" "..\Source\Core\D2005\IOCore.res" > nul -echo ..\Source\Core\D2005\IOCore.res -copy "InstantVersion.res" "..\Source\Core\D2006\IOCore.res" > nul -echo ..\Source\Core\D2006\IOCore.res -copy "InstantVersion.res" "..\Source\Core\D2007\IOCore.res" > nul -echo ..\Source\Core\D2007\IOCore.res -copy "InstantVersion.res" "..\Source\Core\K3\IOCore.res" > nul -echo ..\Source\Core\K3\IOCore.res -copy "InstantVersion.res" "..\Source\Core\D5\IOCore_D5.res" > nul -echo ..\Source\Core\D5\IOCore_D5.res -copy "InstantVersion.res" "..\Source\Core\D6\IOCore.res" > nul -echo ..\Source\Core\D6\IOCore.res -copy "InstantVersion.res" "..\Source\Core\D7\IOCore.res" > nul -echo ..\Source\Core\D7\IOCore.res -copy "InstantVersion.res" "..\Source\Design\D2005\DclIOCore.res" > nul -echo ..\Source\Design\D2005\DclIOCore.res -copy "InstantVersion.res" "..\Source\Design\D2006\DclIOCore.res" > nul -echo ..\Source\Design\D2006\DclIOCore.res -copy "InstantVersion.res" "..\Source\Design\D2007\DclIOCore.res" > nul -echo ..\Source\Design\D2007\DclIOCore.res -copy "InstantVersion.res" "..\Source\Design\K3\DclIOCore.res" > nul -echo ..\Source\Design\K3\DclIOCore.res -copy "InstantVersion.res" "..\Source\Design\D5\DclIOCore_D5.res" > nul -echo ..\Source\Design\D5\DclIOCore_D5.res -copy "InstantVersion.res" "..\Source\Design\D6\DclIOCore.res" > nul -echo ..\Source\Design\D6\DclIOCore.res -copy "InstantVersion.res" "..\Source\Design\D7\DclIOCore.res" > nul -echo ..\Source\Design\D7\DclIOCore.res -copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D5\IOMSSqlCatalog_D5.res" > nul -echo ..\Source\Catalogs\MSSql\D5\IOMSSqlCatalog_D5.res -copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D6\IOMSSqlCatalog.res" > nul -echo ..\Source\Catalogs\MSSql\D6\IOMSSqlCatalog.res -copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D2005\IOMSSqlCatalog.res" > nul -echo ..\Source\Catalogs\MSSql\D2005\IOMSSqlCatalog.res -copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D7\IOMSSqlCatalog.res" > nul -echo ..\Source\Catalogs\MSSql\D7\IOMSSqlCatalog.res -copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D2006\IOMSSqlCatalog.res" > nul -echo ..\Source\Catalogs\MSSql\D2006\IOMSSqlCatalog.res -copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D2007\IOMSSqlCatalog.res" > nul -echo ..\Source\Catalogs\MSSql\D2007\IOMSSqlCatalog.res -copy "InstantVersion.res" "..\Source\Catalogs\MSSql\K3\IOMSSqlCatalog.res" > nul -echo ..\Source\Catalogs\MSSql\K3\IOMSSqlCatalog.res -copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D5\IOIBFbCatalog_D5.res" > nul -echo ..\Source\Catalogs\IBFb\D5\IOIBFbCatalog_D5.res -copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D6\IOIBFbCatalog.res" > nul -echo ..\Source\Catalogs\IBFb\D6\IOIBFbCatalog.res -copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D2005\IOIBFbCatalog.res" > nul -echo ..\Source\Catalogs\IBFb\D2005\IOIBFbCatalog.res -copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D7\IOIBFbCatalog.res" > nul -echo ..\Source\Catalogs\IBFb\D7\IOIBFbCatalog.res -copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D2006\IOIBFbCatalog.res" > nul -echo ..\Source\Catalogs\IBFb\D2006\IOIBFbCatalog.res -copy "InstantVersion.res" "..\Sou... [truncated message content] |
From: <car...@us...> - 2015-03-30 12:23:13
|
Revision: 971 http://sourceforge.net/p/instantobjects/code/971 Author: carlobar Date: 2015-03-30 12:23:02 +0000 (Mon, 30 Mar 2015) Log Message: ----------- Porting to XE8 Some minor fixing and changes to packages. Added test files Modified Paths: -------------- trunk/Demos/PrimerCross/Primer_DXE3.mdr trunk/Demos/PrimerCross/Primer_DXE3.xml trunk/Demos/PrimerCross/Primer_DXE7.dpr trunk/Demos/PrimerCross/Primer_DXE7.dproj trunk/Demos/PrimerCross/Primer_DXE7.res trunk/Source/Brokers/ADO/DXE5/DclIOADO.dproj trunk/Source/Brokers/ADO/DXE7/DclIOADO.dproj trunk/Source/Brokers/ADO/DXE7/IOADO.dproj trunk/Source/Brokers/DBX/D2010/DclIODBX.dproj trunk/Source/Brokers/DBX/DXE5/DclIODBX.dproj trunk/Source/Brokers/DBX/DXE7/DclIODBX.dproj trunk/Source/Brokers/DBX/DXE7/IODBX.dproj trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/InstantFireDAC.pas trunk/Source/Brokers/IBX/D2010/DclIOIBX.dproj trunk/Source/Brokers/IBX/DXE5/DclIOIBX.dproj trunk/Source/Brokers/XML/D2010/DclIOXML.dproj trunk/Source/Brokers/XML/DXE5/DclIOXML.dproj trunk/Source/Brokers/XML/DXE5/DclIOXML.res trunk/Source/Brokers/XML/DXE5/IOXML.res trunk/Source/Brokers/XML/DXE6/DclIOXML.res trunk/Source/Brokers/XML/DXE6/IOXML.res trunk/Source/Brokers/XML/DXE7/DclIOXML.dproj trunk/Source/Brokers/XML/DXE7/IOXML.dproj trunk/Source/Catalogs/IBFb/DXE7/IOIBFbCatalog.dproj trunk/Source/Catalogs/MSSql/DXE7/IOMSSqlCatalog.dproj trunk/Source/Catalogs/MySQL/DXE7/IOMySQLCatalog.dproj trunk/Source/Core/DXE7/IOCore.dproj trunk/Source/Core/InstantBrokers.pas trunk/Source/Design/D2010/DclIOCore.dproj trunk/Source/Design/DXE5/DclIOCore.dproj trunk/Source/Design/DXE7/DclIOCore.dproj trunk/Source/InstantDefines.inc Added Paths: ----------- trunk/Demos/Intro/Intro_D2009_Icon.ico trunk/Demos/PrimerCross/Primer_DXE8.dpr trunk/Demos/PrimerCross/Primer_DXE8.dproj trunk/Demos/PrimerCross/Primer_DXE8.mdr trunk/Demos/PrimerCross/Primer_DXE8.res trunk/Demos/PrimerCross/Primer_DXE8.xml trunk/Source/Brokers/ADO/DXE8/ trunk/Source/Brokers/ADO/DXE8/DclIOADO.dpk trunk/Source/Brokers/ADO/DXE8/DclIOADO.dproj trunk/Source/Brokers/ADO/DXE8/DclIOADO.res trunk/Source/Brokers/ADO/DXE8/IOADO.dpk trunk/Source/Brokers/ADO/DXE8/IOADO.dproj trunk/Source/Brokers/ADO/DXE8/IOADO.res trunk/Source/Brokers/DBX/DXE8/ trunk/Source/Brokers/DBX/DXE8/DclIODBX.dpk trunk/Source/Brokers/DBX/DXE8/DclIODBX.dproj trunk/Source/Brokers/DBX/DXE8/DclIODBX.res trunk/Source/Brokers/DBX/DXE8/IODBX.dpk trunk/Source/Brokers/DBX/DXE8/IODBX.dproj trunk/Source/Brokers/DBX/DXE8/IODBX.res trunk/Source/Brokers/FireDAC/DXE7/ trunk/Source/Brokers/FireDAC/DXE7/DclIOFireDAC.dpk trunk/Source/Brokers/FireDAC/DXE7/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/DXE7/DclIOFireDAC.res trunk/Source/Brokers/FireDAC/DXE7/IOFireDAC.dpk trunk/Source/Brokers/FireDAC/DXE7/IOFireDAC.dproj trunk/Source/Brokers/FireDAC/DXE7/IOFireDAC.res trunk/Source/Brokers/FireDAC/DXE8/ trunk/Source/Brokers/FireDAC/DXE8/DclIOFireDAC.dpk trunk/Source/Brokers/FireDAC/DXE8/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/DXE8/DclIOFireDAC.res trunk/Source/Brokers/FireDAC/DXE8/IOFireDAC.dpk trunk/Source/Brokers/FireDAC/DXE8/IOFireDAC.dproj trunk/Source/Brokers/FireDAC/DXE8/IOFireDAC.identcache trunk/Source/Brokers/FireDAC/DXE8/IOFireDAC.res trunk/Source/Brokers/FireDAC/InstantFireDAC.dcr trunk/Source/Brokers/FireDAC/InstantFireDAC.dcu trunk/Source/Brokers/FireDAC/InstantFireDACCatalog.dcu trunk/Source/Brokers/FireDAC/InstantFireDACConnectionDefEdit.dcu trunk/Source/Brokers/FireDAC/InstantFireDACReg.dcu trunk/Source/Brokers/IBX/DXE7/ trunk/Source/Brokers/IBX/DXE7/DclIOIBX.dpk trunk/Source/Brokers/IBX/DXE7/DclIOIBX.dproj trunk/Source/Brokers/IBX/DXE7/DclIOIBX.res trunk/Source/Brokers/IBX/DXE7/IOIBX.dpk trunk/Source/Brokers/IBX/DXE7/IOIBX.dproj trunk/Source/Brokers/IBX/DXE7/IOIBX.res trunk/Source/Brokers/IBX/DXE8/ trunk/Source/Brokers/IBX/DXE8/DclIOIBX.dpk trunk/Source/Brokers/IBX/DXE8/DclIOIBX.dproj trunk/Source/Brokers/IBX/DXE8/DclIOIBX.res trunk/Source/Brokers/IBX/DXE8/IOIBX.dpk trunk/Source/Brokers/IBX/DXE8/IOIBX.dproj trunk/Source/Brokers/IBX/DXE8/IOIBX.res trunk/Source/Brokers/XML/DXE8/ trunk/Source/Brokers/XML/DXE8/DclIOXML.dpk trunk/Source/Brokers/XML/DXE8/DclIOXML.dproj trunk/Source/Brokers/XML/DXE8/DclIOXML.res trunk/Source/Brokers/XML/DXE8/IOXML.dpk trunk/Source/Brokers/XML/DXE8/IOXML.dproj trunk/Source/Brokers/XML/DXE8/IOXML.res trunk/Source/Catalogs/IBFb/DXE8/ trunk/Source/Catalogs/IBFb/DXE8/IOIBFbCatalog.dpk trunk/Source/Catalogs/IBFb/DXE8/IOIBFbCatalog.dproj trunk/Source/Catalogs/IBFb/DXE8/IOIBFbCatalog.res trunk/Source/Catalogs/MSSql/DXE8/ trunk/Source/Catalogs/MSSql/DXE8/IOMSSqlCatalog.dpk trunk/Source/Catalogs/MSSql/DXE8/IOMSSqlCatalog.dproj trunk/Source/Catalogs/MSSql/DXE8/IOMSSqlCatalog.res trunk/Source/Catalogs/MySQL/DXE8/ trunk/Source/Catalogs/MySQL/DXE8/IOMySQLCatalog.dpk trunk/Source/Catalogs/MySQL/DXE8/IOMySQLCatalog.dproj trunk/Source/Catalogs/MySQL/DXE8/IOMySQLCatalog.res trunk/Source/Core/DXE8/ trunk/Source/Core/DXE8/IOCore.dpk trunk/Source/Core/DXE8/IOCore.dproj trunk/Source/Core/DXE8/IOCore.res trunk/Source/Design/DXE8/ trunk/Source/Design/DXE8/DclIOCore.dpk trunk/Source/Design/DXE8/DclIOCore.dproj trunk/Source/Design/DXE8/DclIOCore.res trunk/Source/PackageGroups/DXE8/ trunk/Source/PackageGroups/DXE8/DesignTimePackages.groupproj trunk/Source/PackageGroups/DXE8/RunTimePackages.groupproj trunk/Tests/IO_icon_32x32.ico trunk/Tests/TestIO_D2010.mdr trunk/Tests/TestIO_D2010.mdrt trunk/Tests/TestIO_D2010.mdx trunk/Tests/TestIO_D2010.mdxt trunk/Tests/TestIO_DXE5.mdx trunk/Tests/TestIO_DXE5.mdxt trunk/Tests/TestIO_DXE6.mdx trunk/Tests/TestIO_DXE6.mdxt trunk/Tests/TestIO_DXE7.mdx trunk/Tests/TestIO_DXE7.mdxt trunk/Tests/TestIO_DXE8.dpr trunk/Tests/TestIO_DXE8.dproj trunk/Tests/TestIO_DXE8.mdr trunk/Tests/TestIO_DXE8.mdrt trunk/Tests/TestIO_DXE8.mdx trunk/Tests/TestIO_DXE8.mdxt trunk/Tests/TestIO_DXE8.res trunk/Tests/XMLDB/Contact/TContact.C17151E21094C24AA2A775C3CEF30657.1.xml trunk/Tests/XMLDB/Contact/TContact.DE27098606C5434D9E738296920383C8.1.xml trunk/Tests/XMLDB/Person/TPerson.8AB78E6CA818EA4D81DA9B736F144D66.1.xml Added: trunk/Demos/Intro/Intro_D2009_Icon.ico =================================================================== (Binary files differ) Index: trunk/Demos/Intro/Intro_D2009_Icon.ico =================================================================== --- trunk/Demos/Intro/Intro_D2009_Icon.ico 2014-11-26 10:25:44 UTC (rev 970) +++ trunk/Demos/Intro/Intro_D2009_Icon.ico 2015-03-30 12:23:02 UTC (rev 971) Property changes on: trunk/Demos/Intro/Intro_D2009_Icon.ico ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/Demos/PrimerCross/Primer_DXE3.mdr =================================================================== (Binary files differ) Modified: trunk/Demos/PrimerCross/Primer_DXE3.xml =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE3.xml 2014-11-26 10:25:44 UTC (rev 970) +++ trunk/Demos/PrimerCross/Primer_DXE3.xml 2015-03-30 12:23:02 UTC (rev 971) @@ -1,15 +1,4 @@ <TInstantConnectionDefs> - <TInstantBDEConnectionDef> - <Name>ParadoxDB</Name> - <IsBuilt>TRUE</IsBuilt> - <BlobStreamFormat>sfXML</BlobStreamFormat> - <LoginPrompt>FALSE</LoginPrompt> - <DriverName>STANDARD</DriverName> - <Parameters>PATH=.\ParadoxDB -DEFAULT DRIVER=PARADOX -ENABLE BCD=TRUE -</Parameters> - </TInstantBDEConnectionDef> <TInstantIBXConnectionDef> <Name>IBX_Firebird</Name> <IsBuilt>TRUE</IsBuilt> Modified: trunk/Demos/PrimerCross/Primer_DXE7.dpr =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE7.dpr 2014-11-26 10:25:44 UTC (rev 970) +++ trunk/Demos/PrimerCross/Primer_DXE7.dpr 2015-03-30 12:23:02 UTC (rev 971) @@ -66,9 +66,7 @@ QueryView in 'QueryView.pas' {QueryViewForm: TFrame}, RandomData in 'RandomData.pas', Stopwatch in 'Stopwatch.pas', - Utility in 'Utility.pas', - Vcl.Themes, - Vcl.Styles; + Utility in 'Utility.pas'; {$R *.res} {$R *.mdr} {Model} Modified: trunk/Demos/PrimerCross/Primer_DXE7.dproj =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE7.dproj 2014-11-26 10:25:44 UTC (rev 970) +++ trunk/Demos/PrimerCross/Primer_DXE7.dproj 2015-03-30 12:23:02 UTC (rev 971) @@ -127,9 +127,8 @@ <Source Name="MainSource">Primer_DXE7.dpr</Source> </Source> <Excluded_Packages> - <Excluded_Packages Name="$(BDSBIN)\dcloffice2k210.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> - <Excluded_Packages Name="$(BDSBIN)\dclofficexp210.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> - <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\15.0\Bpl\dcldklang.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\15.0\Bpl\dcldklang.bpl not found</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k200.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp200.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> </Excluded_Packages> </Delphi.Personality> <ModelSupport>False</ModelSupport> @@ -280,12 +279,6 @@ <Operation>0</Operation> </Platform> </DeployClass> - <DeployClass Name="Android_SplashImage426"> - <Platform Name="Android"> - <RemoteDir>res\drawable-small</RemoteDir> - <Operation>1</Operation> - </Platform> - </DeployClass> <DeployClass Name="ProjectiOSEntitlements"/> <DeployClass Name="AdditionalDebugSymbols"> <Platform Name="OSX32"> Modified: trunk/Demos/PrimerCross/Primer_DXE7.res =================================================================== (Binary files differ) Added: trunk/Demos/PrimerCross/Primer_DXE8.dpr =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE8.dpr (rev 0) +++ trunk/Demos/PrimerCross/Primer_DXE8.dpr 2015-03-30 12:23:02 UTC (rev 971) @@ -0,0 +1,82 @@ +(* + * InstantObjects + * Primer Demo - with "internal storage" of Part and Parts + * Model.pas unit is located in Model folder + * + *) + +(* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is: Seleqt InstantObjects + * + * The Initial Developer of the Original Code is: Seleqt + * + * Portions created by the Initial Developer are Copyright (C) 2001-2003 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Carlo Barazzetta, Nando Dessena + * + * ***** END LICENSE BLOCK ***** *) + +program Primer_DXE8; + +{$IFDEF LINUX} +{$I '../../Source/InstantDefines.inc'} +{$ELSE} +{$I '..\..\Source\InstantDefines.inc'} +{$ENDIF} + + +uses + Forms, + Main in 'Main.pas' {MainForm}, + Model in 'Model\Model.pas', + ContactView in 'ContactView.pas' {ContactViewForm: TFrame}, + BasicView in 'BasicView.pas' {BasicViewForm: TFrame}, + BasicEdit in 'BasicEdit.pas' {BasicEditForm}, + ContactEdit in 'ContactEdit.pas' {ContactEditForm}, + PersonEdit in 'PersonEdit.pas' {PersonEditForm}, + CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm}, + DemoData in 'DemoData.pas', + ContactFilterEdit in 'ContactFilterEdit.pas' {ContactFilterEditForm}, + MainData in 'MainData.pas' {MainDataModule: TDataModule}, + ContactBrowse in 'ContactBrowse.pas' {ContactBrowseForm}, + CompanyBrowse in 'CompanyBrowse.pas' {CompanyBrowseForm}, + PerformanceView in 'PerformanceView.pas' {PerformanceViewForm: TFrame}, + Welcome in 'Welcome.pas' {WelcomeForm}, + PersonBrowse in 'PersonBrowse.pas' {PersonBrowseForm}, + BasicBrowse in 'BasicBrowse.pas' {BasicBrowseForm}, + CountryBrowse in 'CountryBrowse.pas' {CountryBrowseForm}, + DemoDataRequest in 'DemoDataRequest.pas' {DemoDataRequestForm}, + ContactSort in 'ContactSort.pas' {ContactSortForm}, + CategoryBrowse in 'CategoryBrowse.pas' {CategoryBrowseForm}, + HelpView in 'HelpView.pas' {HelpViewForm: TFrame}, + QueryView in 'QueryView.pas' {QueryViewForm: TFrame}, + RandomData in 'RandomData.pas', + Stopwatch in 'Stopwatch.pas', + Utility in 'Utility.pas', + Vcl.Themes, + Vcl.Styles; + +{$R *.res} +{$R *.mdr} {Model} + +begin + Application.Initialize; + Application.Title := 'InstantObjects Primer Demo (Delphi XE7 version)'; + Application.CreateForm(TMainForm, MainForm); + Application.CreateForm(TMainDataModule, MainDataModule); + Application.Run; +end. Property changes on: trunk/Demos/PrimerCross/Primer_DXE8.dpr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_DXE8.dproj =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE8.dproj (rev 0) +++ trunk/Demos/PrimerCross/Primer_DXE8.dproj 2015-03-30 12:23:02 UTC (rev 971) @@ -0,0 +1,610 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid> + <MainSource>Primer_DXE8.dpr</MainSource> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> + <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName> + <ProjectVersion>17.1</ProjectVersion> + <Config Condition="'$(Config)'==''">Release</Config> + <Base>True</Base> + <AppType>Application</AppType> + <FrameworkType>VCL</FrameworkType> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''"> + <Base_iOSDevice32>true</Base_iOSDevice32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''"> + <Base_iOSDevice64>true</Base_iOSDevice64> + <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="('$(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="('$(Platform)'=='iOSDevice32' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice32)'!=''"> + <Cfg_2_iOSDevice32>true</Cfg_2_iOSDevice32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''"> + <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <Icon_MainIcon>Primer_DXE6_Icon.ico</Icon_MainIcon> + <SanitizedProjectName>Primer_DXE8</SanitizedProjectName> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;IBX;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_MajorVer>2</VerInfo_MajorVer> + <VerInfo_Locale>1030</VerInfo_Locale> + <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys> + <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\FireDAC;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <DCC_UsePackage>vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclimg;vclactnband;adortl;vcldbx;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;vclie;xmlrtl;inet;dsnap;inetdb;IndySystem;IndyCore;IndyProtocols;DbxClientDriver;inetdbxpress;inetdbbde;DataSnapServer;dbxcds;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;vclib;ibxpress;intrawebdb_100_140;Intraweb_100_140;dsnapcon;vclribbon;VclSmp;soaprtl;TeeUI;TeeDB;Tee;vcltouch;webdsnap;websnap;rbRIDE1114;rbIDE1114;rbRAP1114;rbRCL1114;dclRBADO1114;rbADO1114;rbDB1114;rbDAD1114;dclRBBDE1114;rbDBDE1114;rbBDE1114;dclRBDBE1114;rbDBE1114;dclRBE1114;rbCIDE1114;dclRBIBE1114;rbIBE1114;rbUSERDesign1114;rbUSER1114;ActionBandExtensionsD2010;UniSynEdit_R2010;wPDF3_D2010;WPViewPDF_D2010;IOCore;Jcl;JclVcl;JvCoreD14R;JvSystemD14R;JvStdCtrlsD14R;JvAppFrmD14R;JvBandsD14R;JvDBD14R;JvDlgsD14R;JvBDED14R;JvCmpD14R;JvCryptD14R;JvCtrlsD14R;JvCustomD14R;JvDockingD14R;JvDotNetCtrlsD14R;JvEDID14R;JvGlobusD14R;JvHMID14R;JvInterpreterD14R;JvJansD14R;JvManagedThreadsD14R;JvMMD14R;JvNetD14R;JvPageCompsD14R;JvPluginD14R;JvPrintPreviewD14R;JvRuntimeDesignD14R;JvTimeFrameworkD14R;JvValidatorsD14R;JvWizardD14R;JvXPCtrlsD14R;rbDIDE1114;IOIBX;IOXML;IODBX;IOBDE;IOADO;ISRtl5;ISVcl5;ISOpenOffice5;ISFLib5;$(DCC_UsePackage)</DCC_UsePackage> + <DCC_DependencyCheckOutputName>Primer_DXE.exe</DCC_DependencyCheckOutputName> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''"> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''"> + <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys> + <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily> + <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <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)'!=''"> + <Version>7.0</Version> + <DCC_DebugInformation>0</DCC_DebugInformation> + <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <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> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_DebugDCUs>true</DCC_DebugDCUs> + <Version>7.0</Version> + <DCC_Define>DEBUG;IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_IncludePath)</DCC_IncludePath> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice32)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''"> + <DCC_RemoteDebug>true</DCC_RemoteDebug> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> + <VerInfo_MajorVer>1</VerInfo_MajorVer> + <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> + </PropertyGroup> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>VCLApplication</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Parameters/> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">True</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">2</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">1030</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName">InstantObjects.org</VersionInfoKeys> + <VersionInfoKeys Name="FileDescription">Primer Demo</VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"/> + <VersionInfoKeys Name="LegalCopyright">MPL public license</VersionInfoKeys> + <VersionInfoKeys Name="LegalTrademarks"/> + <VersionInfoKeys Name="OriginalFilename"/> + <VersionInfoKeys Name="ProductName"/> + <VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"/> + </VersionInfoKeys> + <Source> + <Source Name="MainSource">Primer_DXE8.dpr</Source> + </Source> + <Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k220.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp220.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <ModelSupport>False</ModelSupport> + <Platforms> + <Platform value="iOSDevice32">False</Platform> + <Platform value="iOSDevice64">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + <Deployment Version="1"> + <DeployFile LocalName="Primer_DXE8.exe" Configuration="Release" Class="ProjectOutput"> + <Platform Name="Win32"> + <RemoteName>Primer_DXE8.exe</RemoteName> + <Overwrite>true</Overwrite> + </Platform> + </DeployFile> + <DeployClass Required="true" Name="DependencyPackage"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + <Extensions>.bpl</Extensions> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + </DeployClass> + <DeployClass Name="DependencyModule"> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.dylib</Extensions> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + <Extensions>.dll;.bpl</Extensions> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch2048"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectOSXInfoPList"/> + <DeployClass Name="ProjectiOSDeviceDebug"> + <Platform Name="iOSDevice64"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage470"> + <Platform Name="Android"> + <RemoteDir>res\drawable-normal</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeX86File"> + <Platform Name="Android"> + <RemoteDir>library\lib\x86</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSResource"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectOSXEntitlements"/> + <DeployClass Name="AndroidGDBServer"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch640"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage960"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xlarge</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon96"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xhdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch320"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon144"> + <Platform Name="Android"> + <RemoteDir>res\drawable-xxhdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeMipsFile"> + <Platform Name="Android"> + <RemoteDir>library\lib\mips</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidSplashImageDef"> + <Platform Name="Android"> + <RemoteDir>res\drawable</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DebugSymbols"> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="DependencyFramework"> + <Platform Name="OSX32"> + <Operation>1</Operation> + <Extensions>.framework</Extensions> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage426"> + <Platform Name="Android"> + <RemoteDir>res\drawable-small</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSEntitlements"/> + <DeployClass Name="AdditionalDebugSymbols"> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + <Platform Name="Win32"> + <RemoteDir>Contents\MacOS</RemoteDir> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidClassesDexFile"> + <Platform Name="Android"> + <RemoteDir>classes</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSInfoPList"/> + <DeployClass Name="iPad_Launch1024"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_DefaultAppIcon"> + <Platform Name="Android"> + <RemoteDir>res\drawable</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectOSXResource"> + <Platform Name="OSX32"> + <RemoteDir>Contents\Resources</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectiOSDeviceResourceRules"/> + <DeployClass Name="iPad_Launch768"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Required="true" Name="ProjectOutput"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi-v7a</RemoteDir> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidLibnativeArmeabiFile"> + <Platform Name="Android"> + <RemoteDir>library\lib\armeabi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_SplashImage640"> + <Platform Name="Android"> + <RemoteDir>res\drawable-large</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="File"> + <Platform Name="Android"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSDevice64"> + <Operation>0</Operation> + </Platform> + <Platform Name="Win32"> + <Operation>0</Operation> + </Platform> + <Platform Name="OSX32"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>0</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>0</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPhone_Launch640x1136"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon36"> + <Platform Name="Android"> + <RemoteDir>res\drawable-ldpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="AndroidSplashStyles"> + <Platform Name="Android"> + <RemoteDir>res\values</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="iPad_Launch1536"> + <Platform Name="iOSDevice64"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSSimulator"> + <Operation>1</Operation> + </Platform> + <Platform Name="iOSDevice32"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon48"> + <Platform Name="Android"> + <RemoteDir>res\drawable-mdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="Android_LauncherIcon72"> + <Platform Name="Android"> + <RemoteDir>res\drawable-hdpi</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> + <DeployClass Name="ProjectAndroidManifest"> + <Platform Name="Android"> + <Operation>1</Operation> + </Platform> + </DeployClass> + <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/> + <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/> + <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/> + <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> + <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/> + </Deployment> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="Main.pas"> + <Form>MainForm</Form> + </DCCReference> + <DCCReference Include="Model\Model.pas"/> + <DCCReference Include="ContactView.pas"> + <Form>ContactViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="BasicView.pas"> + <Form>BasicViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="BasicEdit.pas"> + <Form>BasicEditForm</Form> + </DCCReference> + <DCCReference Include="ContactEdit.pas"> + <Form>ContactEditForm</Form> + </DCCReference> + <DCCReference Include="PersonEdit.pas"> + <Form>PersonEditForm</Form> + </DCCReference> + <DCCReference Include="CompanyEdit.pas"> + <Form>CompanyEditForm</Form> + </DCCReference> + <DCCReference Include="DemoData.pas"/> + <DCCReference Include="ContactFilterEdit.pas"> + <Form>ContactFilterEditForm</Form> + </DCCReference> + <DCCReference Include="MainData.pas"> + <Form>MainDataModule</Form> + <DesignClass>TDataModule</DesignClass> + </DCCReference> + <DCCReference Include="ContactBrowse.pas"> + <Form>ContactBrowseForm</Form> + </DCCReference> + <DCCReference Include="CompanyBrowse.pas"> + <Form>CompanyBrowseForm</Form> + </DCCReference> + <DCCReference Include="PerformanceView.pas"> + <Form>PerformanceViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="Welcome.pas"> + <Form>WelcomeForm</Form> + </DCCReference> + <DCCReference Include="PersonBrowse.pas"> + <Form>PersonBrowseForm</Form> + </DCCReference> + <DCCReference Include="BasicBrowse.pas"> + <Form>BasicBrowseForm</Form> + </DCCReference> + <DCCReference Include="CountryBrowse.pas"> + <Form>CountryBrowseForm</Form> + </DCCReference> + <DCCReference Include="DemoDataRequest.pas"> + <Form>DemoDataRequestForm</Form> + </DCCReference> + <DCCReference Include="ContactSort.pas"> + <Form>ContactSortForm</Form> + </DCCReference> + <DCCReference Include="CategoryBrowse.pas"> + <Form>CategoryBrowseForm</Form> + </DCCReference> + <DCCReference Include="HelpView.pas"> + <Form>HelpViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="QueryView.pas"> + <Form>QueryViewForm</Form> + <DesignClass>TFrame</DesignClass> + </DCCReference> + <DCCReference Include="RandomData.pas"/> + <DCCReference Include="Stopwatch.pas"/> + <DCCReference Include="Utility.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"/> + <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> + <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/> +</Project> Property changes on: trunk/Demos/PrimerCross/Primer_DXE8.dproj ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_DXE8.mdr =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_DXE8.mdr =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE8.mdr 2014-11-26 10:25:44 UTC (rev 970) +++ trunk/Demos/PrimerCross/Primer_DXE8.mdr 2015-03-30 12:23:02 UTC (rev 971) Property changes on: trunk/Demos/PrimerCross/Primer_DXE8.mdr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_DXE8.res =================================================================== (Binary files differ) Index: trunk/Demos/PrimerCross/Primer_DXE8.res =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE8.res 2014-11-26 10:25:44 UTC (rev 970) +++ trunk/Demos/PrimerCross/Primer_DXE8.res 2015-03-30 12:23:02 UTC (rev 971) Property changes on: trunk/Demos/PrimerCross/Primer_DXE8.res ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/Demos/PrimerCross/Primer_DXE8.xml =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE8.xml (rev 0) +++ trunk/Demos/PrimerCross/Primer_DXE8.xml 2015-03-30 12:23:02 UTC (rev 971) @@ -0,0 +1,54 @@ +<TInstantConnectionDefs> + <TInstantIBXConnectionDef> + <Name>IBX_Firebird</Name> + <IsBuilt>TRUE</IsBuilt> + <BlobStreamFormat>sfXML</BlobStreamFormat> + <LoginPrompt>FALSE</LoginPrompt> + <ConnectionString>127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB</ConnectionString> + <Options></Options> + <Params>user_name=SYSDBA +password=masterkey +lc_ctype=ISO8859_1</Params> + </TInstantIBXConnectionDef> + <TInstantXMLConnectionDef> + <Name>XmlDB</Name> + <IsBuilt>TRUE</IsBuilt> + <RootFolder>.\XmlDB</RootFolder> + </TInstantXMLConnectionDef> + <TInstantDBXConnectionDef> + <Name>DBX_Firebird</Name> + <IsBuilt>TRUE</IsBuilt> + <BlobStreamFormat>sfXML</BlobStreamFormat> + <LoginPrompt>FALSE</LoginPrompt> + <ConnectionName>FBConnection</ConnectionName> + <DriverName>Firebird</DriverName> + <Params>DriverName=Firebird +Database=127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB +RoleName=RoleName +User_Name=sysdba +Password=masterkey +ServerCharSet= +SQLDialect=3 +ErrorResourceFile= +LocaleCode=0000 +BlobSize=-1 +CommitRetain=False +WaitOnLocks=True +IsolationLevel=ReadCommitted +Trim Char=False +</Params> + </TInstantDBXConnectionDef> + <TInstantFireDACConnectionDef> + <Name>FireDAC_Firebird</Name> + <IsBuilt>TRUE</IsBuilt> + <BlobStreamFormat>sfXML</BlobStreamFormat> + <Database>C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB</Database> + <HostName>127.0.0.1</HostName> + <LoginPrompt>FALSE</LoginPrompt> + <Password>masterkey</Password> + <Port>0</Port> + <Protocol>FB</Protocol> + <UseDelimitedIdents>FALSE</UseDelimitedIdents> + <UserName>SYSDBA</UserName> + </TInstantFireDACConnectionDef> +</TInstantConnectionDefs> Property changes on: trunk/Demos/PrimerCross/Primer_DXE8.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/Source/Brokers/ADO/DXE5/DclIOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/DXE5/DclIOADO.dproj 2014-11-26 10:25:44 UTC (rev 970) +++ trunk/Source/Brokers/ADO/DXE5/DclIOADO.dproj 2015-03-30 12:23:02 UTC (rev 971) @@ -13,11 +13,6 @@ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''"> - <Base_Android>true</Base_Android> - <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> @@ -59,10 +54,6 @@ <DCC_E>false</DCC_E> <VerInfo_Locale>1033</VerInfo_Locale> </PropertyGroup> - <PropertyGroup Condition="'$(Base_Android)'!=''"> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> @@ -144,9 +135,6 @@ </Excluded_Packages> </Delphi.Personality> <Platforms> - <Platform value="Android" ActiveMobileDevice="4df786101d45bf99">False</Platform> - <Platform value="iOSDevice">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="OSX32">False</Platform> <Platform value="Win32">True</Platform> <Platform value="Win64">False</Platform> Modified: trunk/Source/Brokers/ADO/DXE7/DclIOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/DXE7/DclIOADO.dproj 2014-11-26 10:25:44 UTC (rev 970) +++ trunk/Source/Brokers/ADO/DXE7/DclIOADO.dproj 2015-03-30 12:23:02 UTC (rev 971) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>None</FrameworkType> - <ProjectVersion>16.0</ProjectVersion> + <ProjectVersion>16.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> @@ -28,6 +28,12 @@ <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> @@ -47,7 +53,7 @@ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace> - <DCC_Description>InstantObjects ADO Design-Time Support (Delphi XE6)</DCC_Description> + <DCC_Description>InstantObjects ADO Design-Time Support (Delphi XE7)</DCC_Description> <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck> <DCC_RangeChecking>true</DCC_RangeChecking> <DCC_N>false</DCC_N> @@ -56,7 +62,7 @@ <DCC_S>false</DCC_S> <DCC_F>false</DCC_F> <GenPackage>true</GenPackage> - <DllSuffix>_D20</DllSuffix> + <DllSuffix>_D21</DllSuffix> <DCC_E>false</DCC_E> <VerInfo_Locale>1033</VerInfo_Locale> </PropertyGroup> @@ -67,7 +73,6 @@ <PropertyGroup Condition="'$(Base_Win32)'!=''"> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> - <VerInfo_Locale>1033</VerInfo_Locale> <DCC_UsePackage>IOADO;$(DCC_UsePackage)</DCC_UsePackage> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_1)'!=''"> @@ -76,14 +81,15 @@ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2)'!=''"> <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> <DCC_Optimize>false</DCC_Optimize> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> - <DCC_Description>InstantObjects ADO Design-Time Support (Delphi XE7)</DCC_Description> - <DllSuffix>_D21</DllSuffix> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> </PropertyGroup> <ItemGroup> Modified: trunk/Source/Brokers/ADO/DXE7/IOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/DXE7/IOADO.dproj 2014-11-26 10:25:44 UTC (rev 970) +++ trunk/Source/Brokers/ADO/DXE7/IOADO.dproj 2015-03-30 12:23:02 UTC (rev 971) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>16.0</ProjectVersion> + <ProjectVersion>16.1</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> @@ -49,9 +49,9 @@ <SanitizedProjectName>IOADO</SanitizedProjectName> <DCC_ImageBase>00400000</DCC_ImageBase> <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps> - <DllSuffix>_D20</DllSuffix> + <DllSuffix>_D21</DllSuffix> <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> - <DCC_Description>InstantObjects ADO Run-Time Support (Delphi XE6)</DCC_Description> + <DCC_Description>InstantObjects ADO Run-Time Support (Delphi XE7)</DCC_Description> <DCC_WriteableConstants>true</DCC_WriteableConstants> <RuntimeOnlyPackage>true</RuntimeOnlyPackage> <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;Data.Win;$(DCC_Namespace)</DCC_Namespace> Added: trunk/Source/Brokers/ADO/DXE8/DclIOADO.dpk =================================================================== --- trunk/Source/Brokers/ADO/DXE8/DclIOADO.dpk (rev 0) +++ trunk/Source/Brokers/ADO/DXE8/DclIOADO.dpk 2015-03-30 12:23:02 UTC (rev 971) @@ -0,0 +1,41 @@ +package DclIOADO; + +{$R *.res} +{$R '..\InstantADO.dcr'} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS ON} +{$RANGECHECKS ON} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRI... [truncated message content] |
From: <car...@us...> - 2014-11-26 10:25:52
|
Revision: 970 http://sourceforge.net/p/instantobjects/code/970 Author: carlobar Date: 2014-11-26 10:25:44 +0000 (Wed, 26 Nov 2014) Log Message: ----------- Added TestStoreAndRetrievePicture for InstantExposers Modified Paths: -------------- trunk/Tests/TestInstantExposer.pas Added Paths: ----------- trunk/Tests/XMLDB/Contact/ trunk/Tests/XMLDB/Contact/TContact.1E06DD44F478B44FB23FEB0823BE3995.1.xml trunk/Tests/XMLDB/Contact/TContact.CE940464314ACF4F9DC2953FBDB3BF8C.1.xml trunk/Tests/XMLDB/Person/ trunk/Tests/XMLDB/Person/TPerson.CFD05DBF7B1DDE4D9505AD254DDDECBF.1.xml Modified: trunk/Tests/TestInstantExposer.pas =================================================================== --- trunk/Tests/TestInstantExposer.pas 2014-11-26 10:22:47 UTC (rev 969) +++ trunk/Tests/TestInstantExposer.pas 2014-11-26 10:25:44 UTC (rev 970) @@ -46,6 +46,7 @@ procedure TearDown; override; published procedure TestStoreAndRetrieveContact; + procedure TestStoreAndRetrievePicture; procedure TestStoreAndRetrieveContactPhones; // procedure TestOrderBy; procedure FieldSetValue; @@ -54,7 +55,7 @@ implementation uses - SysUtils, ShellAPI, InstantPersistence, TestModel, DB; + SysUtils, Classes, ShellAPI, InstantPersistence, TestModel, DB, Graphics; { TTestXMLBroker } @@ -291,6 +292,46 @@ end; end; +procedure TTestExposer.TestStoreAndRetrievePicture; +const + DEF_NAME = 'AName'; + DEF_NAME_UNICODE = '链接'; +var + c: TPerson; + Field: TField; + old_id: string; + BlobContentBefore, BlobContentAfter: string; +begin + FExp.ObjectClass := TPerson; + c := TPerson.Create; + try + FExp.Subject := c; + FExp.Edit; + Field := FExp.FieldByName('Name'); + if not FConn.UseUnicode then + begin + Field.Value := DEF_NAME; + AssertEquals(DEF_NAME, c.Name); + end + else + begin + Field.Value := DEF_NAME_UNICODE; + AssertEquals(DEF_NAME_UNICODE, c.Name); + end; + Field := FExp.FieldByName('Picture'); + AssertTrue(Field is TBlobField); + TBlobField(Field).LoadFromFile(ExtractFilePath(ParamStr(0)) + 'Picture.bmp'); + BlobContentBefore := TBlobField(Field).AsString; + AssertTrue(BlobContentBefore <> ''); + c.Picture := BlobContentBefore; + BlobContentAfter := TBlobField(Field).AsString; + AssertTrue(BlobContentBefore = BlobContentAfter); + FExp.Post; + finally + FreeAndNil(c); + end; +end; + initialization {$IFNDEF CURR_TESTS} RegisterTests([TTestExposer]); Added: trunk/Tests/XMLDB/Contact/TContact.1E06DD44F478B44FB23FEB0823BE3995.1.xml =================================================================== --- trunk/Tests/XMLDB/Contact/TContact.1E06DD44F478B44FB23FEB0823BE3995.1.xml (rev 0) +++ trunk/Tests/XMLDB/Contact/TContact.1E06DD44F478B44FB23FEB0823BE3995.1.xml 2014-11-26 10:25:44 UTC (rev 970) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TContact> + <Id>1E06DD44F478B44FB23FEB0823BE3995</Id> + <Category> + <TCategory> + <Id>CAT000</Id> + </TCategory> + </Category> + <City></City> + <Name>AName</Name> + <Phones> + <TPhone> + <Name>Home</Name> + </TPhone> + <TPhone> + <Name>Office</Name> + <Number>012-234-56781</Number> + </TPhone> + </Phones> +</TContact> Property changes on: trunk/Tests/XMLDB/Contact/TContact.1E06DD44F478B44FB23FEB0823BE3995.1.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Tests/XMLDB/Contact/TContact.CE940464314ACF4F9DC2953FBDB3BF8C.1.xml =================================================================== --- trunk/Tests/XMLDB/Contact/TContact.CE940464314ACF4F9DC2953FBDB3BF8C.1.xml (rev 0) +++ trunk/Tests/XMLDB/Contact/TContact.CE940464314ACF4F9DC2953FBDB3BF8C.1.xml 2014-11-26 10:25:44 UTC (rev 970) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TContact> + <Id>CE940464314ACF4F9DC2953FBDB3BF8C</Id> + <Address> + <TAddress> + <City>Milan (€)</City> + <Street>Street</Street> + </TAddress> + </Address> + <Category> + <TCategory> + <Id>CAT000</Id> + </TCategory> + </Category> + <City>Milan (€)</City> + <Name>AName</Name> +</TContact> Property changes on: trunk/Tests/XMLDB/Contact/TContact.CE940464314ACF4F9DC2953FBDB3BF8C.1.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/Tests/XMLDB/Person/TPerson.CFD05DBF7B1DDE4D9505AD254DDDECBF.1.xml =================================================================== --- trunk/Tests/XMLDB/Person/TPerson.CFD05DBF7B1DDE4D9505AD254DDDECBF.1.xml (rev 0) +++ trunk/Tests/XMLDB/Person/TPerson.CFD05DBF7B1DDE4D9505AD254DDDECBF.1.xml 2014-11-26 10:25:44 UTC (rev 970) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TPerson> + <Id>CFD05DBF7B1DDE4D9505AD254DDDECBF</Id> + <Picture>424D6E1C0000000000003600000028000000390000002A000000010018000000000000000000C40E0000C40E00000000000000000000AC721EAB701AAE7418B3771BB3781BB4791CB77A1DB87C1DB77C23B97D1FBA7C19B87C1EB77D1DB97B20BA7E1BBA7D1DBA7D1DBB7E1FB97C1CBC883DE1D7CDEFF3F9F0F2F4EFEFF1CEAD82BA7C18BA7F12B97E11BD7E0FBE7E12BC7D12BC7E10BC7E11BD7F10BD7E12BA7E0DBA7E0BBB7E0ABD7E0BBD7D0EBB7D0BBB7E08BC7E0CBC7E0CBE7F0FBC7D0CBA7E07BB7E09BB7D09BC7E0CBC7E0CBD7D0FBC7D0ABC7E11BB7D0FBB7B0EBA7B0EFFA86C17A86D16AC7318B07418B5771AB47619B47819B67C18B67B17B67B17B97918BA7A15B87719BA7B1EB87C19B77A1EB87F1BB77C1CBD7D1FB97A20C8A274EEEFF0EEF1F4F0F3F6ECE8E4C29752BA7D11B98014BC7E13BC7C13BB7E12BB7D13BC7E12BB7F0FBA7E10B97C0CBB7E0ABC7F0CBD7F0DBD7E0EBB7E0BBB7E08BB7D0ABB7D0CBC7E0CBB7D09BB7E0ABC7F0ABD7F0BBC7E0CBB7D0BBB7D0BBD7E10BD7E0FBB7C0DBB7D0DB97B0BFFAB6D15AB6E14AE7214B07415B17516B37717B57918B77C19B87E1BB87D1AB67A16B77D1BB68E55B3802FB87A15BB7C1ABC7D1AB6781DB97E22BB8221B88032DBCBB4F1F6FCEFF3F1F2F9FBD8C2A1B57915BA7F11B87E15B97D10BC7E0FBB7E0EBC7F0FBB7F0FB97D0BBA7D0DBB7C0DBD7E0FBC7D0EBB7E0ABB7E0BBB7D0BBC7E0CBC7E0CBC7E0CBD7E0DBC7E0CBC7E0CBC7E0CBC7E0CBC7E0CBC7E0CBC7E0CBC7E0CBC7E0BBC7E0DBA7C0CFFAE7015AE6F13AF7113B17612B27612B47814B57915B67A16B77B19B97C1BB87A149D7E538797C0A77B3DBC7B0CBA781297805E9A9DA7A8824DBC7D17BD7D1DC19150EBE7E2F0F4F3ECF3F5EDEAE6C29552B97C0FB97F12BB7F11BC7E13BC7E14BC7E14BB7D15BC7E14BA7C12BC7E10BC7E10BA7D0CBC7E09BC7F0CBD7E0EBD7E0DBC7E0CBC7E0CBD7F0EBC7D0DBB7C0DBC7D0DBB7E0DBD7E0EBD7F0EBC7F0CBB7F0BBC800DBB7E0BBA7D08FFAD7012AC6F11AE7211B1740FB57811B77913B67812B57812B67815B77916B777138178803A4987935F11AE771C797A7A5472AF8E8076A77A42A48B64A69176AF7C2FCDAB7DEFF1F6ECF0F5F0F4F9E0CFBFB8832CB87F12BB8011BA7F11BA7E14BB7E14B97D12BB7E16BA7D14BA7D0EBA7E0CBA7E0BBC7E0CBD7F0DBC7E0CBC7E0CBC7E0CBC7E0CBB800CBB800DBB7E0FBC8012BD8012BC7F11BC7F11BC800FBA7F0CBA7E0EBA7E0EBA7E0DFFAC7011AF7412B17712B2760FB67812B77913B77913B77A13B67815BA7B14B778176D708C3842736240166F7A8A4675C05B545E7D715A6A7FA45D7CB997919BB17C2CB8802DE0CFC1F0F4FCEEF0F5EFEFF5C8A677B87C17B97D11B87D0FBA7F10BB810FB87F0DBA7F11BA7E11BC7F10BB7F0DBA7F0BBC7F0CBC7E0CBD7F0DBD7F0DBC7E0CBC7E0CBB7F0BBA7F0CBC7F10BC7F11BC7F11BB7E10BB7E10BB7F0EBB800CBA7E0EBA7E0DBA7E10FFAF7310B07511B27810B3770FB67712B67813B87A13B67914B87814B27A25937554556DA33F467A484E6B547BC2405A935776AB527FC94374CC4C6AB49A8E87B57C21B97A14BF9255E9E9E7EEF2F4F0F0F4E4DCD4BD8A43BA7D14B87E15B97E10BA7F0FBA7F11BA7F12BB7F13BC7F10BA7F0EBB7F0CBC7F0DBB7D0BBC7E0DBD7F0DBD7F0DBD7F0DBB7E0CBB7E0DBC7F0FBB7E10BC7E10BB7D0FBB7E0FBB7E0DBA7E0BBA7D0DBB7E0FBA7E0CFFAF710EB1730EB2760DB57911B67912B67812B77A16B47917B478139B87676A94D8537AC4394D975380CC456BB55482C95484CF3860AD576892886D4FB3802DB57D19B97D14B27819CBB088F0F4F8EEEEF2EEF4F8D1B58BB87E1CB87E18BB7F10BC7F0EBC7F11BA7D0FBA7D10BD8012BC7F10BC7F11BA7E0DBA7E0DBA7E0DBA7E0DBB7F0EBA7E0DBB7D0DBD7E0EBC7D0DBD7E0EBD7E0EBC7D0DBC7D0DBC7E0CBC7E0CBD7F0DBB7E0EBB7F0EFFB27410B1730EB3760EB67A11B57910B77A11B67A13B57913B6790D93805E5B8DD96487CB36498F4569B53A5CA6426DBE4B6AA0766B5DAB741BBD7B0BBD7C0CB87C12BA7E14B97D16B8802CDDD0BDF0F3F9EEF2F5E6E0D9BA8B45B97D0FBB7E0FBA7E0FBB7D10BA7D0FBA7D0FBA7D0FBB7E10BA7E0FBA7E0DBB7F0EBB7F0EBA7E0DBA7E0DBA7E0DBC7E0EBD7E0EBD7E0EBD7E0EBD7E0EBD7E0EBD7F0EBC7E0DBA7C0ABC7E0CBA7E0DBA7E0DFFB47511B47610B4780FB67A0FB77B0FB77B0EB67B11B57B0FB37818727B8C4E81CF6185CD3858A736559E364C8F5A5763A1722BBC7C0DBC7B0EB77B0FB87B12BC7C13BA7D12BC7E12B97910BE965DF0F0F0EEF1F6F1F0FAD5BD9BB37B11BA7C0EB87C0DBA7E10BA7D0FBB7D0FBA7D0FBA7D0FBB7E0FBA7E0EBA7E0DBC800FBB7F0EBB7F0EBB7F0EBB7E0DBC7D0DBD7E0EBC7D0DBC7D0DBC7D0DBD7E0EBD7F0DBB7D0BBB7D0BB97D0CB87C0BFFB4750EB6780EB6790CB77A0DB77A0DB97C10BA7C0FB67A08867659568CD14D80CD4774C2395DAF39539A5A5360A9721BBE7D0ABB7C12B87B10B97C0EBB7C10BA7B0FBB7B10BA7C11B88012B68027D8C7ABF2F7FEEDEFF2EBEAE5C0934CBA7B11BA7D0FBA7E0DBB7F0EBB7F0EBB7F0EB97C0EBA7D11BC7E10B97D0EBA7D0FBC7E0EBC7E0DBB7D0DBB7D0DBC7D0DBD7E0EBC7D0DBC7D0DBD7E0EBC7E0DBC7E0CBD7F0DBC7E0CBB7D0BBA7D0BFFB2730BB4750BB6790BB6790CB8790EB8790EB97B0BA875226988B770A2DE4577C73965B8385496484764855B1FBF7E0FB57A11B87A10B97C0EB97B0EBA7C10BB7E11B97B0FB97C10B67E11B57A15BB8A42E8E3DFF0F1F6F2F3F7D7C3A6B87D19BB7F10BC800EBA7E0DB97D0CBA7E0DBA7D0FBB7D11BB7E0EBA7E0EBB7E0EBC7D0EBD7D0DBC7D0DBD7E0EBC7D0DBC7D0DBC7E0CBC7F0CBC7E0CBB7E0BBC7E0CBC7E0CBC7E0CBB7D0BBB7D0BFFB2730BB3750BB6780BB5780BB5770BB7780CB879098C7459558BD3558ACF3A68BE3957A44949664E3523694413B37912B87B10B7790FB87B0EB87B0EB97B0FB87A0EB77B0CB77C0EB97B10BA7B13B9750ECCAA7AF2F2F8EFEEF2F1ECECC49656B97A0BBA7E0DBA7D0DBA7E0DBA7E0DBA7D10BC7E12BA7F0CBA7E0BBA7F0CBC7E0DBC7D0DBC7D0DBE7F0FBE7F0FBE7F0FBC7E0CBC7F0ABC7F0ABC7F0ABB7D0BBC7E0CBD7F0DBC7E0CBC7E0CFFB2720AB3750BB47709B4770CB4770DB67A0AB779067E7065417DCF3A71C3314A8C3E45694D352B4D2F154F321A9A6515BC7E0FB97B11B97B0EB77B0BB87B0EBA7C10B97C0DB97C10BB7D10BB7E0FB67B0EB67E24DFD3C3EEF4F6F1F4F5E3D6C3BA8225B87C0DB87E10BA7E0FBC7E0DBC7E0EBD7E0FBC7E0DBB7D0CBC7E0DBC7D0DBC7D0DBB7C0CBC7E0CBD7E0DBC7E0DBC7E0CBD7F0CBC7E0BBB7D0BBC7E0CBC7E0CBC7E0CBB7D0BBC7E0CFFB2730BB4760BB47709B5770BB4780BB57A0BB4780D676E814679C84271C33140704535324F2E1A5030184E3019855314BF7D0FB87A10B87A0DB77A0CB97C0EB97B0EB97C0EB97C0DBA7D0FB97D0FB67B0EB87A0BC19552ECECEAEDF1F4F2F5F7CEAF7CB87B0BBE7F0FBA7F10BC7D0DBC7D0DBD7E0EBC7E0CBD7F0DBC7E0CBC7E0CBC7E0CBB7D0BBC7E0CBC7E0CBC7E0CBC7E0CBC7E0CBB7D0BBB7D0BBC7E0CBC7E0CBC7E0CBC7E0CBA7C0AFFB4750DB4760CB47709B47808B3780ABB79059773344A6FB23E68B74067B83A47704C301D51301952321A52311A663E18AF7415B97B0FB87A0DB7790CB77A0BB87B0AB97C0EB97C0EB97C0EBA7D0EB97D09B87D0FB4780FD8BD97F0F3FAF3F2F5E9DFD2BA8828BD7C0ABA7F0FBE7F10BE7E0FBD7E0DBC7F0ABD800ABC7F0ABB7E09BB7E09BC7F0ABC7F0CBC7E0CBC7E0CBC7E0CBC7E0CBD7F0DBC7E0DBC7E0CBC7E0CBC7E0CBD7F0DBD7F0CFFBA7A08BA790AB97908B47A09B27909B5760A6A70773E6AB73A59A634478E3C384C52321D52341952341C5030184D2E177B5013BA7C13B97C11B97B10B8790FB77A0CB7790DB87910B97D0EB97D0DBA7D0FBA7C10B97B0DBA8731EAE2D8EEEFF3F2F4F6D8BD94B67C0FB97E12BC7F0CBC800EBC7E0DBC7F0BBC7F0BBC7E0BBC7E0ABC7F0BBD800CBD7F0BBD7F0BBC7F0ABC7F0BBC7E0CBD7F0DBC7E0CBD7F0FBD7F0EBD7E0EBD7F0FBC7E0FFF8C5A0F9D670EAF740DB67C0FBE7D07A0722147669E3E66B33E5DAA33407D3E343F4C301D5135164F31194E30174D30185332159C6514BC7A16BA7B0EB77A0CB7790FB87911B87810B87B0EB87B0FB97D13BA7D10BB7C11B57910CAA875ECEFF3EEEFF2F1E9E7C38F3BBA7C06BA7F0DBB7F0DBB7F0DBD7F0DBD7F0DBC7E0CBD7F0CBD800CBE800DBD800BBD800ABC7F09BC7F0ABC7F0CBC7F0BBC7F0BBD800CBD7F0BBC7F0BBC7F10BA7D10FF452B184F30185E3B15774B15915E0B6E63573C62B13E62AE38569E313E7747364159361B50311A50321A4F32185032184D2F1A6A4217B47712BD7A0CBA790CB97912B87812B87911B87A10BA7915BE7B16BD7A0FB97911BA7D12BC8227DFD0BBEEF0F2F3F4F9DEC9B0B87F22BA7C0EBC800FBB800CBC7E0CBC7E0CBE800DBD8009BC8008BC8008BC7F09BC7F09BC7F09BC7F09BC8008BC8008BC8009BD7F0CBD7F0CBD7F0CBE8112BB7E11FF55311D5032174F31194C2D1948302043588E3963AE3B5DA83852982D396D5C463B8F5D1756331750321A52321C50311A52321A5435159A671EAB7530B37920BC7B0FB8790FB9780FBA7A0EBB770DAC741C9A7F5C9E907DB0823FB67A14C59C5DF0EEEAEEF3F5F2F2F7D1AE83BC7E1DBC8016BC800FBC7E0DBD7F0EBD7F0DBC800BBB800ABB8009BB7F0ABC7F0BBB7F0ABD7F09BD8007BB7F09BA800BBA7E09BD8109BE810ABD800EBB7F10FF55341B54351855341B523016483E414161A53860A83C5FA7395094303863553F2F9662126A411551321B51311A52321B54331A4B3016735C53727DAE5C5B6C966517B97909BC7B0EB375058765365D6D92496BB35B7FC2838DB0A48358B97F2BDECAB4F1F6FBF2F6FAE6DDD2BC8738BB7E14BC7F11BE7F10BD7E10BD7E10BC800BBB7F09BC7F0BBC800ABC800ABB7F0ABB7F09BD7F08BC7F09BB800BBC7E0BBA7E07BB7E0BB97B05B87B05FF54351852331A5335194F3217454B6A3F64AF3E63AD375BA43347893536584432245134165A391856351D52341A52341A52341851331A5E401E6E5F552634683D2F31654319673E0D5D4B3F4E6BA6385AA94066B15F77AF8E8383B58338B87E1FC49A5CF1E9E6F0F3F7EFF6F5CFB283B87C16BE7F0FBA7F0AB97E09BA7E0ABA7B08BA7A06BA7B04B97802BA7802BA7902BA7A07BA7A09B87A0AB87E1ABE8023BC8426BF8831C28E3EC79C58FF9D65148A58156B44134F362242548B3C64AF3C62AF385BA430438136344D4E332057341C53351A57371C55371A54351851341951341B5233135442393B51932F39714457933B518C456AB5446CB94F689B7F6847AC7721BA7C11BA7908B57B0EB57813D4B590F2F2F8F0F4FBEAE5DFBD8E44B97D19BA8220BB8428BB882FBF8D38C29241C59A4DC8A05ACDA96BD1B27DD4B98EDBC19AE0C7A7E7D9C7E9DED4E9E1D8EDE7E3F0E9E8F2F0F4FFBB790ABA7E0BBC7A07805F31415A9C3A61AD3D60A936579F2F427B33314950322159351B55341C58361A5536195534185535184D2F174A2D133D4668406DC5335196304B974060B13F5BA64A578B967A57C08B31C59140C6974BC19954C9AA71CFB07FD6C2A7EFF4F3F3F4F8EEF3F5E1D2C5E1CFBBE8DECCEADDD2ECE4DEEEE9E7EEEBE3EDECE5EDEAE5EDE7E1ECE4DCE8DFD6E2D6C9E4D2BEDBC5AAD8C09CD0B387D0B07BCCA66CC89E5DFFBE7A0BB4770CA2660D6D5B503D5EA53D68B34268B63A59A5303F7930304D4C32215733155835165837185637195A3A1D623F2067452669482B42568F3968C03A61AB3C5EAB395AAB2F43889698ACF3EADDECECEDEEEFEEF3F2F4F2F2F6F2F5FDF2F3F6F1E9EBEDE6E3EFF0F3EEF2F3F3F8FCE0D7CED8C2A5D6B890D1B085CDA976C8A362C49952C29349BE8C3BBE882DBE8424BB7E1DB97D17B97C12BB7D10BB7B0EBB7A0CBB7C09BB7C09FF8E5D1875471355341346496A3E63AD3E6AB4416BB83A5BA832417B2F30506550428A6949916F4D9B7A599D7E5FA18263A68566AC87699C7F69475E994F7CC63B61AE3858A83F4D8A756C7FD8C8B9DCC8ADD3BA9BD3B698CEAE88CBA979C79F6AC4995CC29150BE9050D9C7B1F1F5FCF0F5FAE1D1C0B68232B97C12BB7B12BB7B0DB97C09BA7D09BA7D0BBC7E0DBE7F0FBE800CBD8008BD800DBC800DBD800DBC800DBC7F0CBE7F0BBC8010FF3E2145866454967A614E58853860AB3E6BB4456EB6365DAC2F45873032557B64549F7B59967251916C4B8A6544825D3C7D593676502B5F4A46375A9E4C70B9354D97404A785947459A6C2DC1892DB67E22BA7E1FB97D19BB7C1DB97D15B77C10B87D14B87F18B67E1AC49355EDE5E5EFF2FBF4F1F5CEAC7CBA7C12BF8210BF800EC0810FBD810BBE7F0DC08011BE7F0EBB800DBA7F0EBD8113BC810EBE800CBE810DBD800CBD7F0FBE8110FF301B884E3367725E5D4351893E62AA4E78BC4B73BB3C60B034499131355C543927623A166139175F38155F38176039175B3814583611423C4F3353A62F468C4241635C4134633A176A4211A06813C18013BB8016BB7F0DBC7D10BA7F0EBD7F15BF7F19BD7F16BC8017B97E1ED2B18EEFF3F8EFF3F7E9E3DDC18D3EC07F11BF8110BF810FBD800BBD7F0DBD7F0EBC7F09BB7F09BC7E0CBD7E0EBD800CBE800FBD7E0EBF8010BF7F11BD7E0FFF4D33D53A24AA342B733E4F8E4D6EB1557CBD4F78BD4062AC31498D313760503629633B1B623A1C633B19643C1B653C1B623C195E3916353A583758A9323F734E3830603A18653D195E391B6A3D19A36B15BE8412BC8112B97D11B87E0EBA7D13BC7E15BC7F11BB7E18BB8116BC842EDFCFBCF3F7F8F5F5FAD7BE9DBA7E1ABE8010BD800DBD810CBE800CBD800CBD8009BC7F08BE7F0BBD7E0BBD7F09BE800CBD800BBE800CBD7F0CBC7E0CFF31218E3F27B63B36A0405594516DB15679B95179BF4368B2314D96343961513628623A1A683D1B653D1A633C1A633C19643C1C5735192A304F3459A8323F724E392B5F3B1B5E3A195F3B1B5D391B734517B07313BF7F12BD7E10BD7F0DBA7E0ABB7E0BB97F0DBB7F13BD7F14BD7E12C39453EFEAE6F5F3FBF0E7E1BF903DBC7E0EBD810CBD800CC0820EBD7F0CBC7F0CBC7F0ABC7F09BD7F09BD8009BE8109BD8008BD8008BD8008BD8008FF3722A931198A3633804359964E68AA5977B9486EB83F66B136519A37385B543824603A1B663E1B633C1A613C1A623C1A673E1B4A2D1B242649334E9B313667543729673C1A623C1B633D1B643E1C603A1C794A16B57714C28211C1810DC38008C1810ABE820BBF820CC08212C08310BC7F12D6B78CF3F5F8F4F4F8DBC1A0BC7B12BC810DBC810CBB800DBC7F0ABC7E0ABB7E0ABC7F09BC7F09BC7F08BD8007BD8008BD8008BD7F09BD7F09FF4332D2412BC63E3F8D4559915068A94A66AA395FAD3A66B13551953A395558381E5B391A623E1A623C19613B19643E1C663E1B33211A1D1B322F3E77313763573A266B3F19663C1B653C1B653C1B633C1A603A1A7A4E15915E1298630FA56C0EAA710EB3780FB67913B07419A06916955E13A26E31E4D6C7F7F9FBF0F0F1C59E5BBB7D06BB8208BA800ABC8008BB7F07BB7F07BB7E08BA7D07BB7E07BC7F07BC7F07BC7E07BE7F0DBD7E0CFF432ECA422DCC3E468F48598F4E629F3C5498395AAA3C63AF2F4B8D40374B5F3A1B5F3A1A613B19623B19633B1A633E1C58361D2218201E19232227423333555B3A23673C18663C1B663D1C673D1C663D1C653C1C623A1B5F391A603B19633C19693F1973451977491B74441A70401B6E411C6E4013906945DBCDC3EFEFF4E5D7C4BA8018BD8005BC7F08BC8007BC8007BC8008BC7F09BC7F09BD800ABC7F07BC7F07BC7F07BC7E08BC7E08FF422ACD422CC93E458A42528342518A3B4E8F526EB44766AD304389463941623B1A633B1B623A1B5E3A1B613B1B653D1A412C1B1A1724241C2B241E2E362A37643B21673C1C663D1C653C1B643B1A653C1B663D1C663D1C663D1D653D1D633B1B643C1D663C1E693D1B6B3D196F401C71431B7044196E401397724FCCBEB2F6F3F2D0AA71BD7C06BC800ABD8009BC800ABC7F09BC7F09BC7F09BC7F09BC7F07BC7F07BC7F07BC7F07BC7F07FF4128C43F28BF3638863B4D803D50894458936786C0405EA532448A483940633C18633C1C633D1C603B1B623D1C623C1C2A201D1D1B2924203427212F3A2D2B653B1E683C1B663D1C663E1C633A19633A19653C1B663D1C683D1C693D1C673C1E673D1E673D1C6C401B6E401B70411C73451C73461B71431A764A21B1957BEAE2E5F0E5DDBE8A33BC7E0BBE810EBC7F0DBC7F0BBC7F0ABC7F09BC7F09BC7F07BC7F07BC7F07BC7F07BC7F07FF412BCA4229C839338D3F52893F589636498F425B9D3C5AA531448A4036495D3823633D18643D1A633D1A643E1C52311F1E1923221E3026233822213234292A633C206C3D1C693E1D693F1C683E1A693D1A693E1A6A3F1A6A3E1B6A3E1C7947196A41196A3F1D6D3F1A6E431B6D411D70421B74441A74451B6E4215875E37D1BDB3F7F6FCD8BE97BA7D10BB8108BE7F08BF7E09BC7F08BD800ABD8009BD8008BC7F07BC7F07BC7F07BC7F07FF3F2ACE4128CF3A328D3C5192405FA3354A922F418039519C334585353351412941633B1C653C1A65391E653B1D3D281B1B1927242034282238211E302A22235E3C1C6C3E1A6A3D1D6A3E1C6B401B6B3E1C693D1B683E1B683E1B7E4F13B4780E976110714216673D1C683F1B6C401D6E401A6F40186B421A6D4219724714C2AA92F7F7F9F2F0EEC59646BC7C00C07F05BE7F07BD8008BC8007BD8007BD8008BC7F07BC7F07BC7F07BC7F07FF371FBB3C24BE37368A3650944265AD3A53A12E408330428433447C3636592E1E5255323B7F4F147B4B167545172D221F1B1B29262235282338241E2E2A2123613B1A6D3E1B6D40196D41176F4417794B168451148F58129A630FB17709C38206C08007A66D0E8655147447176F42187243177747177F4F16915B13A4690BC79E5EF4F3F3F7F7FBE1CDB2B88013BE7F07BC7F08BD8008BD8008BD8008BD8008BD8008BD8008BD8009BD8008FF3723B23220AB333488354F924266AE3859A82F4691323F77333D6F37385F281C513320589F6B1DC18005A16C0F261F1C1E1D2B272337282339241E302D21258E5D17AD700DAA6F0CAA6F0BAE730CB87A09BF7E07C38106C08309C18208BF8007BE820AC1840BBE800BB1760CA96E0BAD700AB4750ABB7E07C0830BC4830DC08015DEC9A8F6F9FFF1F4F5CBA56BBB7D08BF8006BF8006BE8007BC7F07BD8007BD8005BD7F02BE7E02BA7D00FF4329CF4027D0353394324B913F64AE3A60AC314B9C323F7933356238395F291E4C23166F7B4F51C9840493631320181D24202F282337272336241F302A20279D6A18C78605C18404C18404C18304C48007C08007BB8109BF820ABE8106BD8108BE810BBE8109BE8108C08309C08309C38306C48204C07F03BF8006BC7F06BD7B01BF8D38EBE5DDF6F8FAE6DCCCBA8834BB7B07BC7C09BA7C0BB97B0ABA7D0BB87F0DBA8413BE871DBE8725FF3A23C03A21C7353590354F914469B2446AB43754A530478A2F335D3B3B582E20492516696D475CC684067149131E17232724322826342623302520312A2027966414C18206BD8007BE8107BF8108C0820ABD8008BD8108BF810EBE810BBD800ABE7E0BBE7E0ABB7F0FBA7F13BC8118BD831ABD841EBC8727BF8B2FC08D36C59241C3964BDDCAB0F9F4FBF6F3F8DDC5B0D4B58ADABE99DEC6A3E1C9A9DFC7ABDEC9AFE4D3B9E6D4BDE5D0BDFF3821C13A24BF36398D395593466EAF4C75B74262B037559D33375F3A3A52302648271354774933C785066445131C18222724352A283226252E2520312C232A996717C4840AC08110C28211C18210C08717BF8621C18830C78D3DC28F43C59A5AD2AD7DD8B891D7BC9CDBC3ABE7D1C0E9D6C8EADBD2EDE4E2EEE9E6F1EEEBF7F3F3F4F2F6F3F2F1EDF0F3F7F3F5F8F7FEEDE7EBE4D8D2E2D0C2DEC6B0D7B998CDA87BCA9E66C2944DBC8C38FF</Picture> + <Category> + <TCategory> + <Id>CAT000</Id> + </TCategory> + </Category> + <City></City> + <Name>AName</Name> +</TPerson> Property changes on: trunk/Tests/XMLDB/Person/TPerson.CFD05DBF7B1DDE4D9505AD254DDDECBF.1.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property |
From: <car...@us...> - 2014-11-26 10:22:55
|
Revision: 969 http://sourceforge.net/p/instantobjects/code/969 Author: carlobar Date: 2014-11-26 10:22:47 +0000 (Wed, 26 Nov 2014) Log Message: ----------- Update XE7 demo project Modified Paths: -------------- trunk/Demos/PrimerCross/Primer_DXE7.dpr trunk/Demos/PrimerCross/Primer_DXE7.dproj trunk/Demos/PrimerCross/Primer_DXE7.res Modified: trunk/Demos/PrimerCross/Primer_DXE7.dpr =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE7.dpr 2014-11-26 10:21:38 UTC (rev 968) +++ trunk/Demos/PrimerCross/Primer_DXE7.dpr 2014-11-26 10:22:47 UTC (rev 969) @@ -66,7 +66,9 @@ QueryView in 'QueryView.pas' {QueryViewForm: TFrame}, RandomData in 'RandomData.pas', Stopwatch in 'Stopwatch.pas', - Utility in 'Utility.pas'; + Utility in 'Utility.pas', + Vcl.Themes, + Vcl.Styles; {$R *.res} {$R *.mdr} {Model} Modified: trunk/Demos/PrimerCross/Primer_DXE7.dproj =================================================================== --- trunk/Demos/PrimerCross/Primer_DXE7.dproj 2014-11-26 10:21:38 UTC (rev 968) +++ trunk/Demos/PrimerCross/Primer_DXE7.dproj 2014-11-26 10:22:47 UTC (rev 969) @@ -127,8 +127,9 @@ <Source Name="MainSource">Primer_DXE7.dpr</Source> </Source> <Excluded_Packages> - <Excluded_Packages Name="$(BDSBIN)\dcloffice2k200.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> - <Excluded_Packages Name="$(BDSBIN)\dclofficexp200.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k210.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp210.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\15.0\Bpl\dcldklang.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\15.0\Bpl\dcldklang.bpl not found</Excluded_Packages> </Excluded_Packages> </Delphi.Personality> <ModelSupport>False</ModelSupport> @@ -279,6 +280,12 @@ <Operation>0</Operation> </Platform> </DeployClass> + <DeployClass Name="Android_SplashImage426"> + <Platform Name="Android"> + <RemoteDir>res\drawable-small</RemoteDir> + <Operation>1</Operation> + </Platform> + </DeployClass> <DeployClass Name="ProjectiOSEntitlements"/> <DeployClass Name="AdditionalDebugSymbols"> <Platform Name="OSX32"> Modified: trunk/Demos/PrimerCross/Primer_DXE7.res =================================================================== (Binary files differ) |
From: <car...@us...> - 2014-11-26 10:21:41
|
Revision: 968 http://sourceforge.net/p/instantobjects/code/968 Author: carlobar Date: 2014-11-26 10:21:38 +0000 (Wed, 26 Nov 2014) Log Message: ----------- Fix InstantExplore for refreshing virtual containers. Modified Paths: -------------- trunk/Source/Core/InstantExplorer.pas Modified: trunk/Source/Core/InstantExplorer.pas =================================================================== --- trunk/Source/Core/InstantExplorer.pas 2014-11-26 10:20:23 UTC (rev 967) +++ trunk/Source/Core/InstantExplorer.pas 2014-11-26 10:21:38 UTC (rev 968) @@ -60,12 +60,13 @@ FName: string; FInstance: TObject; FValue: string; + FLevel: integer; protected function GetCaption: string; virtual; function GetImageIndex: Integer; virtual; public - constructor Create(ANodeType: TInstantExplorerNodeType; AName: string; - AInstance: TObject; AValue: string); + constructor Create(ANodeType: TInstantExplorerNodeType; const AName: string; + AInstance: TObject; const AValue: string; const ALevel: integer); destructor Destroy; override; property Caption: string read GetCaption; property ImageIndex: Integer read GetImageIndex; @@ -73,6 +74,7 @@ property Name: string read FName; property NodeType: TInstantExplorerNodeType read FNodeType; property Value: string read FValue; + property Level: integer read FLevel; end; TInstantExplorerNodeEvent = procedure(Sender: TInstantExplorer; @@ -200,7 +202,7 @@ NodeData: TInstantExplorerNodeData): TTreeNode; virtual; function CreateNodeData(NodeType: TInstantExplorerNodeType; const Name: string; AObject: TObject; - const Value: string): TInstantExplorerNodeData; virtual; + const Value: string; const Level: integer): TInstantExplorerNodeData; virtual; function CreateObjectEditor(AOwner: TComponent; DataSource: TDataSource): TControl; virtual; function CreateTreeView(AOwner: TComponent): TTreeView; virtual; @@ -213,7 +215,7 @@ procedure SetImages(const Value: TCustomImageList); virtual; procedure SetNodeTypes(const Value: TInstantExplorerNodeTypes); virtual; procedure SetRootObject(const Value: TObject); virtual; - procedure UpdateDetails; + procedure UpdateDetails(ForceRefresh: boolean = False); function GetAttributesCount(Instance: TInstantObject): integer; virtual; function GetAttribute(Instance: TInstantObject; I: integer): TObject; virtual; public @@ -341,10 +343,11 @@ { TInstantExplorerNodeData } constructor TInstantExplorerNodeData.Create(ANodeType: TInstantExplorerNodeType; - AName: string; AInstance: TObject; AValue: string); + const AName: string; AInstance: TObject; const AValue: string; const ALevel: integer); begin FNodeType := ANodeType; FName := AName; + FLevel := ALevel; FInstance := AInstance; if (FNodeType = ntObject) and (FInstance is TInstantObject) then TInstantObject(FInstance).AddRef; @@ -400,8 +403,13 @@ Parent: TTreeNode; Name: string; AObject: TObject; Value: string): TTreeNode; var NodeData: TInstantExplorerNodeData; + LLevel: integer; begin - NodeData := CreateNodeData(NodeType, Name, AObject, Value); + if Assigned(Parent) then + LLevel := Parent.Level + else + LLevel := 0; + NodeData := CreateNodeData(NodeType, Name, AObject, Value, LLevel); if Assigned(NodeData) then begin if IncludeNode(NodeData) then @@ -608,14 +616,14 @@ function TInstantExplorer.CreateNodeData( NodeType: TInstantExplorerNodeType; const Name: string; AObject: TObject; - const Value: string): TInstantExplorerNodeData; + const Value: string; const Level: integer): TInstantExplorerNodeData; begin if Assigned(FOnCreateNodeData) then begin Result := nil; FOnCreateNodeData(Self, NodeType, Name, AObject, Value, Result); end else - Result := TInstantExplorerNodeData.Create(NodeType, Name, AObject, Value); + Result := TInstantExplorerNodeData.Create(NodeType, Name, AObject, Value, Level); end; function TInstantExplorer.CreateObjectEditor(AOwner: TComponent; @@ -953,11 +961,7 @@ Instance := NodeData.Instance; ChildCount := 0; if Instance is TInstantContainer then - begin - if (Instance is TInstantReferences) and (TInstantReferences(Instance).Metadata.StorageKind = skVirtual) then - TInstantReferences(Instance).Owner.Refresh; - LoadContainerNode(Node, TInstantContainer(Instance)); - end + LoadContainerNode(Node, TInstantContainer(Instance)) else if Instance is TInstantQuery then LoadInstantQueryNode(Node, TInstantQuery(Instance)) else @@ -1109,10 +1113,18 @@ procedure TInstantExplorer.RefreshNode(Node: TTreeNode); var IsExpanded: Boolean; + NodeData: TInstantExplorerNodeData; + Container: TInstantContainer; begin if not Assigned(Node) then Exit; IsExpanded := Node.Expanded; + if NodeDataIsAssigned(Node) then + begin + NodeData := TInstantExplorerNodeData(Node.Data); + if (NodeData.Instance is TInstantReferences) and (TInstantReferences(NodeData.Instance).isVirtual) then + UpdateDetails(True); + end; LoadNode(Node, IsExpanded); if IsExpanded then Node.Expand(False); @@ -1249,13 +1261,14 @@ end; end; -procedure TInstantExplorer.UpdateDetails; +procedure TInstantExplorer.UpdateDetails(ForceRefresh: boolean = False); var AObject: TObject; Container: TInstantContainer; InstantQuery: TInstantQuery; begin - ObjectExposer.PostChanges; + if not ForceRefresh then + ObjectExposer.PostChanges; if Layout = loTreeOnly then begin ObjectExposer.Subject := nil; @@ -1268,11 +1281,15 @@ Container := TInstantContainer(AObject); if (ObjectExposer.Subject <> Container.Owner) or (ObjectExposer.ContainerName <> Container.Name) then begin + ObjectExposer.Close; ObjectExposer.Subject := nil; ObjectExposer.Mode := amContent; ObjectExposer.ContainerName := Container.Name; ObjectExposer.Subject := Container.Owner; - end; + end + else if ForceRefresh then + Container.Owner.Refresh; + if DetailView <> ContentView then begin DetailView := ContentView; |
From: <car...@us...> - 2014-11-26 10:20:26
|
Revision: 967 http://sourceforge.net/p/instantobjects/code/967 Author: carlobar Date: 2014-11-26 10:20:23 +0000 (Wed, 26 Nov 2014) Log Message: ----------- Fixed problems when UseUnicode is active and streaming memo fields passing thorought Value of an InstantBlob attribute. Modified Paths: -------------- trunk/Source/Core/InstantPersistence.pas Modified: trunk/Source/Core/InstantPersistence.pas =================================================================== --- trunk/Source/Core/InstantPersistence.pas 2014-09-03 07:36:40 UTC (rev 966) +++ trunk/Source/Core/InstantPersistence.pas 2014-11-26 10:20:23 UTC (rev 967) @@ -485,6 +485,7 @@ TInstantMemo = class(TInstantBlob) protected class function AttributeType: TInstantAttributeType; override; + procedure SetValue(const AValue: string); override; procedure ReadObject(Reader: TInstantReader); override; procedure WriteObject(Writer: TInstantWriter); override; end; @@ -3724,23 +3725,13 @@ LAnsiValue: AnsiString; LValue: String; begin - if not UseUnicode then - begin - LAnsiValue := AnsiString(AValue); - L := Length(LAnsiValue) * SizeOf(AnsiChar); - end - else - begin - LValue := AValue; - L := Length(LValue) * SizeOf(Char); - end; + //Default Blob streaming is not based on UseUnicode setting. + LAnsiValue := AnsiString(AValue); + L := Length(LAnsiValue) * SizeOf(AnsiChar); if L > 0 then begin Stream.Clear; - if not UseUnicode then - WriteBuffer(LAnsiValue[1], 0, L) - else - WriteBuffer(LValue[1], 0, L); + WriteBuffer(LAnsiValue[1], 0, L); Stream.Size := L; end else @@ -3906,6 +3897,36 @@ Value := Reader.ReadString; end; +procedure TInstantMemo.SetValue(const AValue: string); +var + L: Integer; + LAnsiValue: AnsiString; + LValue: String; +begin + //Don't call inherited: Text streaming is different by UseUnicode + if not UseUnicode then + begin + LAnsiValue := AnsiString(AValue); + L := Length(LAnsiValue) * SizeOf(AnsiChar); + end + else + begin + LValue := AValue; + L := Length(LValue) * SizeOf(Char); + end; + if L > 0 then + begin + Stream.Clear; + if not UseUnicode then + WriteBuffer(LAnsiValue[1], 0, L) + else + WriteBuffer(LValue[1], 0, L); + Stream.Size := L; + end + else + Clear; +end; + procedure TInstantMemo.WriteObject(Writer: TInstantWriter); begin WriteName(Writer); @@ -6088,7 +6109,8 @@ AttributeChanged(Attribute); if Assigned(FOnAttributeChanged) then FOnAttributeChanged(Self, Attribute); - Changed; + if not ((Attribute is TInstantContainer) and TInstantContainer(Attribute).isVirtual) then + Changed; end; procedure TInstantObject.DoBeforeContentChange( |