@@ -1045,7 +1045,7 @@ def __init__(self, source, **kwargs):
10451045
10461046 super ().__init__ (source , ** kwargs )
10471047
1048- def historical_setup (self , parallel , test_with_PTY = False ):
1048+ def py313_setup (self , parallel , branch , test_with_PTY = False , ** kwargs ):
10491049 out_of_tree_dir = "build_oot"
10501050 oot_dir_path = os .path .join ("build" , out_of_tree_dir )
10511051 oot_build_path = os .path .join (oot_dir_path , "build" )
@@ -1087,7 +1087,9 @@ def historical_setup(self, parallel, test_with_PTY=False):
10871087
10881088 self .addStep (
10891089 Compile (
1090- name = "Compile build Python" , command = compile , workdir = oot_build_path
1090+ name = "Compile build Python" ,
1091+ command = compile ,
1092+ workdir = oot_build_path ,
10911093 )
10921094 )
10931095
@@ -1096,29 +1098,25 @@ def historical_setup(self, parallel, test_with_PTY=False):
10961098 # library dependencies.
10971099 support_path = f"/Users/buildbot/support/iphonesimulator.{ self .arch } "
10981100 compile_environ = dict (self .compile_environ )
1099- compile_environ .update (
1100- {
1101- "PATH" : os .pathsep .join (
1102- [
1103- # This is intentionally a relative path. Buildbot doesn't expose
1104- # the absolute working directory where the build is running as
1105- # something that can be expanded into an environment variable.
1106- "../../iOS/Resources/bin" ,
1107- "/usr/bin" ,
1108- "/bin" ,
1109- "/usr/sbin" ,
1110- "/sbin" ,
1111- "/Library/Apple/usr/bin" ,
1112- ]
1113- ),
1114- "LIBLZMA_CFLAGS" : f"-I{ support_path } /xz/include" ,
1115- "LIBLZMA_LIBS" : f"-L{ support_path } /xz/lib -llzma" ,
1116- "BZIP2_CFLAGS" : f"-I{ support_path } /bzip2/include" ,
1117- "BZIP2_LIBS" : f"-L{ support_path } /bzip2/lib -lbz2" ,
1118- "LIBFFI_CFLAGS" : f"-I{ support_path } /libffi/include" ,
1119- "LIBFFI_LIBS" : f"-L{ support_path } /libffi/lib -lffi" ,
1120- }
1121- )
1101+ compile_environ .update ({
1102+ "PATH" : os .pathsep .join ([
1103+ # This is intentionally a relative path. Buildbot doesn't expose
1104+ # the absolute working directory where the build is running as
1105+ # something that can be expanded into an environment variable.
1106+ "../../iOS/Resources/bin" ,
1107+ "/usr/bin" ,
1108+ "/bin" ,
1109+ "/usr/sbin" ,
1110+ "/sbin" ,
1111+ "/Library/Apple/usr/bin" ,
1112+ ]),
1113+ "LIBLZMA_CFLAGS" : f"-I{ support_path } /xz/include" ,
1114+ "LIBLZMA_LIBS" : f"-L{ support_path } /xz/lib -llzma" ,
1115+ "BZIP2_CFLAGS" : f"-I{ support_path } /bzip2/include" ,
1116+ "BZIP2_LIBS" : f"-L{ support_path } /bzip2/lib -lbz2" ,
1117+ "LIBFFI_CFLAGS" : f"-I{ support_path } /libffi/include" ,
1118+ "LIBFFI_LIBS" : f"-L{ support_path } /libffi/lib -lffi" ,
1119+ })
11221120
11231121 # Now that we have a "build" architecture Python, we can use that
11241122 # to build a "host" (also known as the target we are cross compiling)
@@ -1189,7 +1187,7 @@ def historical_setup(self, parallel, test_with_PTY=False):
11891187 )
11901188 )
11911189
1192- def current_setup (self ):
1190+ def current_setup (self , parallel , branch , test_with_PTY = False , ** kwargs ):
11931191 build_environ = {
11941192 "CACHE_DIR" : "/Users/buildbot/downloads" ,
11951193 }
@@ -1252,9 +1250,9 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
12521250 # The symlink approach will fail for Python 3.13 *PR* builds, because
12531251 # there's no way to identify the base branch for a PR.
12541252 if branch == "3.13" :
1255- self .historical_setup (parallel , test_with_PTY = test_with_PTY )
1253+ self .py313_setup (parallel , branch , test_with_PTY = test_with_PTY , ** kwargs )
12561254 else :
1257- self .current_setup ()
1255+ self .current_setup (parallel , branch , test_with_PTY = test_with_PTY , ** kwargs )
12581256
12591257
12601258class IOSARM64SimulatorBuild (_IOSSimulatorBuild ):
0 commit comments