Skip to content

Commit 583fcb0

Browse files
jimmckeethjimmckeeth
committed
consolidated DCU output
Fixed issues around building for Android by consolidating DCU output to ..\..\..\lib\$(Platform)\$(Config) Now each platform just needs $(USERPROFILE)\Documents\GitHub\python4delphi\lib\Win32\Release added to search path.
1 parent 37ee289 commit 583fcb0

File tree

8 files changed

+537
-106
lines changed

8 files changed

+537
-106
lines changed

‎.gitignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,19 @@
4242
*.Patch
4343
*.#00
4444
*.pch
45+
AndroidManifest.template.xml
46+
AndroidManifest.xml
47+
/Tests/TestInsightSettings.ini
4548

4649
# Output Folders #
4750
###################
4851
/Win32
4952
/Win64
5053
/OSX32
51-
/__history
54+
__history/
5255
__recovery/
5356
/Modules/DelphiFMX/pyd
5457
/Modules/DelphiVCL/pyd
5558
/Modules/DelphiFMX/dcu
5659
/Modules/DelphiVCL/dcu
57-
/Tests/TestInsightSettings.ini
60+
Release/

‎Packages/Delphi/Delphi 10.4+/Python.dproj

+233-4
Large diffs are not rendered by default.

‎Packages/Delphi/Delphi 10.4+/PythonFmx.dproj

+249-10
Large diffs are not rendered by default.

‎Packages/Delphi/Delphi 10.4+/PythonVcl.dproj

+10-3
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,15 @@
3939
<CfgParent>Base</CfgParent>
4040
<Base>true</Base>
4141
</PropertyGroup>
42+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
43+
<Cfg_2_Win32>true</Cfg_2_Win32>
44+
<CfgParent>Cfg_2</CfgParent>
45+
<Cfg_2>true</Cfg_2>
46+
<Base>true</Base>
47+
</PropertyGroup>
4248
<PropertyGroup Condition="'$(Base)'!=''">
4349
<SanitizedProjectName>PythonVcl</SanitizedProjectName>
44-
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
45-
<DCC_DcuOutput>..\..\..\dcu\$(Platform)\$(Config)</DCC_DcuOutput>
50+
<DCC_DcuOutput>..\..\..\lib\$(Platform)\$(Config)</DCC_DcuOutput>
4651
<DCC_Description>Python4Delphi - Run-time Engine Package for VCL</DCC_Description>
4752
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
4853
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
@@ -83,12 +88,14 @@
8388
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
8489
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
8590
</PropertyGroup>
91+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
92+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
93+
</PropertyGroup>
8694
<ItemGroup>
8795
<DelphiCompile Include="$(MainSource)">
8896
<MainSource>MainSource</MainSource>
8997
</DelphiCompile>
9098
<DCCReference Include="rtl.dcp"/>
91-
<DCCReference Include="vcl.dcp"/>
9299
<DCCReference Include="Python.dcp"/>
93100
<DCCReference Include="VclSmp.dcp"/>
94101
<DCCReference Include="vclimg.dcp"/>

‎Packages/Delphi/Delphi 10.4+/dclPython.dproj

