Skip to content

Commit c8ff901

Browse files
lmbelolmbelo
committedNov 19, 2024
Including Python 3.13
1 parent 6237f31 commit c8ff901

10 files changed

+44
-30
lines changed
 

‎src/Project/IDE/Deploy/Android/PyEnvironment.Project.IDE.Deploy.Android.pas

+8-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,13 @@ function TPyEnvironmentProjectDeployAndroid.MakeAssetsFromZip: TArray<string>;
140140
LZip.Open(LocatePythonBundle(), TZipMode.zmRead);
141141

142142
// Is the libpythonxx.so.1.0 the real one?
143-
if LZip.IndexOf(Format('lib/libpython%s.so.1.0', [GetPythonVersion()])) >= 0 then begin
143+
var LLibFileName := String.Empty;
144+
if LZip.IndexOf(Format('lib/libpython%s.so.1.0', [GetPythonVersion()])) >= 0 then
145+
LLibFileName := 'lib/libpython%s.so.1.0'
146+
else if LZip.IndexOf(Format('lib/libpython%s.so', [GetPythonVersion()])) >= 0 then
147+
LLibFileName := 'lib/libpython%s.so';
148+
149+
if not LLibFileName.IsEmpty() then begin
144150
var LAssetFileName := TPath.Combine(
145151
GetAssetsFolder(GetPythonVersion()),
146152
Format('libpython%s.so', [GetPythonVersion()]));
@@ -150,7 +156,7 @@ function TPyEnvironmentProjectDeployAndroid.MakeAssetsFromZip: TArray<string>;
150156

151157
var LAssetStream := TFileStream.Create(LAssetFileName, fmCreate);
152158
try
153-
LZip.Read(Format('lib/libpython%s.so.1.0', [GetPythonVersion()]), LStream, LLocalHeader);
159+
LZip.Read(Format(LLibFileName, [GetPythonVersion()]), LStream, LLocalHeader);
154160
LAssetStream.CopyFrom(LStream, LStream.Size);
155161
finally
156162
LAssetStream.Free;

‎src/Project/IDE/Deploy/Android/PyEnvironment.Project.IDE.Deploy.AndroidARM.pas

+5-4
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,13 @@ function TPyEnvironmentProjectDeployAndroidARM.GetPlatform: TPyEnvironmentProjec
6060

6161
function TPyEnvironmentProjectDeployAndroidARM.GetPythonBundleName: string;
6262
begin
63-
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12']) of
63+
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']) of
6464
0: Result := 'python3-android-3.8.16-arm.zip';
6565
1: Result := 'python3-android-3.9.16-arm.zip';
66-
2: Result := 'python3-android-3.10.7-arm.zip';
67-
3: Result := 'python3-android-3.11.2-arm.zip';
68-
4: Result := 'python3-android-3.12.0-arm.zip';
66+
2: Result := 'python3-android-3.10.11-arm.zip';
67+
3: Result := 'python3-android-3.11.9-arm.zip';
68+
4: Result := 'python3-android-3.12.7-arm.zip';
69+
5: Result := 'python3-android-3.13.0-arm.zip';
6970
else
7071
Result := String.Empty;
7172
end;

‎src/Project/IDE/Deploy/Android/PyEnvironment.Project.IDE.Deploy.AndroidARM64.pas

+5-4
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,13 @@ function TPyEnvironmentProjectDeployAndroidARM64.GetPlatform: TPyEnvironmentProj
7676

7777
function TPyEnvironmentProjectDeployAndroidARM64.GetPythonBundleName: string;
7878
begin
79-
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12']) of
79+
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']) of
8080
0: Result := 'python3-android-3.8.16-arm64.zip';
8181
1: Result := 'python3-android-3.9.16-arm64.zip';
82-
2: Result := 'python3-android-3.10.7-arm64.zip';
83-
3: Result := 'python3-android-3.11.2-arm64.zip';
84-
4: Result := 'python3-android-3.12.0-arm64.zip';
82+
2: Result := 'python3-android-3.10.11-arm64.zip';
83+
3: Result := 'python3-android-3.11.9-arm64.zip';
84+
4: Result := 'python3-android-3.12.7-arm64.zip';
85+
5: Result := 'python3-android-3.13.0-arm64.zip';
8586
else
8687
Result := String.Empty;
8788
end;

