Merge branch 'pin-toml-echo'

This pins toml-echo cargo package version for a more stable build
process.

#25

Author: x1ddos

bitbox-bridge/release/Dockerfile

@@ -80,7 +80,7 @@ RUN rustup target add aarch64-apple-darwin
 
 ##############################
 # toml-echo is a tool for echoing toml variables (like the package.version)
-RUN CARGO_HOME=/opt/cargo cargo install toml-echo
+RUN CARGO_HOME=/opt/cargo cargo install --version 0.3.0 toml-echo
 
 
 ##############################

bitbox-bridge/release/README.md

@@ -15,6 +15,7 @@ Packages (deb/rpm/tar.gz2) will be created without further work.
 * Run `package.cmd`
 
 ## OSX
+* Install "toml-echo", `cargo install --version 0.3.0 toml-echo`.
 * Copy the whole project to an OSX machine
 * Run `bitbox-bridge/release/darwin/package.sh`
 

bitbox-bridge/release/darwin/release.sh

@@ -13,9 +13,6 @@ CARGO_HOME=/tmp/cargo \
 TARGET_CC=aarch64-apple-darwin20.2-clang \
 cargo build --target aarch64-apple-darwin --release
 
-NAME=BitBoxBridge
-VERSION=$(toml-echo bitbox-bridge/Cargo.toml package.version)
-
 (
 	cd bitbox-bridge/release/darwin
 	mkdir -p tmp/opt/shiftcrypto/bitbox-bridge/bin

bitbox-bridge/release/windows/wix/README.md

@@ -1,7 +1,7 @@
 # Package
 
 1. install wix toolset and visual studio
-2. install toml-echo: `cargo install toml-echo`
+2. install toml-echo: `cargo install --version 0.3.0 toml-echo`
 3. launch X64 native tools command prompt for VS 20XX
 4. run package-unsigned.cmd
 

bitbox-bridge/release/windows/wix/package-unsigned.cmd

@@ -1,4 +1,4 @@
-FOR /F "tokens=* USEBACKQ" %%F IN (`toml-echo ..\..\..\Cargo.toml package.version`) DO (
+FOR /F "tokens=* USEBACKQ" %%F IN (`toml-echo Cargo.toml package.version`) DO (
 	SET VERSION=%%F
 )
 ECHO Packaging version %VERSION%

bitbox-bridge/release/windows/wix/package.cmd

@@ -1,4 +1,4 @@
-FOR /F "tokens=* USEBACKQ" %%F IN (`toml-echo ..\..\..\Cargo.toml package.version`) DO (
+FOR /F "tokens=* USEBACKQ" %%F IN (`toml-echo Cargo.toml package.version`) DO (
 	SET VERSION=%%F
 )
 ECHO Packaging version %VERSION%