Allow lipo binary path output override from env

Author: arik-so

src/scripts/build_bulk_libldks.py

@@ -9,12 +9,17 @@
 
 
 def parse_config() -> ScriptConfig:
-	config = ScriptConfig.parse(allow_ldk_argument=True, parse_configuration=(not CALL_INDIVIDUAL_BUILD_METHOD_VIA_SHELL))
-
-	individual_configurations: [BuildConfig] = [BuildConfig('iphoneos', '', ['arm64']),
-												BuildConfig('iphonesimulator', '-simulator', ['arm64', 'x86_64']),
-												BuildConfig('macosx', '', ['arm64', 'x86_64']),
-												BuildConfig('macosx', '-macabi', ['arm64', 'x86_64']), ]
+	config = ScriptConfig.parse(
+		allow_ldk_argument=True,
+		parse_configuration=(not CALL_INDIVIDUAL_BUILD_METHOD_VIA_SHELL)
+	)
+
+	individual_configurations: [BuildConfig] = [
+		BuildConfig('iphoneos', '', ['arm64']),
+		BuildConfig('iphonesimulator', '-simulator', ['arm64', 'x86_64']),
+		BuildConfig('macosx', '', ['arm64', 'x86_64']),
+		BuildConfig('macosx', '-macabi', ['arm64', 'x86_64'])
+	]
 
 	config.LIBLDK_BUILD_CONFIGURATIONS = individual_configurations
 

src/scripts/build_individual_libldk.py

@@ -5,11 +5,6 @@
 from script_config import ScriptConfig, BuildConfig
 
 
-def parse_config() -> ScriptConfig:
-	config = ScriptConfig.parse(allow_ldk_argument=False, parse_configuration=True)
-	return config
-
-
 def run(config: ScriptConfig):
 	if len(config.LIBLDK_BUILD_CONFIGURATIONS) != 1:
 		print('Individual libldk build must have exactly 1 build configuration.')
@@ -34,8 +29,20 @@ def run(config: ScriptConfig):
 	print('Configuration:', config.RUST_CONFIGURATION)
 	print('LLVM Target Triple Suffix:', llvm_target_triple_suffix)
 
-	individual_architecture_binary_directory = os.path.join(build_products_directory, config.RUST_CONFIGURATION, human_readable_platform, 'raw')
-	lipo_binary_directory = os.path.join(build_products_directory, config.RUST_CONFIGURATION, human_readable_platform, 'lipo')
+	individual_architecture_binary_directory = os.path.join(
+		build_products_directory,
+		config.RUST_CONFIGURATION,
+		human_readable_platform,
+		'raw'
+	)
+	lipo_binary_directory = os.path.join(
+		build_products_directory,
+		config.RUST_CONFIGURATION,
+		human_readable_platform,
+		'lipo'
+	)
+	if config.LIPO_BINARY_OUTPUT_DIRECTORY:
+		lipo_binary_directory = config.LIPO_BINARY_OUTPUT_DIRECTORY
 	lipo_binary_output_path = os.path.join(lipo_binary_directory, 'libldk.a')
 
 	print(individual_architecture_binary_directory)
@@ -50,7 +57,10 @@ def run(config: ScriptConfig):
 	lipo_executables_input: [str] = []
 
 	for current_architecture in architectures:
-		current_architecture_binary_directory = os.path.join(individual_architecture_binary_directory, current_architecture)
+		current_architecture_binary_directory = os.path.join(
+			individual_architecture_binary_directory,
+			current_architecture
+		)
 		print(f'\nCurrent architecture:', current_architecture)
 
 		rust_architecture = current_architecture
@@ -64,7 +74,13 @@ def run(config: ScriptConfig):
 		print('Rust architecture:', rust_architecture)
 		print('Rust target OS:', rust_target_os)
 
-		cargo_raw_binary_origin = os.path.join(config.LDK_C_BINDINGS_DIRECTORY, 'target', f'{rust_architecture}-apple-{rust_target_os}', config.RUST_CONFIGURATION, 'libldk.a')
+		cargo_raw_binary_origin = os.path.join(
+			config.LDK_C_BINDINGS_DIRECTORY,
+			'target',
+			f'{rust_architecture}-apple-{rust_target_os}',
+			config.RUST_CONFIGURATION,
+			'libldk.a'
+		)
 		print('Raw binary origin:', cargo_raw_binary_origin)
 		print('Raw binary target:', current_architecture_binary_directory)
 
