API tools faq
paste
Advertisement
wprins

dunit2_xe_and_xe5_compiling_fixes.patch

wprins
Jun 1st, 2015
457
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Delphi 80.39 KB | None | 0 0
raw download clone embed print report
  1. Index: projects/DXE5/DUnit2.dproj
  2. ===================================================================
  3. --- projects/DXE5/DUnit2.dproj  (revision 101)
  4. +++ projects/DXE5/DUnit2.dproj  (working copy)
  5. @@ -5,7 +5,7 @@
  6.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  7.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  8.             <DCC_DependencyCheckOutputName>DUnit2.exe</DCC_DependencyCheckOutputName>
  9. -           <ProjectVersion>13.4</ProjectVersion>
  10. +        <ProjectVersion>15.3</ProjectVersion>
  11.             <Config Condition="'$(Config)'==''">Release</Config>
  12.             <Base>True</Base>
  13.             <AppType>Console</AppType>
  14. @@ -46,7 +46,7 @@
  15.         <PropertyGroup Condition="'$(Base)'!=''">
  16.             <Manifest_File>None</Manifest_File>
  17.             <VerInfo_MajorVer>10</VerInfo_MajorVer>
  18. -           <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;Vcl;$(DCC_Namespace)</DCC_Namespace>
  19. +        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;Vcl;Vcl.Imaging;$(DCC_Namespace)</DCC_Namespace>
  20.             <VerInfo_Locale>1033</VerInfo_Locale>
  21.             <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
  22.             <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=10.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  23. @@ -62,7 +62,7 @@
  24.         </PropertyGroup>
  25.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  26.             <Version>7.0</Version>
  27. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  28. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  29.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  30.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  31.             <DCC_DcuOutput>_libdcu</DCC_DcuOutput>
  32. @@ -78,12 +78,13 @@
  33.             <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST>
  34.         </PropertyGroup>
  35.         <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
  36. +        <VerInfo_MajorVer>1</VerInfo_MajorVer>
  37.             <DCC_UnitSearchPath>..\..\externals\jcl\source\include\jedi;..\..\externals\fastmm;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  38.             <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  39.         </PropertyGroup>
  40.         <PropertyGroup Condition="'$(Cfg_2)'!=''">
  41.             <Version>7.0</Version>
  42. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  43. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  44.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  45.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  46.             <DCC_DcuOutput>_libdcu</DCC_DcuOutput>
  47. @@ -165,22 +166,15 @@
  48.                         <Source Name="MainSource">DUnit2.dpr</Source>
  49.                     </Source>
  50.                     <Excluded_Packages>
  51. -                       <Excluded_Packages Name="$(BDSBIN)\fmidesigner160.bpl">FMI Form designer and property and component editors</Excluded_Packages>
  52. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl not found</Excluded_Packages>
  53. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl not found</Excluded_Packages>
  54. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl not found</Excluded_Packages>
  55. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl not found</Excluded_Packages>
  56. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl not found</Excluded_Packages>
  57. -                       <Excluded_Packages Name="$(BDSBIN)\bcboffice2k160.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  58. -                       <Excluded_Packages Name="$(BDSBIN)\bcbofficexp160.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  59. -                       <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  60. -                       <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
  61. +                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k190.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  62. +                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp190.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  63. +                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  64.                     </Excluded_Packages>
  65.                 </Delphi.Personality>
  66.                 <Platforms>
  67. -                   <Platform value="Win64">False</Platform>
  68.                     <Platform value="OSX32">False</Platform>
  69.                     <Platform value="Win32">True</Platform>
  70. +                <Platform value="Win64">False</Platform>
  71.                 </Platforms>
  72.             </BorlandProject>
  73.             <ProjectFileVersion>12</ProjectFileVersion>
  74. Index: projects/DXE5/DUnit2Console.dproj
  75. ===================================================================
  76. --- projects/DXE5/DUnit2Console.dproj   (revision 101)
  77. +++ projects/DXE5/DUnit2Console.dproj   (working copy)
  78. @@ -1,12 +1,12 @@
  79.  ï»¿ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  80.         <PropertyGroup>
  81. -           <ProjectGuid>{27728e98-eb9f-4ab1-a6e0-6d175f6aef37}</ProjectGuid>
  82. +        <ProjectGuid>{F7C753ED-8705-41AC-8B59-B0C65EC8FC6B}</ProjectGuid>
  83.             <MainSource>DUnit2Console.dpr</MainSource>
  84.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  85.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  86.             <DCC_DependencyCheckOutputName>DUnit2Console.exe</DCC_DependencyCheckOutputName>
  87. -           <ProjectVersion>13.4</ProjectVersion>
  88. -           <Config Condition="'$(Config)'==''">Debug</Config>
  89. +        <ProjectVersion>15.3</ProjectVersion>
  90. +        <Config Condition="'$(Config)'==''">Release</Config>
  91.             <Base>True</Base>
  92.             <AppType>Console</AppType>
  93.             <FrameworkType>None</FrameworkType>
  94. @@ -40,7 +40,7 @@
  95.         <PropertyGroup Condition="'$(Base)'!=''">
  96.             <Manifest_File>None</Manifest_File>
  97.             <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
  98. -           <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;Vcl;$(DCC_Namespace)</DCC_Namespace>
  99. +        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;Vcl;Vcl.Imaging;$(DCC_Namespace)</DCC_Namespace>
  100.             <VerInfo_Locale>1033</VerInfo_Locale>
  101.             <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  102.             <DCC_Define>CONSOLE_TESTRUNNER;$(DCC_Define)</DCC_Define>
  103. @@ -57,7 +57,7 @@
  104.         </PropertyGroup>
  105.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  106.             <Version>7.0</Version>
  107. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  108. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  109.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  110.             <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
  111.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  112. @@ -159,22 +159,15 @@
  113.                         <Source Name="MainSource">DUnit2Console.dpr</Source>
  114.                     </Source>
  115.                     <Excluded_Packages>
  116. -                       <Excluded_Packages Name="$(BDSBIN)\fmidesigner160.bpl">FMI Form designer and property and component editors</Excluded_Packages>
  117. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl not found</Excluded_Packages>
  118. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl not found</Excluded_Packages>
  119. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl not found</Excluded_Packages>
  120. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl not found</Excluded_Packages>
  121. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl not found</Excluded_Packages>
  122. -                       <Excluded_Packages Name="$(BDSBIN)\bcboffice2k160.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  123. -                       <Excluded_Packages Name="$(BDSBIN)\bcbofficexp160.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  124. -                       <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  125. -                       <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
  126. +                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k190.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  127. +                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp190.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  128. +                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  129.                     </Excluded_Packages>
  130.                 </Delphi.Personality>
  131.                 <Platforms>
  132. -                   <Platform value="Win64">False</Platform>
  133.                     <Platform value="OSX32">False</Platform>
  134.                     <Platform value="Win32">True</Platform>
  135. +                <Platform value="Win64">False</Platform>
  136.                 </Platforms>
  137.             </BorlandProject>
  138.             <ProjectFileVersion>12</ProjectFileVersion>
  139. Index: projects/DXE5/DUnit2ConsoleTest.dproj
  140. ===================================================================
  141. --- projects/DXE5/DUnit2ConsoleTest.dproj   (revision 101)
  142. +++ projects/DXE5/DUnit2ConsoleTest.dproj   (working copy)
  143. @@ -5,8 +5,8 @@
  144.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  145.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  146.             <DCC_DependencyCheckOutputName>DUnit2ConsoleTest.exe</DCC_DependencyCheckOutputName>
  147. -           <ProjectVersion>13.4</ProjectVersion>
  148. -           <Config Condition="'$(Config)'==''">Debug</Config>
  149. +        <ProjectVersion>15.3</ProjectVersion>
  150. +        <Config Condition="'$(Config)'==''">Release</Config>
  151.             <Base>True</Base>
  152.             <AppType>Console</AppType>
  153.             <FrameworkType>None</FrameworkType>
  154. @@ -39,7 +39,7 @@
  155.         </PropertyGroup>
  156.         <PropertyGroup Condition="'$(Base)'!=''">
  157.             <Manifest_File>None</Manifest_File>
  158. -           <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;Vcl;$(DCC_Namespace)</DCC_Namespace>
  159. +        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;Vcl;Vcl.Imaging;$(DCC_Namespace)</DCC_Namespace>
  160.             <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  161.             <VerInfo_Locale>3081</VerInfo_Locale>
  162.             <DCC_Define>CONSOLE_TESTRUNNER;SELFTEST;$(DCC_Define)</DCC_Define>
  163. @@ -51,12 +51,11 @@
  164.         <PropertyGroup Condition="'$(Base_Win32)'!=''">
  165.             <VerInfo_Locale>1033</VerInfo_Locale>
  166.             <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
  167. -           <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  168.         </PropertyGroup>
  169.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  170.             <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
  171.             <Version>7.0</Version>
  172. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  173. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  174.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  175.             <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
  176.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  177. @@ -159,22 +158,15 @@
  178.                         <Source Name="MainSource">DUnit2ConsoleTest.dpr</Source>
  179.                     </Source>
  180.                     <Excluded_Packages>
  181. -                       <Excluded_Packages Name="$(BDSBIN)\fmidesigner160.bpl">FMI Form designer and property and component editors</Excluded_Packages>
  182. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl not found</Excluded_Packages>
  183. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl not found</Excluded_Packages>
  184. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl not found</Excluded_Packages>
  185. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl not found</Excluded_Packages>
  186. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl not found</Excluded_Packages>
  187. -                       <Excluded_Packages Name="$(BDSBIN)\bcboffice2k160.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  188. -                       <Excluded_Packages Name="$(BDSBIN)\bcbofficexp160.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  189. -                       <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  190. -                       <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
  191. +                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k190.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  192. +                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp190.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  193. +                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  194.                     </Excluded_Packages>
  195.                 </Delphi.Personality>
  196.                 <Platforms>
  197. -                   <Platform value="Win64">False</Platform>
  198.                     <Platform value="OSX32">False</Platform>
  199.                     <Platform value="Win32">True</Platform>
  200. +                <Platform value="Win64">False</Platform>
  201.                 </Platforms>
  202.             </BorlandProject>
  203.             <ProjectFileVersion>12</ProjectFileVersion>
  204. Index: projects/DXE5/DUnit2Test.dproj
  205. ===================================================================
  206. --- projects/DXE5/DUnit2Test.dproj  (revision 101)
  207. +++ projects/DXE5/DUnit2Test.dproj  (working copy)
  208. @@ -1,12 +1,12 @@
  209.  ï»¿ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  210.         <PropertyGroup>
  211. -           <ProjectGuid>{27728e98-eb9f-4ab1-a6e0-6d175f6aef37}</ProjectGuid>
  212. +        <ProjectGuid>{17820BD4-F4FE-455B-A0FD-86615BA549BB}</ProjectGuid>
  213.             <MainSource>DUnit2Test.dpr</MainSource>
  214.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  215.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  216.             <DCC_DependencyCheckOutputName>DUnit2Test.exe</DCC_DependencyCheckOutputName>
  217. -           <ProjectVersion>13.4</ProjectVersion>
  218. -           <Config Condition="'$(Config)'==''">Debug</Config>
  219. +        <ProjectVersion>15.3</ProjectVersion>
  220. +        <Config Condition="'$(Config)'==''">Release</Config>
  221.             <Base>True</Base>
  222.             <AppType>Console</AppType>
  223.             <FrameworkType>VCL</FrameworkType>
  224. @@ -63,7 +63,7 @@
  225.         </PropertyGroup>
  226.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  227.             <Version>7.0</Version>
  228. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  229. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  230.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  231.             <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
  232.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  233. @@ -196,9 +196,9 @@
  234.                 </Delphi.Personality>
  235.                 <ModelSupport>False</ModelSupport>
  236.                 <Platforms>
  237. -                   <Platform value="Win64">False</Platform>
  238.                     <Platform value="OSX32">False</Platform>
  239.                     <Platform value="Win32">True</Platform>
  240. +                <Platform value="Win64">False</Platform>
  241.                 </Platforms>
  242.             </BorlandProject>
  243.             <ProjectFileVersion>12</ProjectFileVersion>
  244. Index: projects/DXE5/DUnitTestInspector.dproj
  245. ===================================================================
  246. --- projects/DXE5/DUnitTestInspector.dproj  (revision 101)
  247. +++ projects/DXE5/DUnitTestInspector.dproj  (working copy)
  248. @@ -5,8 +5,8 @@
  249.             <Configuration Condition=" '$(Configuration)' == ''">Debug</Configuration>
  250.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  251.             <DCC_DependencyCheckOutputName>_bin\DUnitTestInspector.bpl</DCC_DependencyCheckOutputName>
  252. -           <ProjectVersion>13.4</ProjectVersion>
  253. -           <Config Condition="'$(Config)'==''">Debug</Config>
  254. +        <ProjectVersion>15.3</ProjectVersion>
  255. +        <Config Condition="'$(Config)'==''">Release</Config>
  256.             <Base>True</Base>
  257.             <AppType>Package</AppType>
  258.             <FrameworkType>None</FrameworkType>
  259. @@ -16,6 +16,11 @@
  260.         <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
  261.             <Base>true</Base>
  262.         </PropertyGroup>
  263. +    <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
  264. +        <Base_Android>true</Base_Android>
  265. +        <CfgParent>Base</CfgParent>
  266. +        <Base>true</Base>
  267. +    </PropertyGroup>
  268.         <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
  269.             <Base_Win32>true</Base_Win32>
  270.             <CfgParent>Base</CfgParent>
  271. @@ -60,6 +65,11 @@
  272.             <GenDll>true</GenDll>
  273.             <DesignOnlyPackage>true</DesignOnlyPackage>
  274.         </PropertyGroup>
  275. +    <PropertyGroup Condition="'$(Base_Android)'!=''">
  276. +        <VerInfo_IncludeVerInfo>false</VerInfo_IncludeVerInfo>
  277. +        <BT_BuildType>Debug</BT_BuildType>
  278. +        <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>
  279. +    </PropertyGroup>
  280.         <PropertyGroup Condition="'$(Base_Win32)'!=''">
  281.             <DCC_UsePackage>OTAUtils;$(DCC_UsePackage)</DCC_UsePackage>
  282.             <VerInfo_Locale>1033</VerInfo_Locale>
  283. @@ -67,7 +77,7 @@
  284.         </PropertyGroup>
  285.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  286.             <Version>7.0</Version>
  287. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  288. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  289.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  290.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  291.             <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
  292. @@ -137,9 +147,12 @@
  293.                     </Excluded_Packages>
  294.                 </Delphi.Personality>
  295.                 <Platforms>
  296. -                   <Platform value="Win64">False</Platform>
  297. +                <Platform value="Android">False</Platform>
  298. +                <Platform value="iOSDevice">False</Platform>
  299. +                <Platform value="iOSSimulator">False</Platform>
  300.                     <Platform value="OSX32">False</Platform>
  301.                     <Platform value="Win32">True</Platform>
  302. +                <Platform value="Win64">False</Platform>
  303.                 </Platforms>
  304.             </BorlandProject>
  305.             <ProjectFileVersion>12</ProjectFileVersion>
  306. Index: projects/DXE5/MiniTestLibW32A.dproj
  307. ===================================================================
  308. --- projects/DXE5/MiniTestLibW32A.dproj (revision 101)
  309. +++ projects/DXE5/MiniTestLibW32A.dproj (working copy)
  310. @@ -1,12 +1,12 @@
  311.  ï»¿ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  312.         <PropertyGroup>
  313. -           <ProjectGuid>{f21abaa5-2197-4703-b7b1-4a8d28eba776}</ProjectGuid>
  314. +        <ProjectGuid>{1D868D85-FE30-40C9-91F0-A1F9612BCE17}</ProjectGuid>
  315.             <MainSource>MiniTestLibW32A.dpr</MainSource>
  316.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  317.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  318.             <DCC_DependencyCheckOutputName>MiniTestLibW32A.dtl</DCC_DependencyCheckOutputName>
  319. -           <ProjectVersion>13.4</ProjectVersion>
  320. -           <Config Condition="'$(Config)'==''">Debug</Config>
  321. +        <ProjectVersion>15.3</ProjectVersion>
  322. +        <Config Condition="'$(Config)'==''">Release</Config>
  323.             <Base>True</Base>
  324.             <AppType>Library</AppType>
  325.             <FrameworkType>None</FrameworkType>
  326. @@ -46,7 +46,7 @@
  327.         <PropertyGroup Condition="'$(Base)'!=''">
  328.             <DCC_UnitSearchPath>..\..\tests;..\..\src;..\..\externals\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  329.             <Manifest_File>None</Manifest_File>
  330. -           <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
  331. +        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;VCL;$(DCC_Namespace)</DCC_Namespace>
  332.             <OutputExt>.dtl</OutputExt>
  333.             <VerInfo_Locale>1033</VerInfo_Locale>
  334.             <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  335. @@ -61,7 +61,7 @@
  336.         </PropertyGroup>
  337.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  338.             <Version>7.0</Version>
  339. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  340. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  341.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  342.             <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
  343.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  344. @@ -154,22 +154,15 @@
  345.                         <Source Name="MainSource">MiniTestLibW32A.dpr</Source>
  346.                     </Source>
  347.                     <Excluded_Packages>
  348. -                       <Excluded_Packages Name="$(BDSBIN)\fmidesigner160.bpl">FMI Form designer and property and component editors</Excluded_Packages>
  349. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl not found</Excluded_Packages>
  350. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl not found</Excluded_Packages>
  351. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl not found</Excluded_Packages>
  352. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl not found</Excluded_Packages>
  353. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl not found</Excluded_Packages>
  354. -                       <Excluded_Packages Name="$(BDSBIN)\bcboffice2k160.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  355. -                       <Excluded_Packages Name="$(BDSBIN)\bcbofficexp160.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  356. -                       <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  357. -                       <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
  358. +                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k190.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  359. +                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp190.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  360. +                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  361.                     </Excluded_Packages>
  362.                 </Delphi.Personality>
  363.                 <Platforms>
  364. -                   <Platform value="Win64">False</Platform>
  365.                     <Platform value="OSX32">False</Platform>
  366.                     <Platform value="Win32">True</Platform>
  367. +                <Platform value="Win64">False</Platform>
  368.                 </Platforms>
  369.             </BorlandProject>
  370.             <ProjectFileVersion>12</ProjectFileVersion>
  371. Index: projects/DXE5/MiniTestLibW32B.dproj
  372. ===================================================================
  373. --- projects/DXE5/MiniTestLibW32B.dproj (revision 101)
  374. +++ projects/DXE5/MiniTestLibW32B.dproj (working copy)
  375. @@ -1,12 +1,12 @@
  376.  ï»¿ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  377.         <PropertyGroup>
  378. -           <ProjectGuid>{f21abaa5-2197-4703-b7b1-4a8d28eba776}</ProjectGuid>
  379. +        <ProjectGuid>{1E925977-0FB8-450A-86D1-39DB7F08AB31}</ProjectGuid>
  380.             <MainSource>MiniTestLibW32B.dpr</MainSource>
  381.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  382.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  383.             <DCC_DependencyCheckOutputName>MiniTestLibW32B.dtl</DCC_DependencyCheckOutputName>
  384. -           <ProjectVersion>13.4</ProjectVersion>
  385. -           <Config Condition="'$(Config)'==''">Debug</Config>
  386. +        <ProjectVersion>15.3</ProjectVersion>
  387. +        <Config Condition="'$(Config)'==''">Release</Config>
  388.             <Base>True</Base>
  389.             <AppType>Library</AppType>
  390.             <FrameworkType>None</FrameworkType>
  391. @@ -38,7 +38,7 @@
  392.             <Base>true</Base>
  393.         </PropertyGroup>
  394.         <PropertyGroup Condition="'$(Base)'!=''">
  395. -           <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
  396. +        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;VCL;$(DCC_Namespace)</DCC_Namespace>
  397.             <Manifest_File>None</Manifest_File>
  398.             <VerInfo_Locale>1033</VerInfo_Locale>
  399.             <OutputExt>.dtl</OutputExt>
  400. @@ -52,12 +52,11 @@
  401.         <PropertyGroup Condition="'$(Base_Win32)'!=''">
  402.             <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
  403.             <VerInfo_Locale>1033</VerInfo_Locale>
  404. -           <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  405.             <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
  406.         </PropertyGroup>
  407.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  408.             <Version>7.0</Version>
  409. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  410. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  411.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  412.             <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
  413.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  414. @@ -147,22 +146,15 @@
  415.                         <Source Name="MainSource">MiniTestLibW32B.dpr</Source>
  416.                     </Source>
  417.                     <Excluded_Packages>
  418. -                       <Excluded_Packages Name="$(BDSBIN)\fmidesigner160.bpl">FMI Form designer and property and component editors</Excluded_Packages>
  419. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl not found</Excluded_Packages>
  420. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl not found</Excluded_Packages>
  421. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl not found</Excluded_Packages>
  422. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl not found</Excluded_Packages>
  423. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl not found</Excluded_Packages>
  424. -                       <Excluded_Packages Name="$(BDSBIN)\bcboffice2k160.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  425. -                       <Excluded_Packages Name="$(BDSBIN)\bcbofficexp160.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  426. -                       <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  427. -                       <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
  428. +                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k190.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  429. +                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp190.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  430. +                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  431.                     </Excluded_Packages>
  432.                 </Delphi.Personality>
  433.                 <Platforms>
  434. -                   <Platform value="Win64">False</Platform>
  435.                     <Platform value="OSX32">False</Platform>
  436.                     <Platform value="Win32">True</Platform>
  437. +                <Platform value="Win64">False</Platform>
  438.                 </Platforms>
  439.             </BorlandProject>
  440.             <ProjectFileVersion>12</ProjectFileVersion>
  441. Index: projects/DXE5/MiniTestLibW32C.dproj
  442. ===================================================================
  443. --- projects/DXE5/MiniTestLibW32C.dproj (revision 101)
  444. +++ projects/DXE5/MiniTestLibW32C.dproj (working copy)
  445. @@ -1,12 +1,12 @@
  446.  ï»¿ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  447.         <PropertyGroup>
  448. -           <ProjectGuid>{f21abaa5-2197-4703-b7b1-4a8d28eba776}</ProjectGuid>
  449. +        <ProjectGuid>{29997A5C-5E77-4B9F-BFA5-4DB0C0D66DDC}</ProjectGuid>
  450.             <MainSource>MiniTestLibW32C.dpr</MainSource>
  451.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  452.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  453.             <DCC_DependencyCheckOutputName>MiniTestLibW32C.dtl</DCC_DependencyCheckOutputName>
  454. -           <ProjectVersion>13.4</ProjectVersion>
  455. -           <Config Condition="'$(Config)'==''">Debug</Config>
  456. +        <ProjectVersion>15.3</ProjectVersion>
  457. +        <Config Condition="'$(Config)'==''">Release</Config>
  458.             <Base>True</Base>
  459.             <AppType>Library</AppType>
  460.             <FrameworkType>None</FrameworkType>
  461. @@ -38,7 +38,7 @@
  462.             <Base>true</Base>
  463.         </PropertyGroup>
  464.         <PropertyGroup Condition="'$(Base)'!=''">
  465. -           <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
  466. +        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;VCL;$(DCC_Namespace)</DCC_Namespace>
  467.             <Manifest_File>None</Manifest_File>
  468.             <VerInfo_Locale>1033</VerInfo_Locale>
  469.             <OutputExt>.dtl</OutputExt>
  470. @@ -52,12 +52,11 @@
  471.         <PropertyGroup Condition="'$(Base_Win32)'!=''">
  472.             <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
  473.             <VerInfo_Locale>1033</VerInfo_Locale>
  474. -           <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  475.             <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
  476.         </PropertyGroup>
  477.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  478.             <Version>7.0</Version>
  479. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  480. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  481.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  482.             <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
  483.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  484. @@ -147,22 +146,15 @@
  485.                         <Source Name="MainSource">MiniTestLibW32C.dpr</Source>
  486.                     </Source>
  487.                     <Excluded_Packages>
  488. -                       <Excluded_Packages Name="$(BDSBIN)\fmidesigner160.bpl">FMI Form designer and property and component editors</Excluded_Packages>
  489. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl not found</Excluded_Packages>
  490. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl not found</Excluded_Packages>
  491. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl not found</Excluded_Packages>
  492. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl not found</Excluded_Packages>
  493. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl not found</Excluded_Packages>
  494. -                       <Excluded_Packages Name="$(BDSBIN)\bcboffice2k160.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  495. -                       <Excluded_Packages Name="$(BDSBIN)\bcbofficexp160.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  496. -                       <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  497. -                       <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
  498. +                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k190.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  499. +                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp190.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  500. +                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  501.                     </Excluded_Packages>
  502.                 </Delphi.Personality>
  503.                 <Platforms>
  504. -                   <Platform value="Win64">False</Platform>
  505.                     <Platform value="OSX32">False</Platform>
  506.                     <Platform value="Win32">True</Platform>
  507. +                <Platform value="Win64">False</Platform>
  508.                 </Platforms>
  509.             </BorlandProject>
  510.             <ProjectFileVersion>12</ProjectFileVersion>
  511. Index: projects/DXE5/MiniTestLibW32D.dproj
  512. ===================================================================
  513. --- projects/DXE5/MiniTestLibW32D.dproj (revision 101)
  514. +++ projects/DXE5/MiniTestLibW32D.dproj (working copy)
  515. @@ -1,12 +1,12 @@
  516.  ï»¿ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  517.         <PropertyGroup>
  518. -           <ProjectGuid>{f21abaa5-2197-4703-b7b1-4a8d28eba776}</ProjectGuid>
  519. +        <ProjectGuid>{00FFAA61-376A-46BF-8FA1-7219E5A765B0}</ProjectGuid>
  520.             <MainSource>MiniTestLibW32D.dpr</MainSource>
  521.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  522.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  523.             <DCC_DependencyCheckOutputName>MiniTestLibW32D.dtl</DCC_DependencyCheckOutputName>
  524. -           <ProjectVersion>13.4</ProjectVersion>
  525. -           <Config Condition="'$(Config)'==''">Debug</Config>
  526. +        <ProjectVersion>15.3</ProjectVersion>
  527. +        <Config Condition="'$(Config)'==''">Release</Config>
  528.             <Base>True</Base>
  529.             <AppType>Library</AppType>
  530.             <FrameworkType>None</FrameworkType>
  531. @@ -38,7 +38,7 @@
  532.             <Base>true</Base>
  533.         </PropertyGroup>
  534.         <PropertyGroup Condition="'$(Base)'!=''">
  535. -           <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
  536. +        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;VCL;$(DCC_Namespace)</DCC_Namespace>
  537.             <Manifest_File>None</Manifest_File>
  538.             <VerInfo_Locale>1033</VerInfo_Locale>
  539.             <OutputExt>.dtl</OutputExt>
  540. @@ -52,12 +52,11 @@
  541.         <PropertyGroup Condition="'$(Base_Win32)'!=''">
  542.             <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
  543.             <VerInfo_Locale>1033</VerInfo_Locale>
  544. -           <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  545.             <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
  546.         </PropertyGroup>
  547.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  548.             <Version>7.0</Version>
  549. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  550. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  551.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  552.             <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
  553.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  554. @@ -147,22 +146,15 @@
  555.                         <Source Name="MainSource">MiniTestLibW32D.dpr</Source>
  556.                     </Source>
  557.                     <Excluded_Packages>
  558. -                       <Excluded_Packages Name="$(BDSBIN)\fmidesigner160.bpl">FMI Form designer and property and component editors</Excluded_Packages>
  559. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl not found</Excluded_Packages>
  560. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl not found</Excluded_Packages>
  561. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl not found</Excluded_Packages>
  562. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl not found</Excluded_Packages>
  563. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl not found</Excluded_Packages>
  564. -                       <Excluded_Packages Name="$(BDSBIN)\bcboffice2k160.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  565. -                       <Excluded_Packages Name="$(BDSBIN)\bcbofficexp160.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  566. -                       <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  567. -                       <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
  568. +                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k190.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  569. +                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp190.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  570. +                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  571.                     </Excluded_Packages>
  572.                 </Delphi.Personality>
  573.                 <Platforms>
  574. -                   <Platform value="Win64">False</Platform>
  575.                     <Platform value="OSX32">False</Platform>
  576.                     <Platform value="Win32">True</Platform>
  577. +                <Platform value="Win64">False</Platform>
  578.                 </Platforms>
  579.             </BorlandProject>
  580.             <ProjectFileVersion>12</ProjectFileVersion>
  581. Index: projects/DXE5/OTAUtils.dproj
  582. ===================================================================
  583. --- projects/DXE5/OTAUtils.dproj    (revision 101)
  584. +++ projects/DXE5/OTAUtils.dproj    (working copy)
  585. @@ -5,8 +5,8 @@
  586.             <Configuration Condition=" '$(Configuration)' == ''">Debug</Configuration>
  587.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  588.             <DCC_DependencyCheckOutputName>_bin\OTAUtils.bpl</DCC_DependencyCheckOutputName>
  589. -           <ProjectVersion>13.4</ProjectVersion>
  590. -           <Config Condition="'$(Config)'==''">Debug</Config>
  591. +        <ProjectVersion>15.3</ProjectVersion>
  592. +        <Config Condition="'$(Config)'==''">Release</Config>
  593.             <Base>True</Base>
  594.             <AppType>Package</AppType>
  595.             <FrameworkType>None</FrameworkType>
  596. @@ -16,6 +16,11 @@
  597.         <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
  598.             <Base>true</Base>
  599.         </PropertyGroup>
  600. +    <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
  601. +        <Base_Android>true</Base_Android>
  602. +        <CfgParent>Base</CfgParent>
  603. +        <Base>true</Base>
  604. +    </PropertyGroup>
  605.         <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
  606.             <Base_Win32>true</Base_Win32>
  607.             <CfgParent>Base</CfgParent>
  608. @@ -62,9 +67,14 @@
  609.             <DCC_DcpOutput>.\_bin</DCC_DcpOutput>
  610.             <GenDll>true</GenDll>
  611.             <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
  612. -           <DCC_DebugInformation>false</DCC_DebugInformation>
  613. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  614.             <GenPackage>true</GenPackage>
  615.         </PropertyGroup>
  616. +    <PropertyGroup Condition="'$(Base_Android)'!=''">
  617. +        <VerInfo_IncludeVerInfo>false</VerInfo_IncludeVerInfo>
  618. +        <BT_BuildType>Debug</BT_BuildType>
  619. +        <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>
  620. +    </PropertyGroup>
  621.         <PropertyGroup Condition="'$(Base_Win32)'!=''">
  622.             <VerInfo_Locale>1033</VerInfo_Locale>
  623.             <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
  624. @@ -71,7 +81,6 @@
  625.         </PropertyGroup>
  626.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  627.             <Version>7.0</Version>
  628. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  629.             <DCC_WriteableConstants>True</DCC_WriteableConstants>
  630.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  631.             <DCC_IntegerOverflowCheck>True</DCC_IntegerOverflowCheck>
  632. @@ -84,7 +93,7 @@
  633.         </PropertyGroup>
  634.         <PropertyGroup Condition="'$(Cfg_2)'!=''">
  635.             <Version>7.0</Version>
  636. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  637. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  638.             <DCC_WriteableConstants>True</DCC_WriteableConstants>
  639.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  640.             <DCC_IntegerOverflowCheck>True</DCC_IntegerOverflowCheck>
  641. @@ -145,9 +154,12 @@
  642.                     </Excluded_Packages>
  643.                 </Delphi.Personality>
  644.                 <Platforms>
  645. -                   <Platform value="Win64">False</Platform>
  646. +                <Platform value="Android">False</Platform>
  647. +                <Platform value="iOSDevice">False</Platform>
  648. +                <Platform value="iOSSimulator">False</Platform>
  649.                     <Platform value="OSX32">False</Platform>
  650.                     <Platform value="Win32">True</Platform>
  651. +                <Platform value="Win64">False</Platform>
  652.                 </Platforms>
  653.             </BorlandProject>
  654.             <ProjectFileVersion>12</ProjectFileVersion>
  655. Index: projects/DXE5/SingleTestLibW32.dproj
  656. ===================================================================
  657. --- projects/DXE5/SingleTestLibW32.dproj    (revision 101)
  658. +++ projects/DXE5/SingleTestLibW32.dproj    (working copy)
  659. @@ -5,8 +5,8 @@
  660.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  661.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  662.             <DCC_DependencyCheckOutputName>SingleTestLibW32.dtl</DCC_DependencyCheckOutputName>
  663. -           <ProjectVersion>13.4</ProjectVersion>
  664. -           <Config Condition="'$(Config)'==''">Debug</Config>
  665. +        <ProjectVersion>15.3</ProjectVersion>
  666. +        <Config Condition="'$(Config)'==''">Release</Config>
  667.             <Base>True</Base>
  668.             <AppType>Library</AppType>
  669.             <FrameworkType>None</FrameworkType>
  670. @@ -44,7 +44,7 @@
  671.             <Base>true</Base>
  672.         </PropertyGroup>
  673.         <PropertyGroup Condition="'$(Base)'!=''">
  674. -           <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
  675. +        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;VCL;$(DCC_Namespace)</DCC_Namespace>
  676.             <Manifest_File>None</Manifest_File>
  677.             <VerInfo_Locale>1033</VerInfo_Locale>
  678.             <OutputExt>.dtl</OutputExt>
  679. @@ -61,7 +61,7 @@
  680.         </PropertyGroup>
  681.         <PropertyGroup Condition="'$(Cfg_1)'!=''">
  682.             <Version>7.0</Version>
  683. -           <DCC_DebugInformation>False</DCC_DebugInformation>
  684. +        <DCC_DebugInformation>0</DCC_DebugInformation>
  685.             <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
  686.             <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
  687.             <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
  688. @@ -154,22 +154,15 @@
  689.                         <Source Name="MainSource">SingleTestLibW32.dpr</Source>
  690.                     </Source>
  691.                     <Excluded_Packages>
  692. -                       <Excluded_Packages Name="$(BDSBIN)\fmidesigner160.bpl">FMI Form designer and property and component editors</Excluded_Packages>
  693. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfs16.bpl not found</Excluded_Packages>
  694. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrx16.bpl not found</Excluded_Packages>
  695. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfsDB16.bpl not found</Excluded_Packages>
  696. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxDB16.bpl not found</Excluded_Packages>
  697. -                       <Excluded_Packages Name="C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl">File C:\Program Files (x86)\FastReports\LibD16\dclfrxe16.bpl not found</Excluded_Packages>
  698. -                       <Excluded_Packages Name="$(BDSBIN)\bcboffice2k160.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  699. -                       <Excluded_Packages Name="$(BDSBIN)\bcbofficexp160.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  700. -                       <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  701. -                       <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
  702. +                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k190.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
  703. +                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp190.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
  704. +                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
  705.                     </Excluded_Packages>
  706.                 </Delphi.Personality>
  707.                 <Platforms>
  708. -                   <Platform value="Win64">False</Platform>
  709.                     <Platform value="OSX32">False</Platform>
  710.                     <Platform value="Win32">True</Platform>
  711. +                <Platform value="Win64">False</Platform>
  712.                 </Platforms>
  713.             </BorlandProject>
  714.             <ProjectFileVersion>12</ProjectFileVersion>
  715. Index: projects/DXE/DUnit2.dproj
  716. ===================================================================
  717. --- projects/DXE/DUnit2.dproj   (revision 101)
  718. +++ projects/DXE/DUnit2.dproj   (working copy)
  719. @@ -5,7 +5,7 @@
  720.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  721.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  722.             <DCC_DependencyCheckOutputName>DUnit2.exe</DCC_DependencyCheckOutputName>
  723. -           <ProjectVersion>12.2</ProjectVersion>
  724. +           <ProjectVersion>12.3</ProjectVersion>
  725.             <Config Condition="'$(Config)'==''">Release</Config>
  726.             <Base>True</Base>
  727.             <Platform>Win32</Platform>
  728. @@ -27,7 +27,7 @@
  729.         </PropertyGroup>
  730.         <PropertyGroup Condition="'$(Base)'!=''">
  731.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  732. -           <DCC_UnitSearchPath>$(BDS)\Source\Win32\xml;..\..\src;..\..\externals\fastmm;..\..\externals\jcl\source\include;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  733. +           <DCC_UnitSearchPath>$(BDS)\Source\Win32\xml;..\..\src;..\..\externals\fastmm;..\..\externals\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  734.             <DCC_ExeOutput>_bin</DCC_ExeOutput>
  735.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  736.             <DCC_DependencyCheckOutputName>_bin\DUnit2.exe</DCC_DependencyCheckOutputName>
  737. @@ -93,7 +93,7 @@
  738.             </BuildConfiguration>
  739.         </ItemGroup>
  740.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  741. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  742. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  743.         <ProjectExtensions>
  744.             <Borland.Personality>Delphi.Personality.12</Borland.Personality>
  745.             <Borland.ProjectType/>
  746. Index: projects/DXE/DUnit2Console.dproj
  747. ===================================================================
  748. --- projects/DXE/DUnit2Console.dproj    (revision 101)
  749. +++ projects/DXE/DUnit2Console.dproj    (working copy)
  750. @@ -5,8 +5,8 @@
  751.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  752.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  753.             <DCC_DependencyCheckOutputName>DUnit2Console.exe</DCC_DependencyCheckOutputName>
  754. -           <ProjectVersion>12.2</ProjectVersion>
  755. -           <Config Condition="'$(Config)'==''">Debug</Config>
  756. +           <ProjectVersion>12.3</ProjectVersion>
  757. +           <Config Condition="'$(Config)'==''">Release</Config>
  758.             <Base>True</Base>
  759.             <Platform>Win32</Platform>
  760.             <AppType>Console</AppType>
  761. @@ -28,7 +28,7 @@
  762.         <PropertyGroup Condition="'$(Base)'!=''">
  763.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  764.             <DCC_Define>CONSOLE_TESTRUNNER;$(DCC_Define)</DCC_Define>
  765. -           <DCC_UnitSearchPath>$(BDS)\Source\Win32\xml;..\..\externals\jcl\source\include;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\common;..\..\externals\fastmm;..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  766. +           <DCC_UnitSearchPath>$(BDS)\Source\Win32\xml;..\..\externals\jedi;..\..\externals\fastmm;..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  767.             <DCC_ExeOutput>_bin</DCC_ExeOutput>
  768.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  769.             <DCC_DependencyCheckOutputName>_bin\DUnit2Console.exe</DCC_DependencyCheckOutputName>
  770. @@ -93,7 +93,7 @@
  771.             </BuildConfiguration>
  772.         </ItemGroup>
  773.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  774. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  775. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  776.         <ProjectExtensions>
  777.             <Borland.Personality>Delphi.Personality.12</Borland.Personality>
  778.             <Borland.ProjectType/>
  779. Index: projects/DXE/DUnit2ConsoleTest.dproj
  780. ===================================================================
  781. --- projects/DXE/DUnit2ConsoleTest.dproj    (revision 101)
  782. +++ projects/DXE/DUnit2ConsoleTest.dproj    (working copy)
  783. @@ -5,8 +5,8 @@
  784.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  785.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  786.             <DCC_DependencyCheckOutputName>DUnit2ConsoleTest.exe</DCC_DependencyCheckOutputName>
  787. -           <ProjectVersion>12.2</ProjectVersion>
  788. -           <Config Condition="'$(Config)'==''">Debug</Config>
  789. +           <ProjectVersion>12.3</ProjectVersion>
  790. +           <Config Condition="'$(Config)'==''">Release</Config>
  791.             <Base>True</Base>
  792.             <Platform>Win32</Platform>
  793.             <AppType>Console</AppType>
  794. @@ -28,7 +28,7 @@
  795.         <PropertyGroup Condition="'$(Base)'!=''">
  796.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  797.             <DCC_Define>CONSOLE_TESTRUNNER;SELFTEST;$(DCC_Define)</DCC_Define>
  798. -           <DCC_UnitSearchPath>$(BDS)\Source\Win32\xml;..\..\externals\jcl\source\include;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\fastmm;..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  799. +           <DCC_UnitSearchPath>$(BDS)\Source\Win32\xml;..\..\externals\jedi;..\..\externals\fastmm;..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  800.             <DCC_ExeOutput>_bin</DCC_ExeOutput>
  801.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  802.             <DCC_DependencyCheckOutputName>_bin\DUnit2ConsoleTest.exe</DCC_DependencyCheckOutputName>
  803. @@ -98,7 +98,7 @@
  804.             </BuildConfiguration>
  805.         </ItemGroup>
  806.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  807. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  808. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  809.         <ProjectExtensions>
  810.             <Borland.Personality>Delphi.Personality.12</Borland.Personality>
  811.             <Borland.ProjectType>VCLApplication</Borland.ProjectType>
  812. Index: projects/DXE/DUnit2Test.dproj
  813. ===================================================================
  814. --- projects/DXE/DUnit2Test.dproj   (revision 101)
  815. +++ projects/DXE/DUnit2Test.dproj   (working copy)
  816. @@ -5,7 +5,7 @@
  817.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  818.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  819.             <DCC_DependencyCheckOutputName>DUnit2Test.exe</DCC_DependencyCheckOutputName>
  820. -           <ProjectVersion>12.2</ProjectVersion>
  821. +           <ProjectVersion>12.3</ProjectVersion>
  822.             <Config Condition="'$(Config)'==''">Release</Config>
  823.             <Base>True</Base>
  824.             <Platform>Win32</Platform>
  825. @@ -28,7 +28,7 @@
  826.         <PropertyGroup Condition="'$(Base)'!=''">
  827.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  828.             <DCC_Define>SELFTEST;$(DCC_Define)</DCC_Define>
  829. -           <DCC_UnitSearchPath>$(BDS)\Source\Win32\xml;..\..\externals\jcl\source\include;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\common;..\..\externals\fastmm;..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  830. +           <DCC_UnitSearchPath>$(BDS)\Source\Win32\xml;..\..\externals\jedi;..\..\externals\fastmm;..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  831.             <DCC_ExeOutput>_bin</DCC_ExeOutput>
  832.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  833.             <DCC_DependencyCheckOutputName>_bin\DUnit2Test.exe</DCC_DependencyCheckOutputName>
  834. @@ -107,7 +107,7 @@
  835.             </BuildConfiguration>
  836.         </ItemGroup>
  837.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  838. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  839. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  840.         <ProjectExtensions>
  841.             <Borland.Personality>Delphi.Personality.12</Borland.Personality>
  842.             <Borland.ProjectType/>
  843. Index: projects/DXE/DUnitTestInspector.dproj
  844. ===================================================================
  845. --- projects/DXE/DUnitTestInspector.dproj   (revision 101)
  846. +++ projects/DXE/DUnitTestInspector.dproj   (working copy)
  847. @@ -5,8 +5,8 @@
  848.             <Configuration Condition=" '$(Configuration)' == ''">Debug</Configuration>
  849.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  850.             <DCC_DependencyCheckOutputName>_bin\DUnitTestInspector.bpl</DCC_DependencyCheckOutputName>
  851. -           <ProjectVersion>12.2</ProjectVersion>
  852. -           <Config Condition="'$(Config)'==''">Debug</Config>
  853. +           <ProjectVersion>12.3</ProjectVersion>
  854. +           <Config Condition="'$(Config)'==''">Release</Config>
  855.             <Base>True</Base>
  856.             <Platform>Win32</Platform>
  857.             <AppType>Package</AppType>
  858. @@ -33,7 +33,7 @@
  859.             <DCC_DependencyCheckOutputName>_bin\DUnitTestInspector.bpl</DCC_DependencyCheckOutputName>
  860.             <DCC_ImageBase>00400000</DCC_ImageBase>
  861.             <DCC_Description>DUnit Test Inspector</DCC_Description>
  862. -           <DCC_UnitSearchPath>.\_bin;..\..\externals\jcl\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  863. +           <DCC_UnitSearchPath>.\_bin;..\..\externals\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  864.             <GenPackage>true</GenPackage>
  865.             <GenDll>true</GenDll>
  866.             <DesignOnlyPackage>true</DesignOnlyPackage>
  867. @@ -122,5 +122,5 @@
  868.             </BuildConfiguration>
  869.         </ItemGroup>
  870.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  871. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  872. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  873.     </Project>
  874. Index: projects/DXE/MiniTestLibW32A.dproj
  875. ===================================================================
  876. --- projects/DXE/MiniTestLibW32A.dproj  (revision 101)
  877. +++ projects/DXE/MiniTestLibW32A.dproj  (working copy)
  878. @@ -5,8 +5,8 @@
  879.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  880.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  881.             <DCC_DependencyCheckOutputName>MiniTestLibW32A.dtl</DCC_DependencyCheckOutputName>
  882. -           <ProjectVersion>12.2</ProjectVersion>
  883. -           <Config Condition="'$(Config)'==''">Debug</Config>
  884. +           <ProjectVersion>12.3</ProjectVersion>
  885. +           <Config Condition="'$(Config)'==''">Release</Config>
  886.             <Base>True</Base>
  887.             <Platform>Win32</Platform>
  888.             <AppType>Library</AppType>
  889. @@ -26,6 +26,7 @@
  890.             <Base>true</Base>
  891.         </PropertyGroup>
  892.         <PropertyGroup Condition="'$(Base)'!=''">
  893. +           <DCC_UnitSearchPath>..\..\tests;..\..\src;..\..\externals\fastmm;..\..\externals\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  894.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  895.             <DCC_ExeOutput>_bin</DCC_ExeOutput>
  896.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  897. @@ -42,7 +43,6 @@
  898.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  899.             <DCC_ObjOutput>_dcu</DCC_ObjOutput>
  900.             <DCC_HppOutput>_dcu</DCC_HppOutput>
  901. -           <DCC_UnitSearchPath>..\..\tests;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;..\..\externals\fastmm;..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  902.             <DCC_ResourcePath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
  903.             <DCC_ObjPath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_ObjPath)</DCC_ObjPath>
  904.             <DCC_IncludePath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_IncludePath)</DCC_IncludePath>
  905. @@ -55,7 +55,6 @@
  906.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  907.             <DCC_ObjOutput>_dcu</DCC_ObjOutput>
  908.             <DCC_HppOutput>_dcu</DCC_HppOutput>
  909. -           <DCC_UnitSearchPath>..\..\tests;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;..\..\src;..\..\externals\fastmm;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  910.             <DCC_ResourcePath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
  911.             <DCC_ObjPath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_ObjPath)</DCC_ObjPath>
  912.             <DCC_IncludePath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_IncludePath)</DCC_IncludePath>
  913. @@ -85,7 +84,7 @@
  914.             </BuildConfiguration>
  915.         </ItemGroup>
  916.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  917. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  918. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  919.         <ProjectExtensions>
  920.             <Borland.Personality>Delphi.Personality.12</Borland.Personality>
  921.             <Borland.ProjectType/>
  922. Index: projects/DXE/MiniTestLibW32B.dproj
  923. ===================================================================
  924. --- projects/DXE/MiniTestLibW32B.dproj  (revision 101)
  925. +++ projects/DXE/MiniTestLibW32B.dproj  (working copy)
  926. @@ -5,8 +5,8 @@
  927.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  928.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  929.             <DCC_DependencyCheckOutputName>MiniTestLibW32B.dtl</DCC_DependencyCheckOutputName>
  930. -           <ProjectVersion>12.2</ProjectVersion>
  931. -           <Config Condition="'$(Config)'==''">Debug</Config>
  932. +           <ProjectVersion>12.3</ProjectVersion>
  933. +           <Config Condition="'$(Config)'==''">Release</Config>
  934.             <Base>True</Base>
  935.             <Platform>Win32</Platform>
  936.             <AppType>Library</AppType>
  937. @@ -27,7 +27,7 @@
  938.         </PropertyGroup>
  939.         <PropertyGroup Condition="'$(Base)'!=''">
  940.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  941. -           <DCC_UnitSearchPath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  942. +           <DCC_UnitSearchPath>..\..\tests;..\..\src;..\..\externals\fastmm;..\..\externals\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  943.             <DCC_ExeOutput>_bin</DCC_ExeOutput>
  944.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  945.             <DCC_DependencyCheckOutputName>_bin\MiniTestLibW32B.dtl</DCC_DependencyCheckOutputName>
  946. @@ -84,7 +84,7 @@
  947.             </BuildConfiguration>
  948.         </ItemGroup>
  949.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  950. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  951. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  952.         <ProjectExtensions>
  953.             <Borland.Personality>Delphi.Personality.12</Borland.Personality>
  954.             <Borland.ProjectType/>
  955. Index: projects/DXE/MiniTestLibW32C.dproj
  956. ===================================================================
  957. --- projects/DXE/MiniTestLibW32C.dproj  (revision 101)
  958. +++ projects/DXE/MiniTestLibW32C.dproj  (working copy)
  959. @@ -5,8 +5,8 @@
  960.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  961.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  962.             <DCC_DependencyCheckOutputName>MiniTestLibW32C.dtl</DCC_DependencyCheckOutputName>
  963. -           <ProjectVersion>12.2</ProjectVersion>
  964. -           <Config Condition="'$(Config)'==''">Debug</Config>
  965. +           <ProjectVersion>12.3</ProjectVersion>
  966. +           <Config Condition="'$(Config)'==''">Release</Config>
  967.             <Base>True</Base>
  968.             <Platform>Win32</Platform>
  969.             <AppType>Library</AppType>
  970. @@ -27,7 +27,7 @@
  971.         </PropertyGroup>
  972.         <PropertyGroup Condition="'$(Base)'!=''">
  973.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  974. -           <DCC_UnitSearchPath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  975. +           <DCC_UnitSearchPath>..\..\tests;..\..\src;..\..\externals\fastmm;..\..\externals\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  976.             <DCC_ExeOutput>_bin</DCC_ExeOutput>
  977.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  978.             <DCC_DependencyCheckOutputName>_bin\MiniTestLibW32C.dtl</DCC_DependencyCheckOutputName>
  979. @@ -84,7 +84,7 @@
  980.             </BuildConfiguration>
  981.         </ItemGroup>
  982.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  983. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  984. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  985.         <ProjectExtensions>
  986.             <Borland.Personality>Delphi.Personality.12</Borland.Personality>
  987.             <Borland.ProjectType/>
  988. Index: projects/DXE/MiniTestLibW32D.dproj
  989. ===================================================================
  990. --- projects/DXE/MiniTestLibW32D.dproj  (revision 101)
  991. +++ projects/DXE/MiniTestLibW32D.dproj  (working copy)
  992. @@ -5,8 +5,8 @@
  993.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  994.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  995.             <DCC_DependencyCheckOutputName>MiniTestLibW32D.dtl</DCC_DependencyCheckOutputName>
  996. -           <ProjectVersion>12.2</ProjectVersion>
  997. -           <Config Condition="'$(Config)'==''">Debug</Config>
  998. +           <ProjectVersion>12.3</ProjectVersion>
  999. +           <Config Condition="'$(Config)'==''">Release</Config>
  1000.             <Base>True</Base>
  1001.             <Platform>Win32</Platform>
  1002.             <AppType>Library</AppType>
  1003. @@ -27,7 +27,7 @@
  1004.         </PropertyGroup>
  1005.         <PropertyGroup Condition="'$(Base)'!=''">
  1006.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  1007. -           <DCC_UnitSearchPath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  1008. +           <DCC_UnitSearchPath>..\..\tests;..\..\src;..\..\externals\fastmm;..\..\externals\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  1009.             <DCC_ExeOutput>_bin</DCC_ExeOutput>
  1010.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  1011.             <DCC_DependencyCheckOutputName>_bin\MiniTestLibW32D.dtl</DCC_DependencyCheckOutputName>
  1012. @@ -84,7 +84,7 @@
  1013.             </BuildConfiguration>
  1014.         </ItemGroup>
  1015.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  1016. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  1017. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  1018.         <ProjectExtensions>
  1019.             <Borland.Personality>Delphi.Personality.12</Borland.Personality>
  1020.             <Borland.ProjectType/>
  1021. Index: projects/DXE/OTAUtils.dproj
  1022. ===================================================================
  1023. --- projects/DXE/OTAUtils.dproj (revision 101)
  1024. +++ projects/DXE/OTAUtils.dproj (working copy)
  1025. @@ -5,8 +5,8 @@
  1026.             <Configuration Condition=" '$(Configuration)' == ''">Debug</Configuration>
  1027.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  1028.             <DCC_DependencyCheckOutputName>_bin\OTAUtils.bpl</DCC_DependencyCheckOutputName>
  1029. -           <ProjectVersion>12.2</ProjectVersion>
  1030. -           <Config Condition="'$(Config)'==''">Debug</Config>
  1031. +           <ProjectVersion>12.3</ProjectVersion>
  1032. +           <Config Condition="'$(Config)'==''">Release</Config>
  1033.             <Base>True</Base>
  1034.             <Platform>Win32</Platform>
  1035.             <AppType>Package</AppType>
  1036. @@ -27,12 +27,11 @@
  1037.         </PropertyGroup>
  1038.         <PropertyGroup Condition="'$(Base)'!=''">
  1039.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  1040. -           <DCC_UnitSearchPath>..\..\externals\jcl\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  1041. +           <DCC_UnitSearchPath>..\..\tests;..\..\src;..\..\externals\fastmm;..\..\externals\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  1042.             <DCC_DcuOutput>.\_dcu</DCC_DcuOutput>
  1043.             <DCC_BplOutput>.\_bin</DCC_BplOutput>
  1044.             <DCC_DependencyCheckOutputName>_bin\OTAUtils.bpl</DCC_DependencyCheckOutputName>
  1045.             <DCC_ImageBase>00400000</DCC_ImageBase>
  1046. -           <DesignOnlyPackage>false</DesignOnlyPackage>
  1047.             <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
  1048.             <DCC_RangeChecking>true</DCC_RangeChecking>
  1049.             <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
  1050. @@ -133,5 +132,5 @@
  1051.             </BuildConfiguration>
  1052.         </ItemGroup>
  1053.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  1054. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  1055. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  1056.     </Project>
  1057. Index: projects/DXE/SingleTestLibW32.dproj
  1058. ===================================================================
  1059. --- projects/DXE/SingleTestLibW32.dproj (revision 101)
  1060. +++ projects/DXE/SingleTestLibW32.dproj (working copy)
  1061. @@ -5,8 +5,8 @@
  1062.             <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  1063.             <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
  1064.             <DCC_DependencyCheckOutputName>SingleTestLibW32.dtl</DCC_DependencyCheckOutputName>
  1065. -           <ProjectVersion>12.2</ProjectVersion>
  1066. -           <Config Condition="'$(Config)'==''">Debug</Config>
  1067. +           <ProjectVersion>12.3</ProjectVersion>
  1068. +           <Config Condition="'$(Config)'==''">Release</Config>
  1069.             <Base>True</Base>
  1070.             <Platform>Win32</Platform>
  1071.             <AppType>Library</AppType>
  1072. @@ -27,7 +27,7 @@
  1073.         </PropertyGroup>
  1074.         <PropertyGroup Condition="'$(Base)'!=''">
  1075.             <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
  1076. -           <DCC_UnitSearchPath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jcl\source\common;..\..\externals\jcl\source\windows;..\..\externals\jcl\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  1077. +           <DCC_UnitSearchPath>..\..\src;..\..\tests;..\..\externals\fastmm;..\..\externals\jedi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
  1078.             <DCC_ExeOutput>_bin</DCC_ExeOutput>
  1079.             <DCC_DcuOutput>_dcu</DCC_DcuOutput>
  1080.             <DCC_DependencyCheckOutputName>_bin\SingleTestLibW32.dtl</DCC_DependencyCheckOutputName>
  1081. @@ -84,7 +84,7 @@
  1082.             </BuildConfiguration>
  1083.         </ItemGroup>
  1084.         <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
  1085. -       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
  1086. +       <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
  1087.         <ProjectExtensions>
  1088.             <Borland.Personality>Delphi.Personality.12</Borland.Personality>
  1089.             <Borland.ProjectType/>
  1090. Index: ref/RefTestFramework.pas
  1091. ===================================================================
  1092. --- ref/RefTestFramework.pas    (revision 101)
  1093. +++ ref/RefTestFramework.pas    (working copy)
  1094. @@ -216,12 +216,12 @@
  1095.      function  UpdateOnFail(const ATest: ITest;
  1096.                             const NewStatus: TExecutionStatus;
  1097.                             const Excpt: Exception;
  1098. -                           const Addrs: IntPtr): TExecutionStatus;
  1099. +                           const Addrs: Pointer): TExecutionStatus;
  1100.      function  UpdateOnError(const ATest: ITest;
  1101.                              const NewStatus: TExecutionStatus;
  1102.                              const ExceptnMsg: string;
  1103.                              const Excpt: Exception;
  1104. -                            const Addrs: IntPtr): TExecutionStatus;
  1105. +                            const Addrs: Pointer): TExecutionStatus;
  1106.      function  GetStatus: string;
  1107.      procedure Status(const Value: string);
  1108.      function  get_Proxy: IInterface;
  1109. @@ -1215,7 +1215,7 @@
  1110.                                                    LMemErrorMessage);
  1111.            try
  1112.              LExcept := EPostTestFailure.Create(LMemErrorMessage);
  1113. -            Result := FTestOwner.UpdateOnFail(FTest, _Failed, LExcept, IntPtr(FTest.ErrorAddress));
  1114. +            Result := FTestOwner.UpdateOnFail(FTest, _Failed, LExcept, Pointer(FTest.ErrorAddress));
  1115.            finally
  1116.              FreeAndNil(LExcept);
  1117.            end
  1118. @@ -2491,7 +2491,7 @@
  1119.                                   const NewStatus: TExecutionStatus;
  1120.                                   const ExceptnMsg: string;
  1121.                                   const Excpt: Exception;
  1122. -                                 const Addrs: IntPtr): TExecutionStatus;
  1123. +                                 const Addrs: Pointer): TExecutionStatus;
  1124.  begin
  1125.    ATest.ErrorMessage := ExceptnMsg;
  1126.    {$IFNDEF CLR}
  1127. @@ -2507,7 +2507,7 @@
  1128.  function TTestProc.UpdateOnFail(const ATest: ITest;
  1129.                                  const NewStatus: TExecutionStatus;
  1130.                                  const Excpt: Exception;
  1131. -                                const Addrs: IntPtr): TExecutionStatus;
  1132. +                                const Addrs: Pointer): TExecutionStatus;
  1133.  begin
  1134.    ATest.ErrorMessage := Excpt.Message;
  1135.    {$IFNDEF CLR}
  1136. Index: src/GUIActionRecorder.pas
  1137. ===================================================================
  1138. --- src/GUIActionRecorder.pas   (revision 101)
  1139. +++ src/GUIActionRecorder.pas   (working copy)
  1140. @@ -1039,8 +1039,9 @@
  1141.          try
  1142.            // Draw the highlight
  1143.            GetWindowRect(AHwnd, LRect);
  1144. -          LRect.Inflate(1, 1, -1, -1);
  1145. -          Rectangle(LDC, 1, 1, LRect.Width, LRect.Height);
  1146. +          Dec(LRect.Left); Dec(LRect.Top);
  1147. +          Inc(LRect.Right); Inc(LRect.Bottom);
  1148. +          Rectangle(LDC, 1, 1, (LRect.Right-LRect.Left), (LRect.Bottom-LRect.Top));
  1149.          finally
  1150.            SelectObject(LDC, LPrevBrush);
  1151.          end;
  1152. @@ -1774,8 +1775,8 @@
  1153.    // Use X and Y of the centre of the window to find it during playback
  1154.    if GetWindowRect(Hwnd, LRect) then
  1155.    begin
  1156. -    FX := LRect.Width div 2;
  1157. -    FY := LRect.Height div 2;
  1158. +    FX := (LRect.Right-LRect.Left) div 2;
  1159. +    FY := (LRect.Bottom-LRect.Top) div 2;
  1160.    end;
  1161.  end;
  1162.  
  1163. Index: src/GUIAutomation.pas
  1164. ===================================================================
  1165. --- src/GUIAutomation.pas   (revision 101)
  1166. +++ src/GUIAutomation.pas   (working copy)
  1167. @@ -154,6 +154,7 @@
  1168.      procedure SelectTreeViewItem(const AHwnd: HWND; const AX: Integer;
  1169.          const AY: Integer);
  1170.  {$ENDIF}
  1171. +    procedure HandleIdleAndSignalWereNotDone(Sender: TObject; var Done: Boolean);
  1172.    protected
  1173.      procedure SyncMessages;
  1174.      function WaitForWindowEnabled(const AHwnd: HWND): boolean;
  1175. @@ -457,13 +458,33 @@
  1176.  end;
  1177.  
  1178.  procedure TGUIAutomation.SyncMessages;
  1179. +var
  1180. +  OldIdleHandler : TIdleEvent;
  1181.  begin
  1182.    if GetCurrentThreadId = MainThreadID then
  1183.    begin
  1184.      // Process the message queue until empty
  1185.      Application.ProcessMessages;
  1186. +    //** WP 2015-06-01: On some systems (such as mine as of this writing, which is
  1187. +    //Win 8.1, XE and XE5, the application GUI automation blocks here unless
  1188. +    //you keep moving your mouse to "feed the message queue".  This is because, on
  1189. +    //my setup, Application.OnIdle will effectively block totally unelss you
  1190. +    //actually return Done := False in the event handler.  It should be possible
  1191. +    //to achieve the same result in a less hacky way but at least this works.
  1192. +    //(See below at ** for more.)
  1193. +    OldIdleHandler := Application.OnIdle;
  1194. +    try
  1195. +      Application.OnIdle := HandleIdleAndSignalWereNotDone;
  1196.      // Trigger any OnIdle processing (e.g. action OnUpdate)
  1197.      Application.DoApplicationIdle;
  1198. +      //** WP 2015-06-01: Instead of the OnIdleHandler hack, we should in theory
  1199. +      //be able to keep ourselves alive by posting another message to the message
  1200. +      //queue but it doesn't seem to work for whatever reason and I don't have
  1201. +      //the time or patience to try and figure out why not.
  1202. +      //SendMessage( Application.MainForm.Handle , WM_NULL, 0, 0);
  1203. +    finally
  1204. +      Application.OnIdle := OldIdleHandler;
  1205. +    end;
  1206.    end
  1207.    else
  1208.      TGUISyncMessagesThread.SyncMessages;
  1209. @@ -1256,7 +1277,7 @@
  1210.  
  1211.        // Move in steps to the specified position
  1212.        LFinalPoint := Point(AX, AY);
  1213. -      LIntervals := LFinalPoint.Distance(LInitialPoint) / APixelInterval;
  1214. +      LIntervals :=  Sqrt(Sqr(0.0 + LFinalPoint.X - LInitialPoint.X) + Sqr(0.0 + LFinalPoint.Y - LInitialPoint.Y)) / APixelInterval;
  1215.        LMoveIntervals := Trunc(LIntervals);
  1216.        if LMoveIntervals > 0 then
  1217.        begin
  1218. @@ -1982,6 +2003,12 @@
  1219.      FOnGetContinueExecution(result);
  1220.  end;
  1221.  
  1222. +procedure TGUIAutomation.HandleIdleAndSignalWereNotDone(Sender: TObject;
  1223. +  var Done: Boolean);
  1224. +begin
  1225. +  Done := False;
  1226. +end;
  1227. +
  1228.  procedure TGUIAutomation.Hide(const AControlName: string);
  1229.  begin
  1230.    Show(AControlName, false);
  1231. Index: src/GUIUtils.pas
  1232. ===================================================================
  1233. --- src/GUIUtils.pas    (revision 101)
  1234. +++ src/GUIUtils.pas    (working copy)
  1235. @@ -46,6 +46,10 @@
  1236.    SysUtils,
  1237.    Classes;
  1238.  
  1239. +{$IF CompilerVersion = 22}
  1240. +type PINT_PTR = ^INT_PTR;
  1241. +{$IFEND}
  1242. +
  1243.  const
  1244.    rcs_id: string = '#(@)$Id: GUIUtils.pas,v 1.35 2010/05/04 09:55:00 jarrodh Exp $';
  1245.  
  1246. @@ -237,8 +241,8 @@
  1247.        begin
  1248.          LRect := Rect(0, 0, 0, 0);
  1249.          GetWindowRect(result, LRect);
  1250. -        AX := LRect.Width div 2;
  1251. -        AY := LRect.Height div 2;
  1252. +        AX := (LRect.Right-LRect.Left) div 2;
  1253. +        AY := (LRect.Bottom-LRect.Top) div 2;
  1254.        end;
  1255.      end
  1256.      else
  1257. @@ -508,8 +512,8 @@
  1258.    LPNGImage := nil;
  1259.    try
  1260.      LBitmap := TBitmap.Create;
  1261. -    LBitmap.Width := LRect.Width;
  1262. -    LBitmap.Height := LRect.Height;
  1263. +    LBitmap.Width := (LRect.Right-LRect.Left);
  1264. +    LBitmap.Height := (LRect.Bottom-LRect.Top);
  1265.      LBitmap.PixelFormat := pf32bit;
  1266.      LBitmap.Canvas.Lock;
  1267.      try
  1268. @@ -538,7 +542,7 @@
  1269.          if LHwnd <> GetDesktopWindow then
  1270.            PrintWindow(LHwnd, LBitmap.Canvas.Handle, 0)
  1271.          else
  1272. -          BitBlt(LBitmap.Canvas.Handle, 0, 0, LRect.Width, LRect.Height, LDC,
  1273. +          BitBlt(LBitmap.Canvas.Handle, 0, 0, (LRect.Right-LRect.Left), (LRect.Bottom-LRect.Top), LDC,
  1274.                LRect.Left, LRect.Top, SRCCOPY);
  1275.        finally
  1276.          ReleaseDC(LHwnd, LDC);
  1277. Index: src/TestFramework.pas
  1278. ===================================================================
  1279. --- src/TestFramework.pas   (revision 101)
  1280. +++ src/TestFramework.pas   (working copy)
  1281. @@ -223,7 +223,7 @@
  1282.                              const NewStatus: TExecutionStatus;
  1283.                              const ExceptnMsg: string;
  1284.                              const Excpt: Exception;
  1285. -                            const Addrs: IntPtr): TExecutionStatus;
  1286. +                            const Addrs: Pointer): TExecutionStatus;
  1287.      function  GetStatus: string;
  1288.      procedure Status(const Value: string);
  1289.      function  get_Proxy: IInterface;
  1290. @@ -1225,7 +1225,7 @@
  1291.                                                    LMemErrorMessage);
  1292.            try
  1293.              LExcept := EPostTestFailure.Create(LMemErrorMessage);
  1294. -            Result := FTestOwner.UpdateOnFail(FTest, _Failed, LExcept, IntPtr(FTest.ErrorAddress));
  1295. +            Result := FTestOwner.UpdateOnFail(FTest, _Failed, LExcept, Pointer(FTest.ErrorAddress));
  1296.            finally
  1297.              FreeAndNil(LExcept);
  1298.            end
  1299. @@ -2460,7 +2460,7 @@
  1300.                                   const NewStatus: TExecutionStatus;
  1301.                                   const ExceptnMsg: string;
  1302.                                   const Excpt: Exception;
  1303. -                                 const Addrs: IntPtr): TExecutionStatus;
  1304. +                                 const Addrs: Pointer): TExecutionStatus;
  1305.  begin
  1306.    ATest.ErrorMessage := ExceptnMsg;
  1307.    {$IFNDEF CLR}
  1308. @@ -2476,7 +2476,7 @@
  1309.  function TTestProc.UpdateOnFail(const ATest: ITest;
  1310.                                  const NewStatus: TExecutionStatus;
  1311.                                  const Excpt: Exception;
  1312. -                                const Addrs: IntPtr): TExecutionStatus;
  1313. +                                const Addrs: Pointer): TExecutionStatus;
  1314.  begin
  1315.    ATest.ErrorMessage := Excpt.Message;
  1316.    {$IFNDEF CLR}
  1317. Index: src/watchFile.pas
  1318. ===================================================================
  1319. --- src/watchFile.pas   (revision 101)
  1320. +++ src/watchFile.pas   (working copy)
  1321. @@ -31,6 +31,12 @@
  1322.  {$IFDEF DELPHI2010} cRegPluginKey = 'SOFTWARE\DUnitTestInspector\Delphi2010'; {$ENDIF}
  1323.  {$IFDEF DELPHIXE} cRegPluginKey = 'SOFTWARE\DUnitTestInspector\DelphiXE'; {$ENDIF}
  1324.  {$IFDEF DELPHIXE2} cRegPluginKey = 'SOFTWARE\DUnitTestInspector\DelphiXE2'; {$ENDIF}
  1325. +{$IFDEF DELPHIXE3} cRegPluginKey = 'SOFTWARE\DUnitTestInspector\DelphiXE3'; {$ENDIF}
  1326. +{$IFDEF DELPHIXE4} cRegPluginKey = 'SOFTWARE\DUnitTestInspector\DelphiXE4'; {$ENDIF}
  1327. +{$IFDEF DELPHIXE5} cRegPluginKey = 'SOFTWARE\DUnitTestInspector\DelphiXE5'; {$ENDIF}
  1328. +{$IFDEF DELPHIXE6} cRegPluginKey = 'SOFTWARE\DUnitTestInspector\DelphiXE6'; {$ENDIF}
  1329. +{$IFDEF DELPHIXE7} cRegPluginKey = 'SOFTWARE\DUnitTestInspector\DelphiXE7'; {$ENDIF}
  1330. +{$IFDEF DELPHIXE8} cRegPluginKey = 'SOFTWARE\DUnitTestInspector\DelphiXE8'; {$ENDIF}
  1331.    cRegWatchFile = 'WatchFile';
  1332.    cWatchFileSection = 'FilesToOpen';
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!