‎src/Project/IDE/Deploy/Linux/PyEnvironment.Project.IDE.Deploy.Linux64.pas

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
(* *)
1010
(* Project page: https://github.com/Embarcadero/PythonEnviroments *)
1111
(**************************************************************************)
12-
(* Functionality: Make deployables for Android *)
12+
(* Functionality: Make deployables for Linux *)
1313
(* *)
1414
(* *)
1515
(**************************************************************************)
@@ -59,12 +59,13 @@ function TPyEnvironmentProjectDeployLinux64.GetPlatform: TPyEnvironmentProjectPl
5959

6060
function TPyEnvironmentProjectDeployLinux64.GetPythonBundleName: string;
6161
begin
62-
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12']) of
62+
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']) of
6363
0: Result := 'python3-linux-3.8.16-x86_64.zip';
6464
1: Result := 'python3-linux-3.9.16-x86_64.zip';
65-
2: Result := 'python3-linux-3.10.9-x86_64.zip';
66-
3: Result := 'python3-linux-3.11.2-x86_64.zip';
67-
4: Result := 'python3-linux-3.12.0-x86_64.zip';
65+
2: Result := 'python3-linux-3.10.11-x86_64.zip';
66+
3: Result := 'python3-linux-3.11.9-x86_64.zip';
67+
4: Result := 'python3-linux-3.12.7-x86_64.zip';
68+
5: Result := 'python3-linux-3.13.0-x86_64.zip';
6869
else
6970
Result := String.Empty;
7071
end;

‎src/Project/IDE/Deploy/OSX/PyEnvironment.Project.IDE.Deploy.OSX.pas

+2-1
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,13 @@ implementation
118118

119119
function TPyEnvironmentProjectDeployOSX.GetPythonBundleName: string;
120120
begin
121-
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12']) of
121+
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']) of
122122
0: Result := 'python3-macos-3.8.18-universal2.zip';
123123
1: Result := 'python3-macos-3.9.18-universal2.zip';
124124
2: Result := 'python3-macos-3.10.13-universal2.zip';
125125
3: Result := 'python3-macos-3.11.6-universal2.zip';
126126
4: Result := 'python3-macos-3.12.0-universal2.zip';
127+
5: Result := 'python3-macos-3.13.0-universal2.zip';
127128
else
128129
Result := String.Empty;
129130
end;

‎src/Project/IDE/Deploy/PyEnvironment.Project.IDE.Deploy.pas

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ TPyEnvironmentProjectDeploy = class
8282
PROJECT_USE_PYTHON = 'PYTHON';
8383
PROJECT_NO_USE_PYTHON = 'NOPYTHON';
8484
PYTHON_ENVIRONMENT_DIR_VARIABLE = 'PYTHONENVIRONMENTDIR';
85-
PYTHON_VERSIONS: array[0..4] of string = ('3.8', '3.9', '3.10', '3.11', '3.12');
85+
PYTHON_VERSIONS: array[0..5] of string = ('3.8', '3.9', '3.10', '3.11', '3.12', '3.13');
8686
SUPPORTED_PLATFORMS = [
8787
TPyEnvironmentProjectPlatform.Win32, TPyEnvironmentProjectPlatform.Win64,
8888
TPyEnvironmentProjectPlatform.Android, TPyEnvironmentProjectPlatform.Android64,
@@ -318,7 +318,7 @@ class procedure TPyEnvironmentProjectDeploy.GetDeployFilesAsync(
318318
var
319319
LModel: TDeployFilesModel;
320320
begin
321-
TPythonMessage.ShowMessageView(true);
321+
TPythonMessage.ShowMessageView(false);
322322

323323
// Must queue this call
324324
TTask.Run(

‎src/Project/IDE/Deploy/Windows/PyEnvironment.Project.IDE.Deploy.Windows32.pas

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
(* *)
1010
(* Project page: https://github.com/Embarcadero/PythonEnviroments *)
1111
(**************************************************************************)
12-
(* Functionality: Make deployables for iOS Device ARM64 *)
12+
(* Functionality: Make deployables for Windows x86 *)
1313
(* *)
1414
(* *)
1515
(**************************************************************************)
@@ -59,12 +59,13 @@ function TPyEnvironmentProjectDeployWindows32.GetPlatform: TPyEnvironmentProject
5959

6060
function TPyEnvironmentProjectDeployWindows32.GetPythonBundleName: string;
6161
begin
62-
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12']) of
62+
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']) of
6363
0: Result := 'python3-windows-3.8.10-win32.zip';
6464
1: Result := 'python3-windows-3.9.13-win32.zip';
65-
2: Result := 'python3-windows-3.10.9-win32.zip';
66-
3: Result := 'python3-windows-3.11.2-win32.zip';
67-
4: Result := 'python3-windows-3.12.0-win32.zip';
65+
2: Result := 'python3-windows-3.10.11-win32.zip';
66+
3: Result := 'python3-windows-3.11.9-win32.zip';
67+
4: Result := 'python3-windows-3.12.7-win32.zip';
68+
5: Result := 'python3-windows-3.13.0-win32.zip';
6869
else
6970
Result := String.Empty;
7071
end;

‎src/Project/IDE/Deploy/Windows/PyEnvironment.Project.IDE.Deploy.Windows64.pas

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
(* *)
1010
(* Project page: https://github.com/Embarcadero/PythonEnviroments *)
1111
(**************************************************************************)
12-
(* Functionality: Make deployables for iOS Device ARM64 *)
12+
(* Functionality: Make deployables for Windows x64 *)
1313
(* *)
1414
(* *)
1515
(**************************************************************************)
@@ -59,12 +59,13 @@ function TPyEnvironmentProjectDeployWindows64.GetPlatform: TPyEnvironmentProject
5959

6060
function TPyEnvironmentProjectDeployWindows64.GetPythonBundleName: string;
6161
begin
62-
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12']) of
62+
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']) of
6363
0: Result := 'python3-windows-3.8.10-amd64.zip';
6464
1: Result := 'python3-windows-3.9.13-amd64.zip';
65-
2: Result := 'python3-windows-3.10.9-amd64.zip';
66-
3: Result := 'python3-windows-3.11.2-amd64.zip';
67-
4: Result := 'python3-windows-3.12.0-amd64.zip';
65+
2: Result := 'python3-windows-3.10.11-amd64.zip';
66+
3: Result := 'python3-windows-3.11.9-amd64.zip';
67+
4: Result := 'python3-windows-3.12.7-amd64.zip';
68+
5: Result := 'python3-windows-3.13.0-amd64.zip';
6869
else
6970
Result := String.Empty;
7071
end;

‎src/Project/IDE/Deploy/iOS/PyEnvironment.Project.IDE.Deploy.iOSDevice64.pas

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,13 @@ function TPyEnvironmentProjectDeployIOSDevice64.GetPlatform: TPyEnvironmentProje
5959

6060
function TPyEnvironmentProjectDeployIOSDevice64.GetPythonBundleName: string;
6161
begin
62-
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12']) of
62+
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']) of
6363
0: Result := 'python3-ios-3.8.18-iphoneos.arm64.zip';
6464
1: Result := 'python3-ios-3.9.18-iphoneos.arm64.zip';
6565
2: Result := 'python3-ios-3.10.13-iphoneos.arm64.zip';
6666
3: Result := 'python3-ios-3.11.6-iphoneos.arm64.zip';
6767
4: Result := 'python3-ios-3.12.0-iphoneos.arm64.zip';
68+
5: Result := 'python3-ios-3.13.0-iphoneos.arm64.zip';
6869
else
6970
Result := String.Empty;
7071
end;

‎src/Project/IDE/Deploy/iOS/PyEnvironment.Project.IDE.Deploy.iOSSimARM64.pas

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,13 @@ function TPyEnvironmentProjectDeployIOSSimARM64.GetPlatform: TPyEnvironmentProje
5959

6060
function TPyEnvironmentProjectDeployIOSSimARM64.GetPythonBundleName: string;
6161
begin
62-
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12']) of
62+
case IndexStr(GetPythonVersion(), ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']) of
6363
0: Result := 'python3-ios-3.8.18-iphonesimulator.arm64.zip';
6464
1: Result := 'python3-ios-3.9.18-iphonesimulator.arm64.zip';
6565
2: Result := 'python3-ios-3.10.13-iphonesimulator.arm64.zip';
6666
3: Result := 'python3-ios-3.11.6-iphonesimulator.arm64.zip';
6767
4: Result := 'python3-ios-3.12.0-iphonesimulator.arm64.zip';
68+
5: Result := 'python3-ios-3.13.0-iphonesimulator.arm64.zip';
6869
else
6970
Result := String.Empty;
7071
end;

0 commit comments

Comments
 (0)
Please sign in to comment.