Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Raspberry Pi to build process #3466

Merged
merged 2 commits into from
Oct 25, 2019
Merged

Add Raspberry Pi to build process #3466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ebd3e
Add Raspberry Pi to build process
ripcurlx Oct 25, 2019
e63f332
Rename deploy variable to improve readability
ripcurlx Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions desktop/package/macosx/create_app.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ cd ..
cd desktop

EXE_JAR=build/libs/desktop-$version-all.jar
JAR_LIB=build/app/lib

# we need to strip out Java 9 module configuration used in the fontawesomefx library as it causes the javapackager to stop,
# because of this existing module information, although it is not used as a module.
Expand All @@ -38,8 +39,13 @@ java -jar ./package/tools-1.0.jar $EXE_JAR
echo SHA 256 after stripping jar file to get a deterministic jar:
shasum -a256 $EXE_JAR | awk '{print $1}' | tee deploy/Bisq-$version.jar.txt

vmPath=/Users/christoph/Documents/Workspaces/Java
#vmPath=/Volumes
# zip jar lib for Raspberry Pi
echo "Zipping jar lib for raspberry pi"
zip -r -X -q "deploy/jar-lib-for-raspberry-pi-$version.zip" $JAR_LIB

# Set BISQ_VM_PATH as environment var to the directory where your shared folders for virtual box are residing

vmPath=$BISQ_VM_PATH
linux64=$vmPath/vm_shared_ubuntu/desktop
linux64Package=$linux64/package/linux
win64=$vmPath/vm_shared_windows/desktop
Expand Down
17 changes: 11 additions & 6 deletions desktop/package/macosx/finalize.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ version="1.2.0"

target_dir="releases/$version"

vmPath=/Users/christoph/Documents/Workspaces/Java
#vmPath=/Volumes
# Set BISQ_GPG_USER as environment var to the email address used for gpg signing. e.g. [email protected]
# Set BISQ_VM_PATH as environment var to the directory where your shared folders for virtual box are residing

vmPath=$BISQ_VM_PATH
linux64=$vmPath/vm_shared_ubuntu/desktop/package/linux
win64=$vmPath/vm_shared_windows/desktop/package/windows

macOS=deploy

# Set BISQ_GPG_USER as environment var to the email address used for gpg signing. e.g. [email protected]
deployDir=deploy

rm -r $target_dir

Expand All @@ -31,7 +31,7 @@ cp "$target_dir/../../package/signingkey.asc" "$target_dir/"
cp "deploy/Bisq-$version.jar.txt" "$target_dir/"

dmg="Bisq-$version.dmg"
cp "$macOS/$dmg" "$target_dir/"
cp "$deployDir/$dmg" "$target_dir/"

deb="Bisq-$version.deb"
deb64="Bisq-64bit-$version.deb"
Expand All @@ -45,19 +45,24 @@ exe="Bisq-$version.exe"
exe64="Bisq-64bit-$version.exe"
cp "$win64/$exe" "$target_dir/$exe64"

rpi="jar-lib-for-raspberry-pi-$version.zip"
cp "$deployDir/$rpi" "$target_dir/"

cd "$target_dir"

echo Create signatures
gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $dmg.asc --detach-sig --armor $dmg
gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $deb64.asc --detach-sig --armor $deb64
gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $rpm64.asc --detach-sig --armor $rpm64
gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $exe64.asc --detach-sig --armor $exe64
gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $rpi.asc --detach-sig --armor $rpi

echo Verify signatures
gpg --digest-algo SHA256 --verify $dmg{.asc*,}
gpg --digest-algo SHA256 --verify $deb64{.asc*,}
gpg --digest-algo SHA256 --verify $rpm64{.asc*,}
gpg --digest-algo SHA256 --verify $exe64{.asc*,}
gpg --digest-algo SHA256 --verify $rpi{.asc*,}

mkdir $win64/$version
cp -r . $win64/$version
Expand Down