+11-29
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{D9AB994C-54A3-4E76-81C8-6D0BB035A091}</ProjectGuid>
1010
<ProjectVersion>19.4</ProjectVersion>
11-
<TargetedPlatforms>3</TargetedPlatforms>
11+
<TargetedPlatforms>1</TargetedPlatforms>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
@@ -18,11 +18,6 @@
1818
<CfgParent>Base</CfgParent>
1919
<Base>true</Base>
2020
</PropertyGroup>
21-
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
22-
<Base_Win64>true</Base_Win64>
23-
<CfgParent>Base</CfgParent>
24-
<Base>true</Base>
25-
</PropertyGroup>
2621
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
2722
<Cfg_1>true</Cfg_1>
2823
<CfgParent>Base</CfgParent>
@@ -39,14 +34,16 @@
3934
<CfgParent>Base</CfgParent>
4035
<Base>true</Base>
4136
</PropertyGroup>
42-
<PropertyGroup Condition="'$(Base_OSXARM64)'!=''">
43-
<BT_BuildType>Debug</BT_BuildType>
44-
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers</VerInfo_Keys>
37+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
38+
<Cfg_2_Win32>true</Cfg_2_Win32>
39+
<CfgParent>Cfg_2</CfgParent>
40+
<Cfg_2>true</Cfg_2>
41+
<Base>true</Base>
4542
</PropertyGroup>
4643
<PropertyGroup Condition="'$(Base)'!=''">
4744
<SanitizedProjectName>dclPython</SanitizedProjectName>
4845
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
49-
<DCC_DcuOutput>..\..\..\dcu\$(Platform)\$(Config)</DCC_DcuOutput>
46+
<DCC_DcuOutput>..\..\..\lib\$(Platform)\$(Config)</DCC_DcuOutput>
5047
<DCC_Description>Python4Delphi - Design-time Engine Package</DCC_Description>
5148
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
5249
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
@@ -65,12 +62,6 @@
6562
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
6663
<VerInfo_Locale>1033</VerInfo_Locale>
6764
</PropertyGroup>
68-
<PropertyGroup Condition="'$(Base_Win64)'!=''">
69-
<BT_BuildType>Debug</BT_BuildType>
70-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
71-
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
72-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
73-
</PropertyGroup>
7465
<PropertyGroup Condition="'$(Cfg_1)'!=''">
7566
<DCC_DebugDCUs>true</DCC_DebugDCUs>
7667
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
@@ -90,6 +81,9 @@
9081
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
9182
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
9283
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
85+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
86+
</PropertyGroup>
9387
<ItemGroup>
9488
<DelphiCompile Include="$(MainSource)">
9589
<MainSource>MainSource</MainSource>
@@ -195,32 +189,20 @@
195189
<Platform Name="Win32">
196190
<Operation>1</Operation>
197191
</Platform>
198-
<Platform Name="Win64">
199-
<Operation>1</Operation>
200-
</Platform>
201192
</DeployClass>
202193
<DeployClass Name="UWP_DelphiLogo150">
203194
<Platform Name="Win32">
204195
<RemoteDir>Assets</RemoteDir>
205196
<Operation>1</Operation>
206197
</Platform>
207-
<Platform Name="Win64">
208-
<RemoteDir>Assets</RemoteDir>
209-
<Operation>1</Operation>
210-
</Platform>
211198
</DeployClass>
212199
<DeployClass Name="UWP_DelphiLogo44">
213200
<Platform Name="Win32">
214201
<RemoteDir>Assets</RemoteDir>
215202
<Operation>1</Operation>
216203
</Platform>
217-
<Platform Name="Win64">
218-
<RemoteDir>Assets</RemoteDir>
219-
<Operation>1</Operation>
220-
</Platform>
221204
</DeployClass>
222205
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
223-
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
224206
</Deployment>
225207
<Platforms>
226208
<Platform value="Android">False</Platform>
@@ -229,7 +211,7 @@
229211
<Platform value="OSX64">False</Platform>
230212
<Platform value="OSXARM64">False</Platform>
231213
<Platform value="Win32">True</Platform>
232-
<Platform value="Win64">True</Platform>
214+
<Platform value="Win64">False</Platform>
233215
<Platform value="iOSDevice64">False</Platform>
234216
</Platforms>
235217
</BorlandProject>

‎Packages/Delphi/Delphi 10.4+/dclPythonFmx.dproj

