update and test

BB9z · Jul 6, 2024 · fedd76c · fedd76c
1 parent 12dbe96
commit fedd76c
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,4 +13,4 @@ jobs:
         ./make-xcframework.sh
       env:
         # Seems unable build visionOS at the moment
-        B9_BUILD_VISION_OS: false
+        B9_BUILD_VISION_OS: true
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ This project aims to archive [LAME](https://lame.sourceforge.io) into the xcfram
 
 LAME.xcframework | Build with   | macOS  | iOS   | tvOS  | watchOS | visionOS
 -----------------|--------------|--------|-------|-------|---------|---------
-3.100.1          | Xcode 15.2   | 10.13+ | 12.0+ | 12.0+ | 4.0+    | 1.0+
+3.100.2          | Xcode 15.4   | 10.13+ | 12.0+ | 12.0+ | 4.0+    | 1.0+
 3.100.0          | Xcode 12.5.1 | 10.10+ |  9.0+ |  9.0+ | 2.0+    | NA
 
 ## 集成

diff --git a/SwiftPM/dummy.c b/SwiftPM/dummy.c
diff --git a/SwiftPM/include/dummy.h b/SwiftPM/include/dummy.h
diff --git a/macosx/Lame-Framework.xcconfig b/macosx/Lame-Framework.xcconfig
@@ -11,11 +11,12 @@ DEFINES_MODULE = YES;
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = $(CURRENT_PROJECT_VERSION);
 DYLIB_INSTALL_NAME_BASE = @rpath;
-FRAMEWORK_VERSION = A;
+ENABLE_MODULE_VERIFIER = YES;
 GCC_PRECOMPILE_PREFIX_HEADER = YES;
 GCC_PREFIX_HEADER = LAME_Prefix.pch;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = Info.plist;
+LD_RUNPATH_SEARCH_PATHS = @executable_path/Frameworks @loader_path/Frameworks;
 MACH_O_TYPE = mh_dylib;
 PRODUCT_BUNDLE_IDENTIFIER = net.sourceforge.LAMEframework;
 PRODUCT_MODULE_NAME = LAME;

diff --git a/macosx/make-xcframework.sh b/macosx/make-xcframework.sh
@@ -2,6 +2,7 @@
 
 # Build all platform targets and package them into the xcframework.
 # Set `B9_BUILD_VISION_OS` environment variable to 0 can disable building for visionOS.
+# Set `B9_BUILD_SYMBOLS` environment variable to 0 can disable including debug symbols in the xcframework.
 #
 # Copyright © 2021, 2024 BB9z.
 # https://github.com/BB9z/LAME-xcframework
@@ -57,10 +58,14 @@ function xcbuild() {
 echo "$PWD"
 
 readonly B9_BUILD_VISION_OS=${B9_BUILD_VISION_OS:=1}
+readonly B9_BUILD_SYMBOLS=${B9_BUILD_SYMBOLS:=1}
 
 if [[ $(checkVar "$B9_BUILD_VISION_OS") != 0 ]]; then
     echo "Skip building for visionOS."
 fi
+if [[ $(checkVar "$B9_BUILD_SYMBOLS") != 0 ]]; then
+    echo "Skip including debug symbols."
+fi
 
 ## Clean
 
@@ -71,6 +76,11 @@ else
     echo "No previous build, go on."
 fi
 
+if [ -d "build" ]; then
+    echo "Clean build directory."
+    rm -r "build"
+fi
+
 ## Build
 
 xcbuild LAME-macOS "generic/platform=macOS" "build/macOS"
@@ -105,10 +115,14 @@ fi
 packageCmds=("xcodebuild" "-create-xcframework")
 for part in "${archivePaths[@]}"; do
     packageCmds+=("-framework" "$part/Products/Library/Frameworks/LAME.framework")
+    if [[ $(checkVar "$B9_BUILD_SYMBOLS") == 0 ]]; then
+        # -debug-symbols requires full path
+        packageCmds+=(-debug-symbols "$PWD/$part/dSYMs/LAME.framework.dSYM")
+    fi
 done
 packageCmds+=("-output" "LAME.xcframework")
 
 echo "${packageCmds[*]}"
 "${packageCmds[@]}"
 
-echo "✅ Done."
+echo "✅ Make xcframework done."
diff --git a/make-package.command b/make-package.command
@@ -17,7 +17,9 @@ sh ./make-xcframework.sh
 cd "$ROOT_DIR"
 
 mv "$ROOT_DIR/macosx/LAME.xcframework" "$ROOT_DIR"
-zip -r -9 LAME.xcframework.zip LAME.xcframework LICENSE LICENSE-LAME
+zip -r -9 LAME.xcframework.zip LAME.xcframework LICENSE LICENSE-LAME COPYING
 
 checksum=$(swift package compute-checksum LAME.xcframework.zip)
 echo "Checksum: $checksum"
+
+echo "✅ Successfully packaged LAME.xcframework at $ROOT_DIR/LAME.xcframework.zip"
diff --git a/make-xcframwork.command b/make-xcframwork.command
@@ -7,7 +7,6 @@
 
 set -euo pipefail
 cd "$(dirname "$0")/macosx"
-echo "$PWD"
 
 if [ -x "$(command -v xcpretty)" ]; then
     sh ./make-xcframework.sh | xcpretty