File tree Expand file tree Collapse file tree 4 files changed +6
-8
lines changed Expand file tree Collapse file tree 4 files changed +6
-8
lines changed Original file line number Diff line number Diff line change 39
39
workspace : LDKFramework.xcworkspace
40
40
env :
41
41
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
42
44
steps :
43
45
- name : Configure Xcode
44
46
uses : maxim-lobanov/setup-xcode@v1
Original file line number Diff line number Diff line change 2528
2528
);
2529
2529
INFOPLIST_KEY_NSHumanReadableCopyright = "";
2530
2530
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2531
- LDK_DIRECTORY = "${PROJECT_DIR}/../../bindings/artifacts/ldk-c-bindings";
2532
2531
LD_RUNPATH_SEARCH_PATHS = (
2533
2532
"$(inherited)",
2534
2533
"@executable_path/../Frameworks",
2565
2564
);
2566
2565
INFOPLIST_KEY_NSHumanReadableCopyright = "";
2567
2566
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2568
- LDK_DIRECTORY = "${PROJECT_DIR}/../../bindings/artifacts/ldk-c-bindings";
2569
2567
LD_RUNPATH_SEARCH_PATHS = (
2570
2568
"$(inherited)",
2571
2569
"@executable_path/../Frameworks",
2742
2740
INFOPLIST_KEY_NSHumanReadableCopyright = "";
2743
2741
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2744
2742
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
2745
- LDK_DIRECTORY = "${PROJECT_DIR}/../../bindings/artifacts/ldk-c-bindings";
2746
2743
LD_RUNPATH_SEARCH_PATHS = (
2747
2744
"$(inherited)",
2748
2745
"@executable_path/Frameworks",
2779
2776
INFOPLIST_KEY_NSHumanReadableCopyright = "";
2780
2777
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2781
2778
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
2782
- LDK_DIRECTORY = "${PROJECT_DIR}/../../bindings/artifacts/ldk-c-bindings";
2783
2779
LD_RUNPATH_SEARCH_PATHS = (
2784
2780
"$(inherited)",
2785
2781
"@executable_path/Frameworks",
Original file line number Diff line number Diff line change @@ -11,8 +11,7 @@ if ! [[ -x "$(command -v cargo)" ]]; then
11
11
fi
12
12
13
13
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"
16
15
17
16
# https://stackoverflow.com/a/4774063/299711
18
17
BASEDIR=" $( cd -- " $( dirname " $0 " ) " > /dev/null 2>&1 ; pwd -P ) "
@@ -96,7 +95,8 @@ if [[ ${ACTION:-build} = "build" || $ACTION = "install" ]]; then
96
95
rustup override unset
97
96
98
97
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"
100
100
101
101
# print a newline at the end
102
102
echo " " >> $BUILD_LOG_PATH
Original file line number Diff line number Diff line change 57
57
find " ${CURRENT_ARCHIVE_DIRECTORY} " -mindepth 1 -delete
58
58
find " ${CURRENT_DERIVED_DATA_DIRECTORY} " -mindepth 1 -delete
59
59
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} "
61
61
62
62
XCFRAMEWORK_INPUT_FLAGS=" ${XCFRAMEWORK_INPUT_FLAGS} -framework ${CURRENT_ARCHIVE_PATH} .xcarchive/Products/Library/Frameworks/LDKFramework.framework "
63
63
echo " Current xcframework flags: ${XCFRAMEWORK_INPUT_FLAGS} " >> $BUILD_LOG_PATH
You can’t perform that action at this time.
0 commit comments