Linux target to gnu

adityapk00 · Jul 10, 2019 · e9a2858 · e9a2858
1 parent 2f5abe4
commit e9a2858
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/cli/mkrelease.sh b/cli/mkrelease.sh
@@ -32,7 +32,7 @@ cargo clean
 cargo build --release 
 
 # For Windows and Linux, build via docker
-docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rust/zecpaperwallet:v0.2 bash -c "cd /opt/zecpaperwallet/cli && cargo build --release --target x86_64-unknown-linux-gnu && cargo build --release --target x86_64-pc-windows-gnu && cargo build --release --target aarch64-unknown-linux-gnu"
+docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rust/zecpaperwallet:v0.2 bash -c "cd /opt/zecpaperwallet/cli && cargo build --release && cargo build --release --target x86_64-pc-windows-gnu && cargo build --release --target aarch64-unknown-linux-gnu"
 
 # Now sign and zip the binaries
 #macOS
@@ -51,7 +51,7 @@ cd ..
 #Linux
 rm -rf target/linux-zecpaperwallet-v$APP_VERSION
 mkdir -p target/linux-zecpaperwallet-v$APP_VERSION
-cp target/x86_64-unknown-linux-gnu/release/zecpaperwallet target/linux-zecpaperwallet-v$APP_VERSION/
+cp target/release/zecpaperwallet target/linux-zecpaperwallet-v$APP_VERSION/
 gpg --batch --output target/linux-zecpaperwallet-v$APP_VERSION/zecpaperwallet.sig --detach-sig target/linux-zecpaperwallet-v$APP_VERSION/zecpaperwallet
 cd target
 cd linux-zecpaperwallet-v$APP_VERSION

diff --git a/ui/mkrelease.sh b/ui/mkrelease.sh
@@ -74,7 +74,6 @@ echo "[OK]"
 # Run inside docker container
 docker run --rm -v ${PWD}/..:/opt/zecpaperwallet zecwallet/compileenv:v0.8 bash -c "cd /opt/zecpaperwallet/ui && ./mkdockerwinlinux.sh -v $APP_VERSION"
 
-
 # Move to build the cli
 cd ../cli
 
@@ -86,7 +85,7 @@ echo "pub fn version() -> &'static str { &\"$APP_VERSION\" }" > src/version.rs
 cargo build --release 
 
 # For Windows and Linux, build via docker
-docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rust/zecpaperwallet:v0.3 bash -c "cd /opt/zecpaperwallet/cli && cargo build --release --target x86_64-unknown-linux-musl && cargo build --release --target x86_64-pc-windows-gnu && cargo build --release --target aarch64-unknown-linux-gnu && cargo build --release --target armv7-unknown-linux-gnueabihf"
+docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rust/zecpaperwallet:v0.3 bash -c "cd /opt/zecpaperwallet/cli && cargo build --release  && cargo build --release --target x86_64-pc-windows-gnu && cargo build --release --target aarch64-unknown-linux-gnu && cargo build --release --target armv7-unknown-linux-gnueabihf"
 
 # Come back and package everything
 cd ../ui
@@ -105,7 +104,7 @@ cd ..
 
 
 #Linux
-cp ../cli/target/x86_64-unknown-linux-musl/release/zecpaperwallet artifacts/linux-zecpaperwallet-v$APP_VERSION/
+cp ../cli/target/release/zecpaperwallet artifacts/linux-zecpaperwallet-v$APP_VERSION/
 gpg --batch --output artifacts/linux-zecpaperwallet-v$APP_VERSION/zecpaperwallet.sig --detach-sig artifacts/linux-zecpaperwallet-v$APP_VERSION/zecpaperwallet
 gpg --batch --output artifacts/linux-zecpaperwallet-v$APP_VERSION/zecpaperwalletui.sig --detach-sig artifacts/linux-zecpaperwallet-v$APP_VERSION/zecpaperwalletui
 cd artifacts