build script issues

ShadowsocksR-Live · Jun 8, 2024 · 3d6d56f · 3d6d56f
1 parent 0b547f6
commit 3d6d56f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -66,19 +66,19 @@ jobs:
           else
             cargo build --all-features --release --target ${{ matrix.target }}
           fi
-          cbindgen -c cbindgen.toml -l C -o target/overtls-ffi.h
+          cbindgen -c cbindgen.toml -l C --cpp-compat -o ./overtls.h
           if [[ "${{ matrix.host_os }}" == "windows-latest" ]]; then
-            powershell Compress-Archive -Path target/${{ matrix.target }}/release/overtls.exe, ./config.json, target/overtls-ffi.h, target/${{ matrix.target }}/release/overtls.dll -DestinationPath release/overtls-${{ matrix.target }}.zip
+            powershell Compress-Archive -Path target/${{ matrix.target }}/release/overtls.exe, ./config.json, ./overtls.h, target/${{ matrix.target }}/release/overtls.dll -DestinationPath release/overtls-${{ matrix.target }}.zip
           elif [[ "${{ matrix.host_os }}" == "macos-latest" ]]; then
-            zip -j release/overtls-${{ matrix.target }}.zip target/${{ matrix.target }}/release/overtls ./config.json target/overtls-ffi.h target/${{ matrix.target }}/release/libovertls.dylib
+            zip -j release/overtls-${{ matrix.target }}.zip target/${{ matrix.target }}/release/overtls ./config.json ./overtls.h target/${{ matrix.target }}/release/libovertls.dylib
             if [[ "${{ matrix.target }}" == "x86_64-apple-darwin" ]]; then
               ./build-aarch64-apple-ios.sh
               zip -r release/overtls-aarch64-apple-ios-xcframework.zip ./overtls.xcframework/
               ./build-apple.sh
               zip -r release/overtls-apple-xcframework.zip ./overtls.xcframework/
             fi
           elif [[ "${{ matrix.host_os }}" == "ubuntu-latest" ]]; then
-            zip -j release/overtls-${{ matrix.target }}.zip target/${{ matrix.target }}/release/overtls ./config.json target/overtls-ffi.h target/${{ matrix.target }}/release/libovertls.so
+            zip -j release/overtls-${{ matrix.target }}.zip target/${{ matrix.target }}/release/overtls ./config.json ./overtls.h target/${{ matrix.target }}/release/libovertls.so
           fi
 
           if [[ "${{ matrix.target }}" == "x86_64-unknown-linux-gnu" ]]; then

diff --git a/build-aarch64-apple-ios-debug.sh b/build-aarch64-apple-ios-debug.sh
@@ -12,11 +12,10 @@ cargo build --target aarch64-apple-ios
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C -o target/include/overtls.h
+cbindgen --config cbindgen.toml -l C --cpp-compat -o target/include/overtls.h
 cat > target/include/overtls.modulemap <<EOF
 framework module overtls {
     umbrella header "overtls.h"
-
     export *
     module * { export * }
 }

diff --git a/build-aarch64-apple-ios.sh b/build-aarch64-apple-ios.sh
@@ -12,11 +12,10 @@ cargo build --release --target aarch64-apple-ios
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C -o target/include/overtls.h
+cbindgen --config cbindgen.toml -l C --cpp-compat -o target/include/overtls.h
 cat > target/include/overtls.modulemap <<EOF
 framework module overtls {
     umbrella header "overtls.h"
-
     export *
     module * { export * }
 }

diff --git a/build-apple.sh b/build-apple.sh
@@ -26,11 +26,10 @@ cargo build --release --target aarch64-apple-ios-sim
 echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
-cbindgen --config cbindgen.toml -l C -o target/include/overtls.h
+cbindgen --config cbindgen.toml -l C --cpp-compat -o target/include/overtls.h
 cat > target/include/overtls.modulemap <<EOF
 framework module overtls {
     umbrella header "overtls.h"
-
     export *
     module * { export * }
 }