mirror of
https://github.com/haveno-dex/haveno.git
synced 2025-05-19 23:10:48 -04:00
Add UI info for P2P network
This commit is contained in:
Manfred Karrer
parent
b81e263c24
commit
d666c6cd3b
30 changed files with 232 additions and 625 deletions
|
|
@ -1,24 +0,0 @@
|
|||
Binary build instructions with Update FX:
|
||||
|
||||
Binary build:
|
||||
|
||||
1. Set version numbers in UpdateProcess, BitsquareAppMain and pom files. Check in changes.
|
||||
2. Remove previous build files under core/updatefx. Use wallet file form backup if not there. Run setup.sh. Key in UpdateProcess must be same as reported in
|
||||
console.
|
||||
3. Run create_app.sh
|
||||
4. Upload index to server
|
||||
5. Build windows binary. Copy wallet file from backup if not there. Clean all before. Edit version numbers (not automated in win bat file)
|
||||
6. Build Linux binary.
|
||||
|
||||
Update new jar file:
|
||||
1. Change build version number in UpdateProcess and pom files. Check in changes.
|
||||
2. Run update.sh
|
||||
3. Upload bpatch file and index to server
|
||||
4. Run update at windows and linux
|
||||
|
||||
|
||||
Todo:
|
||||
- Support 32bit builds
|
||||
- Make version handling in bat and linux.sh file automatic (regex from mac file fails on ubuntu)
|
||||
- Signing
|
||||
- Threshold signature for updates
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
cd ../../
|
||||
mkdir gui/deploy
|
||||
|
||||
set -e
|
||||
|
||||
|
|
@ -22,7 +23,7 @@ $JAVA_HOME/bin/javapackager \
|
|||
-title Bitsquare \
|
||||
-vendor Bitsquare \
|
||||
-outdir gui/deploy \
|
||||
-srcfiles gui/updatefx/builds/processed/1.jar \
|
||||
-srcfiles gui/deploy/Bitsquare.jar \
|
||||
-srcfiles package/linux/LICENSE \
|
||||
-appclass io.bitsquare.app.BitsquareAppMain \
|
||||
-outfile Bitsquare
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# setup dirs
|
||||
cd ../../
|
||||
|
||||
mkdir gui/updatefx
|
||||
mkdir gui/updatefx/builds
|
||||
mkdir gui/updatefx/builds/processed
|
||||
mkdir gui/deploy
|
||||
|
||||
cd package/linux
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
<key>JVMAppClasspath</key>
|
||||
<string></string>
|
||||
<key>JVMMainJarName</key>
|
||||
<string>1.jar</string>
|
||||
<string>2.jar</string>
|
||||
<key>JVMPreferencesID</key>
|
||||
<string>bitsquare</string>
|
||||
<key>JVMOptions</key>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
#!/bin/bash
|
||||
|
||||
cd ../../
|
||||
mkdir gui/deploy
|
||||
|
||||
set -e
|
||||
|
||||
# Extract the version numbers.
|
||||
majorVersion=$( sed -n 's/^.*final int MAJOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
|
||||
minorVersion=$( sed -n 's/^.*final int MINOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
|
||||
# PatchVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + patchVersion
|
||||
patchVersion=$( sed -n 's/^.*final int PATCH_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
|
||||
majorVersion=$( sed -n 's/^.*final int MAJOR_VERSION = //p' common/src/main/java/io/bitsquare/app/Version.java )
|
||||
minorVersion=$( sed -n 's/^.*final int MINOR_VERSION = //p' common/src/main/java/io/bitsquare/app/Version.java )
|
||||
patchVersion=$( sed -n 's/^.*final int PATCH_VERSION = //p' common/src/main/java/io/bitsquare/app/Version.java )
|
||||
|
||||
# remove trailing;
|
||||
majorVersion="${majorVersion:0:${#majorVersion}-1}"
|
||||
minorVersion="${minorVersion:0:${#minorVersion}-1}"
|
||||
patchVersion="${patchVersion:0:${#patchVersion}-1}"
|
||||
|
||||
fullVersion=$( sed -n 's/^.*final String VERSION = "//p' core/src/main/java/io/bitsquare/app/Version.java )
|
||||
fullVersion=$( sed -n 's/^.*final String VERSION = "//p' common/src/main/java/io/bitsquare/app/Version.java )
|
||||
# remove trailing ";
|
||||
fullVersion=$majorVersion.$minorVersion.$patchVersion
|
||||
|
||||
|
|
@ -29,9 +29,7 @@ sed "s|JAR_NAME_STRING_GOES_HERE|$patchVersion.jar|" package/mac/Info.template.p
|
|||
|
||||
|
||||
mvn clean package -DskipTests -Dmaven.javadoc.skip=true
|
||||
cp gui/target/shaded.jar gui/updatefx/builds/$patchVersion.jar
|
||||
|
||||
java -jar ./updatefx/updatefx-app-1.3-SNAPSHOT.jar --url=http://bitsquare.io/updateFX/v03 gui/updatefx
|
||||
cp gui/target/shaded.jar gui/deploy/Bitsquare.jar
|
||||
|
||||
$JAVA_HOME/bin/javapackager \
|
||||
-deploy \
|
||||
|
|
@ -45,7 +43,7 @@ $JAVA_HOME/bin/javapackager \
|
|||
-title Bitsquare \
|
||||
-vendor Bitsquare \
|
||||
-outdir gui/deploy \
|
||||
-srcfiles gui/updatefx/builds/processed/$patchVersion.jar \
|
||||
-srcfiles gui/target/shaded.jar \
|
||||
-appclass io.bitsquare.app.BitsquareAppMain \
|
||||
-outfile Bitsquare \
|
||||
-BjvmProperties=-Djava.net.preferIPv4Stack=true
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# setup dirs
|
||||
cd ../../
|
||||
mkdir gui/updatefx
|
||||
mkdir gui/updatefx/builds
|
||||
mkdir gui/updatefx/builds/processed
|
||||
mkdir gui/updatefx/site
|
||||
mkdir gui/deploy
|
||||
|
||||
# create key/wallet. Copy wallet key to UpdateProcess and use wallet for other OS builds
|
||||
java -jar ./updatefx/updatefx-app-1.3-SNAPSHOT.jar --url=http://bitsquare.io/updateFX/v03 gui/updatefx
|
||||
|
||||
cd package/mac
|
||||
|
||||
# create icons
|
||||
# iconutil -c icns package/bitsquare.iconset
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
cd ../../
|
||||
|
||||
set -e
|
||||
|
||||
# Extract the version numbers.
|
||||
majorVersion=$( sed -n 's/^.*final int MAJOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
|
||||
minorVersion=$( sed -n 's/^.*final int MINOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
|
||||
# PatchVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + patchVersion
|
||||
patchVersion=$( sed -n 's/^.*final int PATCH_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
|
||||
|
||||
# remove trailing;
|
||||
majorVersion="${majorVersion:0:${#majorVersion}-1}"
|
||||
minorVersion="${minorVersion:0:${#minorVersion}-1}"
|
||||
patchVersion="${patchVersion:0:${#patchVersion}-1}"
|
||||
|
||||
fullVersion=$( sed -n 's/^.*final String VERSION = "//p' core/src/main/java/io/bitsquare/app/Version.java )
|
||||
# remove trailing ";
|
||||
fullVersion=$majorVersion.$minorVersion.$patchVersion
|
||||
|
||||
echo majorVersion = $majorVersion
|
||||
echo minorVersion = $minorVersion
|
||||
echo patchVersion = $patchVersion
|
||||
echo fullVersion = $fullVersion
|
||||
|
||||
mvn clean package -DskipTests -Dmaven.javadoc.skip=true
|
||||
cp gui/target/shaded.jar gui/updatefx/builds/$patchVersion.jar
|
||||
java -jar ./updatefx/updatefx-app-1.3-SNAPSHOT.jar --url=http://bitsquare.io/updateFX/v03 gui/updatefx
|
||||
|
||||
cd package/mac
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
cd ..\..\
|
||||
mkdir gui\deploy
|
||||
|
||||
:: edit iss file -> AppVersion=0.3.1
|
||||
:: edit iss file -> AppVersion=0.3.2
|
||||
|
||||
:: Copy jar file from mac build (1.jar from processed folder) to windows
|
||||
:: edit -> -BappVersion=0.3.1 and -srcfiles
|
||||
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows
|
||||
:: edit -> -BappVersion=0.3.2 and -srcfiles
|
||||
|
||||
:: 64 bit build
|
||||
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
|
||||
:: Build with jdk1.8.0_40 fails but jdk1.8.0_3 works
|
||||
call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre"
|
||||
call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre"
|
||||
|
||||
:: 32 bit build
|
||||
:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre"
|
||||
:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre"
|
||||
|
||||
cd package\windows
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
cd ..\..\
|
||||
|
||||
:: setup dirs
|
||||
mkdir gui\updatefx
|
||||
mkdir gui\updatefx\builds
|
||||
mkdir gui\updatefx\builds\processed
|
||||
mkdir gui\deploy
|
||||
|
||||
cd package\windows
|
||||
Loading…
Add table
Add a link
Reference in a new issue