Change path structure to match new build process on Linux and Windows

This commit is contained in:
Christoph Atteneder 2019-01-07 11:15:48 +01:00
parent 6966047bc4
commit b03e96821c
No known key found for this signature in database
GPG Key ID: CD5DC1C529CDFD3B

View File

@ -38,30 +38,27 @@ 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
linux64=$vmPath/vm_shared_ubuntu
win64=$vmPath/vm_shared_windows
vmPath=/Users/christoph/Documents/Workspaces/Java
#vmPath=/Volumes
linux64=$vmPath/vm_shared_ubuntu/desktop
linux64Package=$linux64/package/linux
win64=$vmPath/vm_shared_windows/desktop
win64Package=$win64/package/windows
mkdir -p $linux64 $win64
rm -rf $linux64Package $win64Package
mkdir -p $linux64 $win64 $linux64Package $win64Package
cp $EXE_JAR "deploy/Bisq-$version.jar"
# copy app jar to VM shared folders
cp $EXE_JAR "$linux64/Bisq-$version.jar"
# At windows we don't add the version nr as it would keep multiple versions of jar files in app dir
cp $EXE_JAR "$win64/Bisq.jar"
cp $EXE_JAR "$linux64Package/../desktop-$version-all.jar"
cp $EXE_JAR "$win64Package/../desktop-$version-all.jar"
# Copy packager scripts to VM. No need to checkout the source as we only are interested in the build scripts.
rm -rf "$linux64/package"
rm -rf "$win64/package"
mkdir -p "$linux64/package"
mkdir -p "$win64/package"
cp -r package/linux "$linux64/package"
cp -r package/windows "$win64/package"
cp -r package/linux/. $linux64Package
cp -r package/windows/. $win64Package
if [ -z "$JAVA_HOME" ]; then
JAVA_HOME=$(/usr/libexec/java_home)