Rename LDK binary override directory config property to signal that its being set is used for forcing binary rebuilds.

Author: arik-so

.github/actions/build-for-testing/action.yml

@@ -28,4 +28,4 @@ runs:
                   CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \
                   LDK_C_BINDINGS_BASE="${LDK_C_BINDINGS_BASE}" \
                   LDK_C_BINDINGS_BINARY_DIRECTORY="" \
-                  LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE="${LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE}"
+                  LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY="${LDK_C_BINDINGS_BINARY_DIRECTORY}"

.github/workflows/build-frameworks.yml

@@ -40,7 +40,7 @@ jobs:
         env:
             DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
             LDK_C_BINDINGS_BASE: /Users/runner/work/ldk-swift/ldk-swift/bindings/artifacts/ldk-c-bindings
-            LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE: /Users/runner/work/ldk-swift/ldk-swift/bindings/artifacts/bin
+            LDK_C_BINDINGS_BINARY_DIRECTORY: /Users/runner/work/ldk-swift/ldk-swift/bindings/artifacts/bin
         steps:
             -   name: Configure Xcode
                 uses: maxim-lobanov/setup-xcode@v1

src/scripts/generate_xcframework.py

@@ -81,7 +81,7 @@ def run(config: ScriptConfig):
 				'BUILD_LIBRARY_FOR_DISTRIBUTION=YES',
 				f'LDK_C_BINDINGS_BASE="{config.LDK_C_BINDINGS_BASE}"',
 				f'LDK_C_BINDINGS_BINARY_DIRECTORY="{lipo_binary_directory}"',
-				f'LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE=""',
+				f'LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY=""',
 			], env=child_environment
 		)
 

xcode/LDKFramework/LDKFramework.xcodeproj/project.pbxproj

@@ -1352,7 +1352,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "echo \"Copying headers…\"\necho \"LDK_C_BINDINGS_BASE: ${LDK_C_BINDINGS_BASE}\"\nSCRIPT_PATH=\"${PROJECT_DIR}/../../src/scripts/prepare_headers.py\"\n# copy headers\n/usr/bin/python3 \"${SCRIPT_PATH}\"\n\necho \"Building LDK binaries if necessary…\"\necho \"LDK_C_BINDINGS_BINARY_DIRECTORY: ${LDK_C_BINDINGS_BINARY_DIRECTORY}\"\necho \"LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE: ${LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE}\"\n\nif [[ -z \"${LDK_C_BINDINGS_BINARY_DIRECTORY}\" ]]; then\n    echo \"LDK_C_BINDINGS_BINARY_DIRECTORY undefined, building deemed necessary\"\n    if [[ -z \"${LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE}\" ]]; then\n        echo \"LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE undefined, build impossible without destination\"\n        exit 1\n    fi\n    export LDK_C_BINDINGS_BINARY_DIRECTORY=\"${LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE}\"\n    SCRIPT_PATH=\"${PROJECT_DIR}/../../src/scripts/build_individual_libldk.py\"\n    # build binary\n    /usr/bin/python3 \"${SCRIPT_PATH}\"\nelse\n    echo \"LDK_C_BINDINGS_BINARY_DIRECTORY is set, building unnecessary.\"\nfi\n";
+			shellScript = "echo \"Copying headers…\"\necho \"LDK_C_BINDINGS_BASE: ${LDK_C_BINDINGS_BASE}\"\nSCRIPT_PATH=\"${PROJECT_DIR}/../../src/scripts/prepare_headers.py\"\n# copy headers\n/usr/bin/python3 \"${SCRIPT_PATH}\"\n\necho \"Building LDK binaries if necessary…\"\necho \"LDK_C_BINDINGS_BINARY_DIRECTORY: ${LDK_C_BINDINGS_BINARY_DIRECTORY}\"\necho \"LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY: ${LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY}\"\n\nif [[ -z \"${LDK_C_BINDINGS_BINARY_DIRECTORY}\" ]]; then\n    echo \"LDK_C_BINDINGS_BINARY_DIRECTORY undefined, building deemed necessary\"\n    if [[ -z \"${LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY}\" ]]; then\n        echo \"LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY undefined, build impossible without destination\"\n        exit 1\n    fi\n    export LDK_C_BINDINGS_BINARY_DIRECTORY=\"${LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY}\"\n    SCRIPT_PATH=\"${PROJECT_DIR}/../../src/scripts/build_individual_libldk.py\"\n    # build binary\n    /usr/bin/python3 \"${SCRIPT_PATH}\"\nelse\n    echo \"LDK_C_BINDINGS_BINARY_DIRECTORY is set, building unnecessary.\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -1790,10 +1790,10 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
 				LDK_C_BINDINGS_BASE = "/Users/arik/Developer/ldk-c-bindings";
-				LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE = "${PROJECT_DIR}/binary";
+				LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY = "${PROJECT_DIR}/binary";
 				LIBRARY_SEARCH_PATHS = (
 					"${LDK_C_BINDINGS_BINARY_DIRECTORY}",
-					"${LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE}",
+					"${LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY}",
 				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -1857,10 +1857,10 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
 				LDK_C_BINDINGS_BASE = "/Users/arik/Developer/ldk-c-bindings";
-				LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE = "${PROJECT_DIR}/binary";
+				LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY = "${PROJECT_DIR}/binary";
 				LIBRARY_SEARCH_PATHS = (
 					"${LDK_C_BINDINGS_BINARY_DIRECTORY}",
-					"${LDK_C_BINDINGS_BINARY_DIRECTORY_OVERRIDE}",
+					"${LDK_C_BINDINGS_BINARY_FORCED_REBUILD_OUTPUT_DIRECTORY}",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;