Skip to content

Commit 495b371

Browse files
committed
Make LDK use c bindings base and ldk binary directory env variables, and force build_xcode_frameworks.sh to override user-defined settings.
1 parent ddb3202 commit 495b371

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

.github/workflows/build-frameworks.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ jobs:
3939
workspace: LDKFramework.xcworkspace
4040
env:
4141
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
42+
LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ci/ldk-c-bindings
43+
LDK_C_BINDINGS_BINARY_DIRECTORY: /home/runner/work/ldk-swift/ldk-swift/xcode/LDK
4244
steps:
4345
- name: Configure Xcode
4446
uses: maxim-lobanov/setup-xcode@v1

xcode/LDK/LDKFramework.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2528,7 +2528,6 @@
25282528
);
25292529
INFOPLIST_KEY_NSHumanReadableCopyright = "";
25302530
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2531-
LDK_DIRECTORY = "${PROJECT_DIR}/../../bindings/artifacts/ldk-c-bindings";
25322531
LD_RUNPATH_SEARCH_PATHS = (
25332532
"$(inherited)",
25342533
"@executable_path/../Frameworks",
@@ -2565,7 +2564,6 @@
25652564
);
25662565
INFOPLIST_KEY_NSHumanReadableCopyright = "";
25672566
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2568-
LDK_DIRECTORY = "${PROJECT_DIR}/../../bindings/artifacts/ldk-c-bindings";
25692567
LD_RUNPATH_SEARCH_PATHS = (
25702568
"$(inherited)",
25712569
"@executable_path/../Frameworks",
@@ -2742,7 +2740,6 @@
27422740
INFOPLIST_KEY_NSHumanReadableCopyright = "";
27432741
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
27442742
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
2745-
LDK_DIRECTORY = "${PROJECT_DIR}/../../bindings/artifacts/ldk-c-bindings";
27462743
LD_RUNPATH_SEARCH_PATHS = (
27472744
"$(inherited)",
27482745
"@executable_path/Frameworks",
@@ -2779,7 +2776,6 @@
27792776
INFOPLIST_KEY_NSHumanReadableCopyright = "";
27802777
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
27812778
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
2782-
LDK_DIRECTORY = "${PROJECT_DIR}/../../bindings/artifacts/ldk-c-bindings";
27832779
LD_RUNPATH_SEARCH_PATHS = (
27842780
"$(inherited)",
27852781
"@executable_path/Frameworks",

xcode/LDK/build-libldk.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ if ! [[ -x "$(command -v cargo)" ]]; then
1111
fi
1212

1313
set -e # stop execution upon the first error
14-
15-
C_BINDINGS_SOURCE_DIRECTORY="$(cd ${LDK_DIRECTORY}; pwd)/lightning-c-bindings"
14+
C_BINDINGS_SOURCE_DIRECTORY="$(cd ${LDK_C_BINDINGS_BASE}; pwd)/lightning-c-bindings"
1615

1716
# https://stackoverflow.com/a/4774063/299711
1817
BASEDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
@@ -96,7 +95,8 @@ if [[ ${ACTION:-build} = "build" || $ACTION = "install" ]]; then
9695
rustup override unset
9796

9897
mkdir -p "${BUILT_PRODUCTS_DIR}"
99-
xcrun --sdk $PLATFORM_NAME lipo -create "${EXECUTABLES[@]}" -output "${PROJECT_DIR}/${TARGET_NAME}.a"
98+
# xcrun --sdk $PLATFORM_NAME lipo -create "${EXECUTABLES[@]}" -output "${PROJECT_DIR}/${TARGET_NAME}.a"
99+
xcrun --sdk $PLATFORM_NAME lipo -create "${EXECUTABLES[@]}" -output "${LDK_C_BINDINGS_BINARY_DIRECTORY}/${TARGET_NAME}.a"
100100

101101
# print a newline at the end
102102
echo "" >> $BUILD_LOG_PATH

xcode/build_xcode_frameworks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ do
5757
find "${CURRENT_ARCHIVE_DIRECTORY}" -mindepth 1 -delete
5858
find "${CURRENT_DERIVED_DATA_DIRECTORY}" -mindepth 1 -delete
5959

60-
LDK_C_BINDINGS_BASE="${LDK_DIRECTORY}" LDK_C_BINDINGS_BINARY_DIRECTORY="${CURRENT_LIPO_DIRECTORY_PATH}" xcodebuild archive -verbose -project "${BASEDIR}/LDKFramework/LDKFramework.xcodeproj" -scheme LDKFramework -destination "generic/platform=${CURRENT_DESTINATION_NAME}" -derivedDataPath "${CURRENT_DERIVED_DATA_DIRECTORY}" -archivePath "${CURRENT_ARCHIVE_PATH}" ENABLE_BITCODE=NO EXCLUDED_ARCHS="i386 armv7" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES
60+
LDK_C_BINDINGS_BASE="${LDK_DIRECTORY}" LDK_C_BINDINGS_BINARY_DIRECTORY="${CURRENT_LIPO_DIRECTORY_PATH}" xcodebuild archive -verbose -project "${BASEDIR}/LDKFramework/LDKFramework.xcodeproj" -scheme LDKFramework -destination "generic/platform=${CURRENT_DESTINATION_NAME}" -derivedDataPath "${CURRENT_DERIVED_DATA_DIRECTORY}" -archivePath "${CURRENT_ARCHIVE_PATH}" ENABLE_BITCODE=NO EXCLUDED_ARCHS="i386 armv7" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES LDK_C_BINDINGS_BASE="${LDK_DIRECTORY}" LDK_C_BINDINGS_BINARY_DIRECTORY="${CURRENT_LIPO_DIRECTORY_PATH}"
6161

6262
XCFRAMEWORK_INPUT_FLAGS="${XCFRAMEWORK_INPUT_FLAGS}-framework ${CURRENT_ARCHIVE_PATH}.xcarchive/Products/Library/Frameworks/LDKFramework.framework "
6363
echo "Current xcframework flags: ${XCFRAMEWORK_INPUT_FLAGS}" >> $BUILD_LOG_PATH

0 commit comments

Comments
 (0)