Update framework building to always exclude arm64 binaries

Author: arik-so

xcode/LDKFramework_Mac/LDKFramework.modulemap

@@ -0,0 +1,16 @@
+framework module LDKFramework {
+  umbrella header "LDKFramework.h"
+
+  module * { export * }
+  export *
+
+  explicit module LDK {
+    header "ldk_rust_types.h"
+    header "lightning.h"
+    header "ldk_ver.h"
+    header "ldk_net.h"
+    link "libldk.a"
+    export *
+  }
+
+}

xcode/LDKFramework_Mac/LDKFramework.xcodeproj/project.pbxproj

@@ -1777,7 +1777,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
 				INFOPLIST_FILE = LDKFramework/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

xcode/build_framework.sh

@@ -1,19 +1,27 @@
-# export RUSTFLAGS="-Z sanitizer=address"
-# cargo build -Z build-std=panic_abort,std --target x86_64-apple-ios-macabi --release
-
+set -e # bail upon first error
 
 pushd ../bindings/bin
 BIN_OUTPUT_DIRECTORY=`pwd`
-rm -r LDKFramework*
+rm -rf LDKFramework*
 popd
 
 
+## experimental only
+#pushd ./LDKFramework_Mac
+#xcodebuild archive -scheme LDKFramework -destination "platform=macOS,arch=x86_64,variant=Mac Catalyst" -archivePath ${BIN_OUTPUT_DIRECTORY}/LDKFramework-macOS ENABLE_BITCODE=NO ONLY_ACTIVE_ARCH=YES SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
+#popd
+##xcodebuild -create-xcframework \
+##-framework ${BIN_OUTPUT_DIRECTORY}/LDKFramework-macOS.xcarchive/Products/Library/Frameworks/LDKFramework.framework \
+##-output ${BIN_OUTPUT_DIRECTORY}/LDKFramework-only-simulator.xcframework
+#exit 0
+
+
 
 pushd ./LDKFramework
 
 # xcodebuild -list
 
-xcodebuild archive -scheme LDKFramework -destination "generic/platform=iOS" -archivePath ${BIN_OUTPUT_DIRECTORY}/LDKFramework-iOS CLANG_ADDRESS_SANITIZER=NO CLANG_ADDRESS_SANITIZER_ALLOW_ERROR_RECOVERY=NO CLANG_ADDRESS_SANITIZER_USE_AFTER_SCOPE=NO SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
+xcodebuild archive -scheme LDKFramework -destination "generic/platform=iOS" -archivePath ${BIN_OUTPUT_DIRECTORY}/LDKFramework-iOS ENABLE_BITCODE=NO CLANG_ADDRESS_SANITIZER=NO CLANG_ADDRESS_SANITIZER_ALLOW_ERROR_RECOVERY=NO CLANG_ADDRESS_SANITIZER_USE_AFTER_SCOPE=NO SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 xcodebuild archive -scheme LDKFramework -destination "generic/platform=iOS Simulator" -archivePath ${BIN_OUTPUT_DIRECTORY}/LDKFramework-Sim CLANG_ADDRESS_SANITIZER=NO CLANG_ADDRESS_SANITIZER_ALLOW_ERROR_RECOVERY=NO CLANG_ADDRESS_SANITIZER_USE_AFTER_SCOPE=NO SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 
 # xcodebuild archive -scheme LDKFramework-Mac -destination "generic/platform=OS X" -archivePath ${BIN_OUTPUT_DIRECTORY}/LDKFramework-macOS SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
@@ -23,7 +31,7 @@ popd
 
 pushd ./LDKFramework_Mac
 # xcodebuild archive -scheme LDKFramework -destination "platform=macOS,arch=x86_64,variant=Mac Catalyst" -archivePath ${BIN_OUTPUT_DIRECTORY}/LDKFramework-macOS CLANG_ADDRESS_SANITIZER=YES ONLY_ACTIVE_ARCH=YES SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
-xcodebuild archive -scheme LDKFramework -destination "platform=macOS,arch=x86_64,variant=Mac Catalyst" -archivePath ${BIN_OUTPUT_DIRECTORY}/LDKFramework-macOS ONLY_ACTIVE_ARCH=YES SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES 
+xcodebuild archive -scheme LDKFramework -destination "platform=macOS,arch=x86_64,variant=Mac Catalyst" -archivePath ${BIN_OUTPUT_DIRECTORY}/LDKFramework-macOS ENABLE_BITCODE=NO ONLY_ACTIVE_ARCH=YES SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 popd
 
 

xcode/compile_dependency_binaries.sh

@@ -32,7 +32,10 @@ python3 ../ci/fix_header_includes.py $DIRECT_BINDINGS_PROJECT_DIRECTORY
 # build for Catalyst
 pushd $C_BINDINGS_SOURCE_DIRECTORY
 #export RUSTFLAGS=""
+#export RUSTFLAGS="-Z sanitizer=address"
 export RUSTFLAGS="--cfg=c_bindings"
+#export RUSTFLAGS="--cfg=c_bindings -C lto=off -C embed-bitcode=no"
+#export RUSTFLAGS="--cfg=c_bindings -C lto=off -Z embed-bitcode"
 
 rustup override set nightly
 cargo clean