From a378ea96100989fa6e70aedd11b62e6270fce8e0 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Fri, 6 Mar 2015 01:44:54 +0100
Subject: [PATCH] Remove unneeded scripts

---
 package/linux/create_app.sh    | 11 +++--------
 package/linux/setup.sh         |  5 +----
 package/linux/update.sh        | 16 ----------------
 package/windows/create_app.bat |  9 ++-------
 package/windows/setup.bat      |  5 -----
 package/windows/update.bat     |  9 ---------
 6 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 package/linux/update.sh
 delete mode 100644 package/windows/update.bat

diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh
index 0e23141e5e..cfdb4ed7bb 100644
--- a/package/linux/create_app.sh
+++ b/package/linux/create_app.sh
@@ -4,15 +4,10 @@ cd ../../
 
 set -e
 
-# Edit versions
-buildVersion=1
+# Edit version
 fullVersion=0.1.1
 
-mvn clean package -DskipTests -Dmaven.javadoc.skip=true
-cp gui/target/shaded.jar gui/updatefx/builds/$buildVersion.jar
-
-java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ gui/updatefx
-
+# Copy jar file from mac build (1.jar from processed folder) to linux box 
 # Note: fakeroot needs to be installed on linux
 $JAVA_HOME/bin/javapackager \
     -deploy \
@@ -26,7 +21,7 @@ $JAVA_HOME/bin/javapackager \
     -title Bitsquare \
     -vendor Bitsquare \
     -outdir gui/deploy \
-    -srcfiles gui/updatefx/builds/processed/$buildVersion.jar \
+    -srcfiles gui/updatefx/builds/processed/1.jar \
     -appclass io.bitsquare.app.gui.BitsquareAppMain \
     -outfile Bitsquare
 
diff --git a/package/linux/setup.sh b/package/linux/setup.sh
index 7154d70133..36f216a353 100644
--- a/package/linux/setup.sh
+++ b/package/linux/setup.sh
@@ -2,13 +2,10 @@
 
 # setup dirs
 cd ../../
+
 mkdir gui/updatefx
 mkdir gui/updatefx/builds
 mkdir gui/updatefx/builds/processed
-mkdir gui/updatefx/site
 mkdir gui/deploy
 
-# Copy wallet file from main build
-# java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ gui/updatefx
-
 cd package/linux
\ No newline at end of file
diff --git a/package/linux/update.sh b/package/linux/update.sh
deleted file mode 100644
index b2d52037a0..0000000000
--- a/package/linux/update.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Extract the version number. buildVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + buildVersion 
-buildVersion=$( sed -n 's/^.*final int BUILD_VERSION = //p' gui/src/main/java/io/bitsquare/app/gui/UpdateProcess.java )
-# remove trailing;
-buildVersion="${buildVersion:0:${#buildVersion}-1}"
-echo buildVersion = $buildVersion
-
-cd ../../
-mvn clean package -DskipTests -Dmaven.javadoc.skip=true
-cp gui/target/shaded.jar gui/updatefx/builds/$buildVersion.jar
-java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ gui/updatefx
-
-cd package/linux
\ No newline at end of file
diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat
index 5758eaf225..76bfc898a6 100644
--- a/package/windows/create_app.bat
+++ b/package/windows/create_app.bat
@@ -2,17 +2,12 @@ cd ..\..\
 
 :: edit iss file -> AppVersion=0.1.1
 
-call mvn clean package -DskipTests -Dmaven.javadoc.skip=true
-:: edit buildVersion number
-copy gui\target\shaded.jar gui\updatefx\builds\1.jar
-
-:: edit url
-call java -Xmx2048m -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ gui/updatefx
+:: Copy jar file from mac build (1.jar from processed folder) to windows
+:: edit -> -BappVersion=0.1.1
 
 :: 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
-:: edit buildVersion and fullVersion number
 call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.1.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_31\jre"
 
 :: 32 bit build
diff --git a/package/windows/setup.bat b/package/windows/setup.bat
index e97867bf7a..68cda37596 100644
--- a/package/windows/setup.bat
+++ b/package/windows/setup.bat
@@ -4,11 +4,6 @@ cd ..\..\
 mkdir gui\updatefx
 mkdir gui\updatefx\builds
 mkdir gui\updatefx\builds\processed
-mkdir gui\updatefx\site
 mkdir gui\deploy
-:: mkdir gui\win-32bit
-
-:: Copy wallet file from main build
-:: call java -Xmx2048m -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ gui/updatefx
 
 cd package\windows
\ No newline at end of file
diff --git a/package/windows/update.bat b/package/windows/update.bat
deleted file mode 100644
index 9b57434ba0..0000000000
--- a/package/windows/update.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-call mvn clean package -DskipTests -Dmaven.javadoc.skip=true
-
-:: edit buildVersion number
-@echo off set buildVersion=2
-
-:: edit version /*.jar
-cp gui\target\shaded.jar gui\updatefx\builds\%buildVersion%.jar
-
-call java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ gui/updatefx
\ No newline at end of file