From 74f785cdc228eebbc78bc2d6abea99239dafbca8 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 5 Mar 2015 21:13:49 +0100 Subject: [PATCH] Fix win build scripts --- package/windows/create_app.bat | 14 +++++--------- package/windows/setup.bat | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat index 5823bfe75d..5758eaf225 100644 --- a/package/windows/create_app.bat +++ b/package/windows/create_app.bat @@ -1,15 +1,10 @@ cd ..\..\ -:: edit buildVersion number -@echo off set buildVersion=2 - -:: edit fullVersion number -@echo off set fullVersion=1.1 - :: edit iss file -> AppVersion=0.1.1 call mvn clean package -DskipTests -Dmaven.javadoc.skip=true -copy gui\target\shaded.jar gui\updatefx\builds\%buildVersion%.jar +:: 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 @@ -17,9 +12,10 @@ call java -Xmx2048m -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare. :: 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=%fullVersion% -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.gui.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\%buildVersion%.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre" +:: 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 -:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=%fullVersion% -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.gui.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\%buildVersion%.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.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 (x86)\Java\jdk1.8.0_31\jre" cd package\windows \ No newline at end of file diff --git a/package/windows/setup.bat b/package/windows/setup.bat index 5000959ade..63655e608c 100644 --- a/package/windows/setup.bat +++ b/package/windows/setup.bat @@ -6,7 +6,7 @@ mkdir gui\updatefx\builds mkdir gui\updatefx\builds\processed mkdir gui\updatefx\site mkdir gui\deploy -mkdir gui\win-32bit +:: 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