@@ -74,7 +90,12 @@ def run(config: ScriptConfig):
 		subprocess.check_call(['cargo', 'clean'], cwd=config.LDK_C_BINDINGS_DIRECTORY)
 
 		# cargo build -Z build-std=panic_abort,std --features "std" --target "${RUST_ARCH}-apple-${RUST_TARGET_OS}" $RUST_CONFIGURATION_FLAG
-		subprocess.check_call(['cargo', 'build', '-Z', 'build-std=panic_abort,std', '--features', 'std', '--target', f'{rust_architecture}-apple-{rust_target_os}', config.RUST_CONFIGURATION_FLAG], env=child_environment, cwd=config.LDK_C_BINDINGS_DIRECTORY)
+		subprocess.check_call(
+			['cargo', 'build', '-Z', 'build-std=panic_abort,std', '--features', 'std', '--target',
+				f'{rust_architecture}-apple-{rust_target_os}', config.RUST_CONFIGURATION_FLAG],
+			env=child_environment,
+			cwd=config.LDK_C_BINDINGS_DIRECTORY
+		)
 
 		# copy the generated binary to a monitored directory
 		subprocess.check_call(['cp', cargo_raw_binary_origin, current_architecture_binary_directory])
@@ -83,11 +104,17 @@ def run(config: ScriptConfig):
 	subprocess.check_call(['rustup', 'override', 'unset'], cwd=config.LDK_C_BINDINGS_DIRECTORY)
 
 	# xcrun --sdk $PLATFORM_NAME lipo -create "${EXECUTABLES[@]}" -output "${LIPO_BINARY_DIR}/${TARGET_NAME}.a"
-	subprocess.check_call(['xcrun', '--sdk', platform, 'lipo', '-create', *lipo_executables_input, '-output', lipo_binary_output_path])
+	subprocess.check_call(
+		['xcrun', '--sdk', platform, 'lipo', '-create', *lipo_executables_input, '-output', lipo_binary_output_path]
+	)
 
 
 if __name__ == '__main__':
-	script_config = parse_config()
+	script_config = ScriptConfig.parse(
+		allow_ldk_argument=False,
+		parse_configuration=True,
+		parse_lipo_output_directory=True
+	)
 
 	platform = os.getenv('PLATFORM')
 	llvm_target_triple_suffix = os.getenv('LLVM_TARGET_TRIPLE_SUFFIX')

src/scripts/prepare_headers.py

@@ -10,7 +10,9 @@ def run(config: ScriptConfig):
 		os.path.join(config.LDK_C_BINDINGS_BASE, 'ldk-net'),
 	]
 
-	header_destination_directory = os.path.realpath(os.path.join(os.path.dirname(__file__), '../../xcode/LDKFramework/headers'))
+	header_destination_directory = os.path.realpath(
+		os.path.join(os.path.dirname(__file__), '../../xcode/LDKFramework/headers')
+	)
 	os.makedirs(header_destination_directory, exist_ok=True)
 
 	for current_directory in header_directories:

src/scripts/script_config.py

@@ -17,9 +17,10 @@ def __init__(self):
 		self.CONFIGURATION: str = ''
 		self.RUST_CONFIGURATION: str = ''
 		self.RUST_CONFIGURATION_FLAG: str = ''
+		self.LIPO_BINARY_OUTPUT_DIRECTORY: str = ''
 
 	@classmethod
-	def parse(cls, allow_ldk_argument=True, parse_configuration=False):
+	def parse(cls, allow_ldk_argument=True, parse_configuration=False, parse_lipo_output_directory=False):
 
 		ldk_directory_string = os.getenv('LDK_C_BINDINGS_BASE')
 		if allow_ldk_argument and len(sys.argv) > 1:
@@ -52,4 +53,7 @@ def parse(cls, allow_ldk_argument=True, parse_configuration=False):
 				config.RUST_CONFIGURATION = 'release'
 				config.RUST_CONFIGURATION_FLAG = '--release'
 
+		if parse_lipo_output_directory:
+			config.LIPO_BINARY_OUTPUT_DIRECTORY = os.getenv('LDK_C_BINDINGS_BINARY_DIRECTORY')
+
 		return config