Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-28 09:24:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

v0.4.6

Browse source
This commit is contained in:
Manfred Karrer 2016-04-29 11:22:58 +02:00
parent 0a0f5a5659
commit 89aed23d67
18 changed files with 38 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.4.5</version> <version>0.4.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
common/src/main/java/io/bitsquare/app/Version.java
View file

@ -24,7 +24,7 @@ public class Version {
private static final Logger log = LoggerFactory.getLogger(Version.class); private static final Logger log = LoggerFactory.getLogger(Version.class);
// The application versions // The application versions
public static final String VERSION = "0.4.5"; public static final String VERSION = "0.4.6";
// The version nr. for the objects sent over the network. A change will break the serialization of old objects. // The version nr. for the objects sent over the network. A change will break the serialization of old objects.
// If objects are used for both network and database the network version is applied. // If objects are used for both network and database the network version is applied.

2
core/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.4.5</version> <version>0.4.6</version>
</parent> </parent>
<artifactId>core</artifactId> <artifactId>core</artifactId>

2
gui/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.4.5</version> <version>0.4.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jsocks/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.4.5</version> <version>0.4.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorctl/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.4.5</version> <version>0.4.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorproxy/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.4.5</version> <version>0.4.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
network/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.4.5</version> <version>0.4.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
package/linux/create_32bit_app.sh
View file

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e set -e
# Edit versions # Edit versions
fullVersion=0.4.5 fullVersion=0.4.6
jarFile="/home/bitsquare/Desktop/sf_vm_shared_ubuntu14_32bit/Bitsquare-$fullVersion.jar" jarFile="/home/bitsquare/Desktop/sf_vm_shared_ubuntu14_32bit/Bitsquare-$fullVersion.jar"
# Note: fakeroot needs to be installed on linux # Note: fakeroot needs to be installed on linux

2
package/linux/create_64bit_app.sh
View file

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e set -e
# Edit versions # Edit versions
fullVersion=0.4.5 fullVersion=0.4.6
jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar" jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar"
# Note: fakeroot needs to be installed on linux # Note: fakeroot needs to be installed on linux

2
package/mac/create_app.sh
View file

@ -5,7 +5,7 @@ mkdir -p gui/deploy
set -e set -e
fullVersion="0.4.5" fullVersion="0.4.6"
mvn clean package -DskipTests -Dmaven.javadoc.skip=true mvn clean package -DskipTests -Dmaven.javadoc.skip=true

50
package/mac/finalize.sh
View file

@ -1,50 +1,34 @@
#!/bin/bash #!/bin/bash
version="0.4.5" version="0.4.6"
target_dir="/Users/mk/Documents/__bitsquare/_releases/$version" target_dir="/Users/mk/Documents/__bitsquare/_releases/$version"
cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/Bitsquare-$version.dmg" "$target_dir/Bitsquare-$version.dmg" mac="Bitsquare-$version.dmg"
cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/SeedNode-$version.jar" "$target_dir/SeedNode-$version.jar" cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/$mac" "$target_dir/"
cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/SeedNode-$version.jar" "$target_dir/"
linux32="Bitsquare-32bit-$version.deb" deb32="Bitsquare-32bit-$version.deb"
cp "/Users/mk/vm_shared_ubuntu14_32bit/$linux32" "$target_dir/$linux32" cp "/Users/mk/vm_shared_ubuntu14_32bit/$deb32" "$target_dir/"
linux64="Bitsquare-64bit-$version.deb" deb64="Bitsquare-64bit-$version.deb"
cp "/Users/mk/vm_shared_ubuntu/$linux64" "$target_dir/$linux64" cp "/Users/mk/vm_shared_ubuntu/$deb64" "$target_dir/"
exe="Bitsquare.exe" exe="Bitsquare.exe"
cp "/Users/mk/vm_shared_windows_32bit/bundles/$exe" "$target_dir/Bitsquare-32bit-$version.exe" win32="Bitsquare-32bit-$version.exe"
cp "/Users/mk/vm_shared_windows/bundles/$exe" "$target_dir/Bitsquare-64bit-$version.exe" cp "/Users/mk/vm_shared_windows_32bit/bundles/$exe" "$target_dir/$win32"
cp "/Users/mk/vm_shared_windows/bundles/$exe" "/Users/mk/vm_shared_win10/Bitsquare-64bit-$version.exe" win64="Bitsquare-64bit-$version.exe"
cp "/Users/mk/vm_shared_windows/bundles/$exe" "$target_dir/$win64"
cp "/Users/mk/vm_shared_windows/bundles/$exe" "/Users/mk/vm_shared_win10/$win64"
cp "hashes.template" "$target_dir/hashes.template"
cd "$target_dir" cd "$target_dir"
MAC="Bitsquare-$version.dmg" shasum -a 256 "$mac" "$deb64" "$deb32" "$win64" "$win32" > sha256_hashes.txt
HASH_MAC="$(shasum -a 256 $MAC)"
DEB_64="Bitsquare-64bit-$version.deb" gpg --local-user manfred@bitsquare.io --output signed_sha256_hashes.txt --clearsign sha256_hashes.txt
HASH_DEB_64="$(shasum -a 256 $DEB_64)"
DEB_64="Bitsquare-64bit-$version.deb" gpg --verify signed_sha256_hashes.txt
HASH_DEB_64="$(shasum -a 256 $DEB_64)"
DEB_32="Bitsquare-32bit-$version.deb" rm "$target_dir/sha256_hashes.txt"
HASH_DEB_32="$(shasum -a 256 $DEB_32)"
WIN_64="Bitsquare-64bit-$version.exe"
HASH_WIN_64="$(shasum -a 256 $WIN_64)"
WIN_32="Bitsquare-32bit-$version.exe"
HASH_WIN_32="$(shasum -a 256 $WIN_32)"
sed -e "s|HASH_MAC|$HASH_MAC|" -e "s|HASH_DEB_64|$HASH_DEB_64|" -e "s|HASH_DEB_32|$HASH_DEB_32|" -e "s|HASH_WIN_64|$HASH_WIN_64|" -e "s|HASH_WIN_32|$HASH_WIN_32|" hashes.template > hashes.txt
gpg --local-user manfred@bitsquare.io --output signed_sha256_hashes.txt --clearsign hashes.txt
gpg --verify signed_hashes.txt
rm "$target_dir/hashes.template"
rm "$target_dir/hashes.txt"
open "$target_dir" open "$target_dir"

5
package/mac/hashes.template
View file

@ -1,5 +0,0 @@
HASH_MAC
HASH_DEB_64
HASH_DEB_32
HASH_WIN_64
HASH_WIN_32

2
package/windows/Bitsquare.iss
View file

@ -3,7 +3,7 @@
[Setup] [Setup]
AppId={{bitsquare}} AppId={{bitsquare}}
AppName=Bitsquare AppName=Bitsquare
AppVersion=0.4.5 AppVersion=0.4.6
AppVerName=Bitsquare AppVerName=Bitsquare
AppPublisher=Bitsquare AppPublisher=Bitsquare
AppComments=Bitsquare AppComments=Bitsquare

6
package/windows/create_32bit_app.bat
View file

@ -1,13 +1,13 @@
cd ..\..\ cd ..\..\
mkdir gui\deploy mkdir gui\deploy
:: edit iss file -> AppVersion=0.4.5 :: edit iss file -> AppVersion=0.4.6
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows :: Copy gui/deploy.Bitsquare.jar file from mac build to windows
:: edit -> -BappVersion=0.4.5 and -srcfiles :: edit -> -BappVersion=0.4.6 and -srcfiles
:: 32 bit build :: 32 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.5 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows_32bit" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows_32bit\Bitsquare-0.4.5.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.6 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows_32bit" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows_32bit\Bitsquare-0.4.6.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true
cd package\windows cd package\windows

6
package/windows/create_64bit_app.bat
View file

@ -1,13 +1,13 @@
cd ..\..\ cd ..\..\
mkdir gui\deploy mkdir gui\deploy
:: edit iss file -> AppVersion=0.4.5 :: edit iss file -> AppVersion=0.4.6
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows :: Copy gui/deploy.Bitsquare.jar file from mac build to windows
:: edit -> -BappVersion=0.4.5 and -srcfiles :: edit -> -BappVersion=0.4.6 and -srcfiles
:: 64 bit build :: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.5 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.4.5.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.6 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.4.6.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true
cd package\windows cd package\windows

2
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.4.5</version> <version>0.4.6</version>
<description>Bitsquare - The decentralized bitcoin exchange</description> <description>Bitsquare - The decentralized bitcoin exchange</description>
<url>https://bitsquare.io</url> <url>https://bitsquare.io</url>

2
seednode/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.4.5</version> <version>0.4.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>