+12-29
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{E057921E-25DB-426E-8090-FE3F428894FF}</ProjectGuid>
1010
<ProjectVersion>19.4</ProjectVersion>
11-
<TargetedPlatforms>3</TargetedPlatforms>
11+
<TargetedPlatforms>1</TargetedPlatforms>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
@@ -18,11 +18,6 @@
1818
<CfgParent>Base</CfgParent>
1919
<Base>true</Base>
2020
</PropertyGroup>
21-
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
22-
<Base_Win64>true</Base_Win64>
23-
<CfgParent>Base</CfgParent>
24-
<Base>true</Base>
25-
</PropertyGroup>
2621
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
2722
<Cfg_1>true</Cfg_1>
2823
<CfgParent>Base</CfgParent>
@@ -39,17 +34,20 @@
3934
<CfgParent>Base</CfgParent>
4035
<Base>true</Base>
4136
</PropertyGroup>
42-
<PropertyGroup Condition="'$(Base_OSXARM64)'!=''">
43-
<BT_BuildType>Debug</BT_BuildType>
44-
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers</VerInfo_Keys>
37+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
38+
<Cfg_2_Win32>true</Cfg_2_Win32>
39+
<CfgParent>Cfg_2</CfgParent>
40+
<Cfg_2>true</Cfg_2>
41+
<Base>true</Base>
4542
</PropertyGroup>
4643
<PropertyGroup Condition="'$(Base)'!=''">
4744
<SanitizedProjectName>dclPythonFmx</SanitizedProjectName>
4845
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
49-
<DCC_DcuOutput>..\..\..\dcu\$(Platform)\$(Config)</DCC_DcuOutput>
46+
<DCC_DcuOutput>..\..\..\lib\$(Platform)\$(Config)</DCC_DcuOutput>
5047
<DCC_Description>Python4Delphi - Design-time Engine Package for FMX</DCC_Description>
5148
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
5249
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
50+
<DCC_UnitSearchPath>..\..\..\lib\$(Platform)\$(Config);$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
5351
<DesignOnlyPackage>true</DesignOnlyPackage>
5452
<DllSuffix>$(Auto)</DllSuffix>
5553
<GenDll>true</GenDll>
@@ -65,12 +63,6 @@
6563
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
6664
<VerInfo_Locale>1033</VerInfo_Locale>
6765
</PropertyGroup>
68-
<PropertyGroup Condition="'$(Base_Win64)'!=''">
69-
<BT_BuildType>Debug</BT_BuildType>
70-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
71-
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
72-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
73-
</PropertyGroup>
7466
<PropertyGroup Condition="'$(Cfg_1)'!=''">
7567
<DCC_DebugDCUs>true</DCC_DebugDCUs>
7668
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
@@ -89,6 +81,9 @@
8981
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
9082
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
9183
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
85+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
86+
</PropertyGroup>
9287
<ItemGroup>
9388
<DelphiCompile Include="$(MainSource)">
9489
<MainSource>MainSource</MainSource>
@@ -170,32 +165,20 @@
170165
<Platform Name="Win32">
171166
<Operation>1</Operation>
172167
</Platform>
173-
<Platform Name="Win64">
174-
<Operation>1</Operation>
175-
</Platform>
176168
</DeployClass>
177169
<DeployClass Name="UWP_DelphiLogo150">
178170
<Platform Name="Win32">
179171
<RemoteDir>Assets</RemoteDir>
180172
<Operation>1</Operation>
181173
</Platform>
182-
<Platform Name="Win64">
183-
<RemoteDir>Assets</RemoteDir>
184-
<Operation>1</Operation>
185-
</Platform>
186174
</DeployClass>
187175
<DeployClass Name="UWP_DelphiLogo44">
188176
<Platform Name="Win32">
189177
<RemoteDir>Assets</RemoteDir>
190178
<Operation>1</Operation>
191179
</Platform>
192-
<Platform Name="Win64">
193-
<RemoteDir>Assets</RemoteDir>
194-
<Operation>1</Operation>
195-
</Platform>
196180
</DeployClass>
197181
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
198-
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
199182
</Deployment>
200183
<Platforms>
201184
<Platform value="Android">False</Platform>
@@ -204,7 +187,7 @@
204187
<Platform value="OSX64">False</Platform>
205188
<Platform value="OSXARM64">False</Platform>
206189
<Platform value="Win32">True</Platform>
207-
<Platform value="Win64">True</Platform>
190+
<Platform value="Win64">False</Platform>
208191
<Platform value="iOSDevice64">False</Platform>
209192
</Platforms>
210193
</BorlandProject>

0 commit comments

Comments
 (0)