Skip to content

Commit 1f7601b

Browse files
authored
Including iOS support (#47)
* Passing environment parameters on Windows subprocess * Pipe readers and writers upgrade * Removing Python bundles from Git * Python folder cleanup * Migrating Python bundles to Git LFS * Resources update * Naming convention * Fixing line endings * Naming convention * Deployment process enhancement and iOS inclusion * Projects upgrade to support iOS Former-commit-id: 5dbe8ef
1 parent 09ae778 commit 1f7601b

File tree

165 files changed

+8274
-6772
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+8274
-6772
lines changed

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Disable any line endings auto conversion.
2-
* -text
2+
* -text
3+
*.zip filter=lfs diff=lfs merge=lfs -text

packages/P4DEnvironment.dpk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ contains
4141
PyEnvironment.Local in '..\src\PyEnvironment.Local.pas',
4242
PyEnvironment.Embeddable in '..\src\Embeddable\PyEnvironment.Embeddable.pas',
4343
PyEnvironment.Embeddable.Res in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.pas',
44-
PyEnvironment.Embeddable.Res.Python37 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python37.pas',
4544
PyEnvironment.Embeddable.Res.Python38 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python38.pas',
4645
PyEnvironment.Embeddable.Res.Python39 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python39.pas',
4746
PyEnvironment.Embeddable.Res.Python310 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python310.pas',

packages/P4DEnvironment.dproj

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{4A75F3AF-14CB-4FCD-8871-BD7A6A516746}</ProjectGuid>
1010
<ProjectVersion>19.5</ProjectVersion>
11-
<TargetedPlatforms>168083</TargetedPlatforms>
11+
<TargetedPlatforms>693395</TargetedPlatforms>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
@@ -133,11 +133,11 @@
133133
</PropertyGroup>
134134
<PropertyGroup Condition="'$(Base_OSX64)'!=''">
135135
<BT_BuildType>Debug</BT_BuildType>
136-
<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>
136+
<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>
137137
</PropertyGroup>
138138
<PropertyGroup Condition="'$(Base_OSXARM64)'!=''">
139139
<BT_BuildType>Debug</BT_BuildType>
140-
<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>
140+
<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>
141141
</PropertyGroup>
142142
<PropertyGroup Condition="'$(Base_Win32)'!=''">
143143
<BT_BuildType>Debug</BT_BuildType>
@@ -167,7 +167,7 @@
167167
</PropertyGroup>
168168
<PropertyGroup Condition="'$(Cfg_1_OSXARM64)'!=''">
169169
<Debugger_Launcher>/usr/X11/bin/xterm -e &quot;%debuggee%&quot;</Debugger_Launcher>
170-
<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>
170+
<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>
171171
</PropertyGroup>
172172
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
173173
<DCC_RemoteDebug>false</DCC_RemoteDebug>
@@ -209,7 +209,6 @@
209209
<DCCReference Include="..\src\PyEnvironment.Local.pas"/>
210210
<DCCReference Include="..\src\Embeddable\PyEnvironment.Embeddable.pas"/>
211211
<DCCReference Include="..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.pas"/>
212-
<DCCReference Include="..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python37.pas"/>
213212
<DCCReference Include="..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python38.pas"/>
214213
<DCCReference Include="..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python39.pas"/>
215214
<DCCReference Include="..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python310.pas"/>
@@ -221,24 +220,6 @@
221220
<RcCompile Include="..\resources\pip\getpipscript.rc">
222221
<Form>getpipscript.res</Form>
223222
</RcCompile>
224-
<RcCompile Include="..\resources\python37\python3-android-3.7-arm.rc">
225-
<Form>python3-android-3.7-arm.res</Form>
226-
</RcCompile>
227-
<RcCompile Include="..\resources\python37\python3-android-3.7-arm64.rc">
228-
<Form>python3-android-3.7-arm64.res</Form>
229-
</RcCompile>
230-
<RcCompile Include="..\resources\python37\python3-linux-3.7-x86_64.rc">
231-
<Form>python3-linux-3.7-x86_64.res</Form>
232-
</RcCompile>
233-
<RcCompile Include="..\resources\python37\python3-macos-3.7-x86_64.rc">
234-
<Form>python3-macos-3.7-x86_64.res</Form>
235-
</RcCompile>
236-
<RcCompile Include="..\resources\python37\python3-windows-3.7-amd64.rc">
237-
<Form>python3-windows-3.7-amd64.res</Form>
238-
</RcCompile>
239-
<RcCompile Include="..\resources\python37\python3-windows-3.7-win32.rc">
240-
<Form>python3-windows-3.7-win32.res</Form>
241-
</RcCompile>
242223
<RcCompile Include="..\resources\python38\python3-android-3.8-arm.rc">
243224
<Form>python3-android-3.8-arm.res</Form>
244225
</RcCompile>
@@ -351,8 +332,8 @@
351332
<Platforms>
352333
<Platform value="Android">True</Platform>
353334
<Platform value="Android64">True</Platform>
354-
<Platform value="iOSDevice64">False</Platform>
355-
<Platform value="iOSSimARM64">False</Platform>
335+
<Platform value="iOSDevice64">True</Platform>
336+
<Platform value="iOSSimARM64">True</Platform>
356337
<Platform value="Linux64">True</Platform>
357338
<Platform value="OSX64">True</Platform>
358339
<Platform value="OSXARM64">True</Platform>

packages/P4DPythonEnvironmentsComponentSuite.prjmgc

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)