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

prepare for version 0.3.1.

Browse Source
This commit is contained in:
Manfred Karrer 2015-05-18 18:05:10 +02:00
parent fc3634af7b
commit f971a787ba
10 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/pom.xml
View File

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

2
core/pom.xml
View File

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

2
core/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);
public static final int MAJOR_VERSION = 0;
public static final int MINOR_VERSION = 2;
public static final int MINOR_VERSION = 3;
public static final int PATCH_VERSION = 1;
public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + PATCH_VERSION;

2
gui/pom.xml
View File

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

9
gui/src/main/java/io/bitsquare/app/UpdateProcess.java
View File

@ -21,9 +21,8 @@ import io.bitsquare.util.Utilities;
import com.google.inject.Inject;
import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.Timer;
@ -91,7 +90,11 @@ public class UpdateProcess {
timeoutTimer = Utilities.setTimeout(10000, () -> process.onCompleted());
String agent = environment.getProperty(BitsquareEnvironment.APP_NAME_KEY) + Version.VERSION;
Path dataDirPath = new File(environment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY)).toPath();
// We use the outer dir not the app data dir including version and btc network
Path dataDirPath = Paths.get(environment.getProperty(BitsquareEnvironment.USER_DATA_DIR_KEY),
environment.getProperty(BitsquareEnvironment.APP_NAME_KEY));
Updater updater = new Updater(UPDATES_BASE_URL, agent, Version.PATCH_VERSION, dataDirPath, ROOT_CLASS_PATH,
UPDATE_SIGNING_KEYS, UPDATE_SIGNING_THRESHOLD) {
@Override

2
package/linux/create_app.sh
View File

@ -5,7 +5,7 @@ cd ../../
set -e
# Edit versions
fullVersion=0.2.1
fullVersion=0.3.1
# Copy jar file from mac build (1.jar from processed folder) to linux box
# Note: fakeroot needs to be installed on linux

17
package/mac/update.sh
View File

@ -4,12 +4,25 @@ cd ../../
set -e
# Extract the version number. patchVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + patchVersion
# 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;
buildVersion="${buildVersion:0:${#buildVersion}-1}"
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

2
package/windows/Bitsquare.iss
View File

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

8
package/windows/create_app.bat
View File

@ -1,16 +1,16 @@
cd ..\..\
:: edit iss file -> AppVersion=0.2.1
:: edit iss file -> AppVersion=0.3.1
:: Copy jar file from mac build (1.jar from processed folder) to windows
:: edit -> -BappVersion=0.2.1 and -srcfiles
:: edit -> -BappVersion=0.3.1 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.2.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.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"
:: 32 bit build
:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.2.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.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"
cd package\windows

2
pom.xml
View File

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