diff --git a/binding.gyp b/binding.gyp index 033e05e1..b719727e 100644 --- a/binding.gyp +++ b/binding.gyp @@ -56,7 +56,7 @@ ] }, "copies": [{ - "files": ["<(module_root_dir)/ffi/osx-x86_64/libpact_ffi.dylib"], + "files": ["<(module_root_dir)/ffi/macos-x86_64/libpact_ffi.dylib"], "destination": "<(PRODUCT_DIR)" }], } @@ -79,7 +79,7 @@ ] }, "copies": [{ - "files": ["<(module_root_dir)/ffi/osx-aarch64/libpact_ffi.dylib"], + "files": ["<(module_root_dir)/ffi/macos-aarch64/libpact_ffi.dylib"], "destination": "<(PRODUCT_DIR)" }], } diff --git a/script/download-libs.sh b/script/download-libs.sh index e0459a1c..8402cbac 100755 --- a/script/download-libs.sh +++ b/script/download-libs.sh @@ -3,4 +3,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the . "${SCRIPT_DIR}/lib/export-binary-versions.sh" "${SCRIPT_DIR}/lib/download-ffi.sh" -"${SCRIPT_DIR}/lib/download-plugins.sh" \ No newline at end of file +"${SCRIPT_DIR}/download-plugins.sh" \ No newline at end of file diff --git a/script/lib/download-ffi.sh b/script/lib/download-ffi.sh index cd4aef00..a58a8b6f 100755 --- a/script/lib/download-ffi.sh +++ b/script/lib/download-ffi.sh @@ -18,11 +18,11 @@ fi warn "Cleaning ffi directory $FFI_DIR" rm -rf "${FFI_DIR:?}" -mkdir -p "$FFI_DIR/osx-x86_64" +mkdir -p "$FFI_DIR/macos-x86_64" mkdir -p "$FFI_DIR/linux-x86_64" mkdir -p "$FFI_DIR/linux-musl-x86_64" mkdir -p "$FFI_DIR/windows-x86_64" -mkdir -p "$FFI_DIR/osx-aarch64" +mkdir -p "$FFI_DIR/macos-aarch64" mkdir -p "$FFI_DIR/linux-aarch64" mkdir -p "$FFI_DIR/linux-musl-aarch64" @@ -69,8 +69,8 @@ if [ -z "${ONLY_DOWNLOAD_PACT_FOR_WINDOWS:-}" ]; then download_ffi "linux-aarch64.so.gz" "lib" "linux-aarch64/libpact_ffi.so.gz" download_ffi "linux-x86_64-musl.so.gz" "lib" "linux-musl-x86_64/libpact_ffi_musl.so.gz" download_ffi "linux-aarch64-musl.so.gz" "lib" "linux-musl-aarch64/libpact_ffi_musl.so.gz" - download_ffi "osx-x86_64.dylib.gz" "lib" "osx-x86_64/libpact_ffi.dylib.gz" - download_ffi "osx-aarch64.dylib.gz" "lib" "osx-aarch64/libpact_ffi.dylib.gz" + download_ffi "macos-x86_64.dylib.gz" "lib" "macos-x86_64/libpact_ffi.dylib.gz" + download_ffi "macos-aarch64.dylib.gz" "lib" "macos-aarch64/libpact_ffi.dylib.gz" else warn "Skipped download of non-windows FFI libs because ONLY_DOWNLOAD_PACT_FOR_WINDOWS is set" fi