ffi: fix python scripts

rust-nostr · Dec 21, 2023 · 338f857 · 338f857
1 parent 6a40e79
commit 338f857
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/bindings/nostr-ffi/bindings-python/scripts/generate-macos-arm64.sh b/bindings/nostr-ffi/bindings-python/scripts/generate-macos-arm64.sh
@@ -11,7 +11,7 @@ rustup target add aarch64-apple-darwin
 cargo build --release --target aarch64-apple-darwin
 
 echo "Generating nostr.py..."
-cargo run -p uniffi-bindgen generate --library ../../target/aarch64-apple-darwin/release/libnostr_ffi.a --language python --no-format -o bindings-python/src/nostr/
+cargo run -p uniffi-bindgen generate --library ../../target/aarch64-apple-darwin/release/libnostr_ffi.dylib --language python --no-format -o bindings-python/src/nostr/
 
 echo "Copying libraries libnostr_ffi.dylib..."
 cp ../../target/aarch64-apple-darwin/release/libnostr_ffi.dylib bindings-python/src/nostr/

diff --git a/bindings/nostr-ffi/bindings-python/scripts/generate-macos-x86_64.sh b/bindings/nostr-ffi/bindings-python/scripts/generate-macos-x86_64.sh
@@ -11,7 +11,7 @@ rustup target add x86_64-apple-darwin
 cargo build --release --target x86_64-apple-darwin
 
 echo "Generating nostr.py..."
-cargo run -p uniffi-bindgen generate --library ../../target/x86_64-apple-darwin/release/libnostr_ffi.a --language python --no-format -o bindings-python/src/nostr/
+cargo run -p uniffi-bindgen generate --library ../../target/x86_64-apple-darwin/release/libnostr_ffi.dylib --language python --no-format -o bindings-python/src/nostr/
 
 echo "Copying libraries libnostr_ffi.dylib..."
 cp ../../target/x86_64-apple-darwin/release/libnostr_ffi.dylib bindings-python/src/nostr/

diff --git a/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-linux-aarch64.sh b/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-linux-aarch64.sh
@@ -4,14 +4,14 @@ set -euo pipefail
 python --version
 pip install -r requirements.txt
 
-echo "Generating nostr_sdk.py..."
-cd ../
-cargo run -p uniffi-bindgen generate src/nostr_sdk.udl --language python --no-format -o bindings-python/src/nostr-sdk/
-
 echo "Generating native binaries..."
 rustup target add aarch64-unknown-linux-gnu
 CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc cargo build --release --target aarch64-unknown-linux-gnu
 
+echo "Generating nostr_sdk.py..."
+cd ../
+cargo run -p uniffi-bindgen generate --library ../../target/aarch64-unknown-linux-gnu/release/libnostr_sdk_ffi.so --language python --no-format -o bindings-python/src/nostr-sdk/
+
 echo "Copying linux libnostr_sdk_ffi.so..."
 cp ../../target/aarch64-unknown-linux-gnu/release/libnostr_sdk_ffi.so bindings-python/src/nostr-sdk/
 

diff --git a/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-linux.sh b/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-linux.sh
@@ -4,13 +4,13 @@ set -euo pipefail
 ${PYBIN}/python --version
 ${PYBIN}/pip install -r requirements.txt
 
-echo "Generating nostr_sdk.py..."
-cd ../
-cargo run -p uniffi-bindgen generate src/nostr_sdk.udl --language python --no-format -o bindings-python/src/nostr-sdk/
-
 echo "Generating native binaries..."
 cargo build --release
 
+echo "Generating nostr_sdk.py..."
+cd ../
+cargo run -p uniffi-bindgen generate --library ../../target/release/libnostr_sdk_ffi.so --language python --no-format -o bindings-python/src/nostr-sdk/
+
 echo "Copying linux libnostr_sdk_ffi.so..."
 cp ../../target/release/libnostr_sdk_ffi.so bindings-python/src/nostr-sdk/
 

diff --git a/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-macos-arm64.sh b/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-macos-arm64.sh
@@ -4,14 +4,14 @@ set -euo pipefail
 python3 --version
 pip install --user -r requirements.txt
 
-echo "Generating nostr_sdk.py..."
-cd ../
-cargo run -p uniffi-bindgen generate src/nostr_sdk.udl --language python --no-format -o bindings-python/src/nostr-sdk/
-
 echo "Generating native binaries..."
 rustup target add aarch64-apple-darwin
 cargo build --release --target aarch64-apple-darwin
 
+echo "Generating nostr_sdk.py..."
+cd ../
+cargo run -p uniffi-bindgen generate --library ../../target/aarch64-apple-darwin/release/libnostr_sdk_ffi.dylib --language python --no-format -o bindings-python/src/nostr-sdk/
+
 echo "Copying libraries libnostr_sdk_ffi.dylib..."
 cp ../../target/aarch64-apple-darwin/release/libnostr_sdk_ffi.dylib bindings-python/src/nostr-sdk/
 

diff --git a/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-macos-x86_64.sh b/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-macos-x86_64.sh
@@ -4,14 +4,14 @@ set -euo pipefail
 python3 --version
 pip install --user -r requirements.txt
 
-echo "Generating nostr_sdk.py..."
-cd ../
-cargo run -p uniffi-bindgen generate src/nostr_sdk.udl --language python --no-format -o bindings-python/src/nostr-sdk/
-
 echo "Generating native binaries..."
 rustup target add x86_64-apple-darwin
 cargo build --release --target x86_64-apple-darwin
 
+echo "Generating nostr_sdk.py..."
+cd ../
+cargo run -p uniffi-bindgen generate --library ../../target/x86_64-apple-darwin/release/libnostr_sdk_ffi.dylib --language python --no-format -o bindings-python/src/nostr-sdk/
+
 echo "Copying libraries libnostr_sdk_ffi.dylib..."
 cp ../../target/x86_64-apple-darwin/release/libnostr_sdk_ffi.dylib bindings-python/src/nostr-sdk/
 

diff --git a/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-windows.sh b/bindings/nostr-sdk-ffi/bindings-python/scripts/generate-windows.sh
@@ -4,14 +4,14 @@ set -euo pipefail
 python3 --version
 pip install --user -r requirements.txt
 
-echo "Generating nostr_sdk.py..."
-cd ../
-cargo run -p uniffi-bindgen generate src/nostr_sdk.udl --language python --no-format -o bindings-python/src/nostr-sdk/
-
 echo "Generating native binaries..."
 rustup target add x86_64-pc-windows-msvc
 cargo build --release --target x86_64-pc-windows-msvc
 
+echo "Generating nostr_sdk.py..."
+cd ../
+cargo run -p uniffi-bindgen generate --library ../../target/x86_64-pc-windows-msvc/release/nostr_sdk_ffi.dll --language python --no-format -o bindings-python/src/nostr-sdk/
+
 echo "Copying libraries nostr_sdk_ffi.dll..."
 cp ../../target/x86_64-pc-windows-msvc/release/nostr_sdk_ffi.dll bindings-python/src/nostr-sdk/