Skip to content

Commit f9ab2dc

Browse files
pyscripterpyscripter
committed
Merged downstream from embarcadero/python4Delphi
1 parent 0d74a09 commit f9ab2dc

File tree

11 files changed

+59
-1167
lines changed

11 files changed

+59
-1167
lines changed

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

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
<MainSource>Python.dpk</MainSource>
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{018AAA56-F5BD-4A04-BCCA-A0043EAAA5CE}</ProjectGuid>
10-
<ProjectVersion>19.5</ProjectVersion>
11-
<TargetedPlatforms>168083</TargetedPlatforms>
10+
<ProjectVersion>20.1</ProjectVersion>
11+
<TargetedPlatforms>693395</TargetedPlatforms>
12+
<ProjectName Condition="'$(ProjectName)'==''">Python</ProjectName>
1213
</PropertyGroup>
1314
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1415
<Base>true</Base>
@@ -54,6 +55,12 @@
5455
<Cfg_1>true</Cfg_1>
5556
<Base>true</Base>
5657
</PropertyGroup>
58+
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''">
59+
<Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64>
60+
<CfgParent>Cfg_1</CfgParent>
61+
<Cfg_1>true</Cfg_1>
62+
<Base>true</Base>
63+
</PropertyGroup>
5764
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
5865
<Cfg_1_Win64>true</Cfg_1_Win64>
5966
<CfgParent>Cfg_1</CfgParent>
@@ -88,7 +95,7 @@
8895
<DCC_DcuOutput>..\..\..\lib\$(Platform)\$(Config)</DCC_DcuOutput>
8996
<DCC_Description>Python4Delphi - Run-time Engine Package</DCC_Description>
9097
<DCC_ImageBase>00400000</DCC_ImageBase>
91-
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;DUnitX.Loggers.GUI;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
98+
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;DUnitX.Loggers.GUI;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
9299
<DllSuffix>$(Auto)</DllSuffix>
93100
<GenDll>true</GenDll>
94101
<GenPackage>true</GenPackage>
@@ -109,11 +116,11 @@
109116
</PropertyGroup>
110117
<PropertyGroup Condition="'$(Base_OSX64)'!=''">
111118
<BT_BuildType>Debug</BT_BuildType>
112-
<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;ITSAppUsesNonExemptEncryption=false</VerInfo_Keys>
119+
<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;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface</VerInfo_Keys>
113120
</PropertyGroup>
114121
<PropertyGroup Condition="'$(Base_OSXARM64)'!=''">
115122
<BT_BuildType>Debug</BT_BuildType>
116-
<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;ITSAppUsesNonExemptEncryption=false</VerInfo_Keys>
123+
<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;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface</VerInfo_Keys>
117124
</PropertyGroup>
118125
<PropertyGroup Condition="'$(Base_Win32)'!=''">
119126
<BT_BuildType>Debug</BT_BuildType>
@@ -136,6 +143,9 @@
136143
<VerInfo_Build>1</VerInfo_Build>
137144
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
138145
</PropertyGroup>
146+
<PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''">
147+
<BT_BuildType>Debug</BT_BuildType>
148+
</PropertyGroup>
139149
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
140150
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
141151
<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>
@@ -204,13 +214,14 @@
204214
<Platforms>
205215
<Platform value="Android">True</Platform>
206216
<Platform value="Android64">True</Platform>
217+
<Platform value="iOSDevice64">True</Platform>
218+
<Platform value="iOSSimARM64">True</Platform>
207219
<Platform value="Linux64">True</Platform>
208220
<Platform value="OSX64">True</Platform>
209221
<Platform value="OSXARM64">True</Platform>
210222
<Platform value="Win32">True</Platform>
211223
<Platform value="Win64">True</Platform>
212-
<Platform value="iOSDevice64">False</Platform>
213-
<Platform value="iOSSimARM64">False</Platform>
224+
<Platform value="Win64x">False</Platform>
214225
</Platforms>
215226
</BorlandProject>
216227
<ProjectFileVersion>12</ProjectFileVersion>

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
<MainSource>PythonFmx.dpk</MainSource>
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{513BF750-373D-4C95-A672-78CA8DDF3F63}</ProjectGuid>
10-
<ProjectVersion>19.5</ProjectVersion>
11-
<TargetedPlatforms>167955</TargetedPlatforms>
10+
<ProjectVersion>20.1</ProjectVersion>
11+
<TargetedPlatforms>693395</TargetedPlatforms>
12+
<ProjectName Condition="'$(ProjectName)'==''">PythonFmx</ProjectName>
1213
</PropertyGroup>
1314
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1415
<Base>true</Base>
@@ -59,9 +60,14 @@
5960
<CfgParent>Base</CfgParent>
6061
<Base>true</Base>
6162
</PropertyGroup>
63+
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
64+
<Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
65+
<CfgParent>Cfg_2</CfgParent>
66+
<Cfg_2>true</Cfg_2>
67+
<Base>true</Base>
68+
</PropertyGroup>
6269
<PropertyGroup Condition="'$(Base)'!=''">
6370
<SanitizedProjectName>PythonFmx</SanitizedProjectName>
64-
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
6571
<DCC_DcuOutput>..\..\..\lib\$(Platform)\$(Config)</DCC_DcuOutput>
6672
<DCC_Description>Python4Delphi - Run-time Engine Package for FMX</DCC_Description>
6773
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
@@ -87,11 +93,11 @@
8793
</PropertyGroup>
8894
<PropertyGroup Condition="'$(Base_OSX64)'!=''">
8995
<BT_BuildType>Debug</BT_BuildType>
90-
<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;ITSAppUsesNonExemptEncryption=false</VerInfo_Keys>
96+
<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;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface</VerInfo_Keys>
9197
</PropertyGroup>
9298
<PropertyGroup Condition="'$(Base_OSXARM64)'!=''">
9399
<BT_BuildType>Debug</BT_BuildType>
94-
<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;ITSAppUsesNonExemptEncryption=false</VerInfo_Keys>
100+
<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;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface</VerInfo_Keys>
95101
</PropertyGroup>
96102
<PropertyGroup Condition="'$(Base_Win32)'!=''">
97103
<BT_BuildType>Debug</BT_BuildType>
@@ -127,6 +133,9 @@
127133
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
128134
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
129135
</PropertyGroup>
136+
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
137+
<BT_BuildType>Debug</BT_BuildType>
138+
</PropertyGroup>
130139
<ItemGroup>
131140
<DelphiCompile Include="$(MainSource)">
132141
<MainSource>MainSource</MainSource>
@@ -185,13 +194,14 @@
185194
<Platforms>
186195
<Platform value="Android">True</Platform>
187196
<Platform value="Android64">True</Platform>
188-
<Platform value="Linux64">False</Platform>
197+
<Platform value="iOSDevice64">True</Platform>
198+
<Platform value="iOSSimARM64">True</Platform>
199+
<Platform value="Linux64">True</Platform>
189200
<Platform value="OSX64">True</Platform>
190201
<Platform value="OSXARM64">True</Platform>
191202
<Platform value="Win32">True</Platform>
192203
<Platform value="Win64">True</Platform>
193-
<Platform value="iOSDevice64">False</Platform>
194-
<Platform value="iOSSimARM64">False</Platform>
204+
<Platform value="Win64x">False</Platform>
195205
</Platforms>
196206
</BorlandProject>
197207
<ProjectFileVersion>12</ProjectFileVersion>

0 commit comments

Comments
 (0)