update build file structure, add win ico

doc/build.md

@@ -23,7 +23,7 @@ To run it use:
     $ java -jar gui/target/shaded.jar
 
 To build the binary needs a bit more preparation as we use [UpdateFX](https://github.com/vinumeris/updatefx) for automatic updates.
-You can find more information in the build scripts for your OS (e.g. build_setup.sh, build_create_app_mac.sh, build_update.sh)
+You can find more information in the build scripts under package.
 
 Prerequisites
 -------------

gui/pom.xml

@@ -109,7 +109,7 @@
         <dependency>
             <groupId>io.bitsquare</groupId>
             <artifactId>common</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

package/linux/build_create_app.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+cd ../../
 mvn clean package -DskipTests -Dmaven.javadoc.skip=true
 cp gui/target/shaded.jar gui/updatefx/builds/1.jar
 
@@ -9,7 +10,7 @@ java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updat
 # Note: fakeroot needs to be installed on linux
 $JAVA_HOME/bin/javapackager \
     -deploy \
-    -BappVersion=0.1 \
+    -BappVersion=0.1.1-SNAPSHOT \
     -Bcategory=Finance \
     -Bemail=info@bitsquare.io \
     -BlicenseType=GPLv3 \
@@ -23,3 +24,5 @@ $JAVA_HOME/bin/javapackager \
     -outfile Bitsquare
     
 # TODO icons:  -Bicon=client/icons/icon.png \
+
+cd package/linux

package/linux/build_setup.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # setup dirs
+cd ../../
 mkdir gui/updatefx
 mkdir gui/updatefx/builds
 mkdir gui/updatefx/builds/processed
@@ -10,6 +11,8 @@ mkdir gui/deploy
 # create key/wallet. Copy wallet to UpdateProcess or use wallet form other OS build
 java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
 
+cd package/mac
+
 # start webserver for update data
 # cd gui/updatefx/site
 # python -m SimpleHTTPServer 8000

package/linux/build_update.sh

@@ -1,9 +1,12 @@
 #!/bin/bash
 
+cd ../../
 mvn clean package -DskipTests -Dmaven.javadoc.skip=true
 
 # edit version /*.jar
 cp gui/target/shaded.jar gui/updatefx/builds/2.jar
 
 # edit url
-java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+
+cd package/mac

package/mac/build_create_app.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+cd ../../
 mvn clean package -DskipTests -Dmaven.javadoc.skip=true
 cp gui/target/shaded.jar gui/updatefx/builds/1.jar
 
@@ -8,7 +9,7 @@ java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updat
 
 $JAVA_HOME/bin/javapackager \
     -deploy \
-    -BappVersion=0.1 \
+    -BappVersion=0.1.1-SNAPSHOT \
     -Bmac.CFBundleIdentifier=bitsquare \
     -Bmac.CFBundleName=Bitsquare \
     -Bruntime="$JAVA_HOME/../../" \
@@ -19,4 +20,6 @@ $JAVA_HOME/bin/javapackager \
     -outdir gui/deploy \
     -srcfiles gui/updatefx/builds/processed/1.jar \
     -appclass io.bitsquare.app.gui.BitsquareAppMain \
-    -outfile Bitsquare
+    -outfile Bitsquare
+    
+cd package/mac

package/mac/build_setup.sh

@@ -0,0 +1,21 @@
+#!/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 to UpdateProcess or use wallet form other OS build
+java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+
+cd package/mac
+
+# start webserver for update data
+# cd gui/updatefx/site
+# python -m SimpleHTTPServer 8000
+
+# create icons
+# iconutil -c icns package/bitsquare.iconset

package/mac/build_update.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cd ../../
+mvn clean package -DskipTests -Dmaven.javadoc.skip=true
+
+# edit version /*.jar
+cp gui/target/shaded.jar gui/updatefx/builds/2.jar
+
+# edit url
+java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+
+cd package/mac

package/win/build_create_app.bat

@@ -1,7 +0,0 @@
-mvn clean package -DskipTests -Dmaven.javadoc.skip=true
-copy gui\target\shaded.jar gui\updatefx\builds\1.jar
-
-:: edit url
-java -Xmx2048m -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
-
-"c:\Program Files\Java\jdk1.8.0_40\bin\javapackager.exe" -deploy -BappVersion=0.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.gui.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="c:\Program Files\Java\jdk1.8.0_40\jre"

package/win/build_update.bat

@@ -1,7 +0,0 @@
-mvn clean package -DskipTests -Dmaven.javadoc.skip=true
-
-:: edit version /*.jar
-cp gui\target\shaded.jar gui\updatefx\builds\2.jar
-
-:: edit url
-java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx

package/windows/build_create_app.bat

@@ -0,0 +1,13 @@
+@echo off
+
+cd ..\..\
+call mvn clean package -DskipTests -Dmaven.javadoc.skip=true
+copy gui\target\shaded.jar gui\updatefx\builds\1.jar
+
+:: edit url
+call java -Xmx2048m -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+
+:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
+call "c:\Program Files\Java\jdk1.8.0_40\bin\javapackager.exe" -deploy -BappVersion=0.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.gui.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="c:\Program Files\Java\jdk1.8.0_40\jre"
+
+cd package\win

package/windows/build_setup.bat

@@ -1,4 +1,7 @@
-:: setup dirs
+@echo off
+
+:: setup dirs
+cd ..\..\
 mkdir gui\updatefx
 mkdir gui\updatefx\builds
 mkdir gui\updatefx\builds\processed
@@ -6,7 +9,9 @@ mkdir gui\updatefx\site
 mkdir gui\deploy
 
 :: create key/wallet. Copy wallet to UpdateProcess or use wallet form other OS build
-java -Xmx2048m -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+call java -Xmx2048m -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+
+cd package\win
 
 :: start webserver for update data
 :: cd gui\updatefx\site

package/windows/build_update.bat

@@ -0,0 +1,9 @@
+@echo off
+
+call mvn clean package -DskipTests -Dmaven.javadoc.skip=true
+
+:: edit version /*.jar
+cp gui\target\shaded.jar gui\updatefx\builds\2.jar
+
+:: edit url
+call java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx