From 7fc485dd88147f99bc1bb2d71ca94b9b727a32a9 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 4 Mar 2015 01:44:20 +0100 Subject: [PATCH] update build file structure, add win ico --- doc/build.md | 2 +- gui/pom.xml | 2 +- package/linux/build_create_app.sh | 5 ++++- package/{macosx => linux}/build_setup.sh | 3 +++ package/{macosx => linux}/build_update.sh | 5 ++++- package/{macosx => mac}/Bitsquare.icns | Bin .../Bitsquare.iconset/icon_128x128.png | Bin .../Bitsquare.iconset/icon_128x128@2x.png | Bin .../Bitsquare.iconset/icon_16x16.png | Bin .../Bitsquare.iconset/icon_16x16@2x.png | Bin .../Bitsquare.iconset/icon_256x256.png | Bin .../Bitsquare.iconset/icon_256x256@2x.png | Bin .../Bitsquare.iconset/icon_32x32.png | Bin .../Bitsquare.iconset/icon_32x32@2x.png | Bin .../Bitsquare.iconset/icon_512x512.png | Bin .../Bitsquare.iconset/icon_512x512@2x.png | Bin package/{macosx => mac}/build_create_app.sh | 7 ++++-- package/mac/build_setup.sh | 21 ++++++++++++++++++ package/mac/build_update.sh | 12 ++++++++++ package/win/build_create_app.bat | 7 ------ package/win/build_update.bat | 7 ------ package/{win => }/windows/Bitsquare.iss | 0 package/windows/build_create_app.bat | 13 +++++++++++ package/{win => windows}/build_setup.bat | 9 ++++++-- package/windows/build_update.bat | 9 ++++++++ package/{win => windows}/msvcp100.dll | Bin package/{win => windows}/msvcr100.dll | Bin 27 files changed, 80 insertions(+), 22 deletions(-) rename package/{macosx => linux}/build_setup.sh (94%) rename package/{macosx => linux}/build_update.sh (82%) rename package/{macosx => mac}/Bitsquare.icns (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_128x128.png (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_128x128@2x.png (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_16x16.png (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_16x16@2x.png (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_256x256.png (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_256x256@2x.png (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_32x32.png (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_32x32@2x.png (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_512x512.png (100%) rename package/{macosx => mac}/Bitsquare.iconset/icon_512x512@2x.png (100%) rename package/{macosx => mac}/build_create_app.sh (87%) create mode 100644 package/mac/build_setup.sh create mode 100644 package/mac/build_update.sh delete mode 100644 package/win/build_create_app.bat delete mode 100644 package/win/build_update.bat rename package/{win => }/windows/Bitsquare.iss (100%) create mode 100644 package/windows/build_create_app.bat rename package/{win => windows}/build_setup.bat (65%) create mode 100644 package/windows/build_update.bat rename package/{win => windows}/msvcp100.dll (100%) rename package/{win => windows}/msvcr100.dll (100%) diff --git a/doc/build.md b/doc/build.md index 161b4ac194..75369886bb 100644 --- a/doc/build.md +++ b/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 ------------- diff --git a/gui/pom.xml b/gui/pom.xml index 5386b3144a..36e0c898ac 100755 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -109,7 +109,7 @@ io.bitsquare common - ${parent.version} + ${project.parent.version} ch.qos.logback diff --git a/package/linux/build_create_app.sh b/package/linux/build_create_app.sh index 41ee3f49c9..fbeae1e300 100644 --- a/package/linux/build_create_app.sh +++ b/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 diff --git a/package/macosx/build_setup.sh b/package/linux/build_setup.sh similarity index 94% rename from package/macosx/build_setup.sh rename to package/linux/build_setup.sh index 2a8c1317a6..44f903d9be 100644 --- a/package/macosx/build_setup.sh +++ b/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 diff --git a/package/macosx/build_update.sh b/package/linux/build_update.sh similarity index 82% rename from package/macosx/build_update.sh rename to package/linux/build_update.sh index 39b2425498..a14de9941f 100644 --- a/package/macosx/build_update.sh +++ b/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 \ No newline at end of file +java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx + +cd package/mac \ No newline at end of file diff --git a/package/macosx/Bitsquare.icns b/package/mac/Bitsquare.icns similarity index 100% rename from package/macosx/Bitsquare.icns rename to package/mac/Bitsquare.icns diff --git a/package/macosx/Bitsquare.iconset/icon_128x128.png b/package/mac/Bitsquare.iconset/icon_128x128.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_128x128.png rename to package/mac/Bitsquare.iconset/icon_128x128.png diff --git a/package/macosx/Bitsquare.iconset/icon_128x128@2x.png b/package/mac/Bitsquare.iconset/icon_128x128@2x.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_128x128@2x.png rename to package/mac/Bitsquare.iconset/icon_128x128@2x.png diff --git a/package/macosx/Bitsquare.iconset/icon_16x16.png b/package/mac/Bitsquare.iconset/icon_16x16.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_16x16.png rename to package/mac/Bitsquare.iconset/icon_16x16.png diff --git a/package/macosx/Bitsquare.iconset/icon_16x16@2x.png b/package/mac/Bitsquare.iconset/icon_16x16@2x.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_16x16@2x.png rename to package/mac/Bitsquare.iconset/icon_16x16@2x.png diff --git a/package/macosx/Bitsquare.iconset/icon_256x256.png b/package/mac/Bitsquare.iconset/icon_256x256.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_256x256.png rename to package/mac/Bitsquare.iconset/icon_256x256.png diff --git a/package/macosx/Bitsquare.iconset/icon_256x256@2x.png b/package/mac/Bitsquare.iconset/icon_256x256@2x.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_256x256@2x.png rename to package/mac/Bitsquare.iconset/icon_256x256@2x.png diff --git a/package/macosx/Bitsquare.iconset/icon_32x32.png b/package/mac/Bitsquare.iconset/icon_32x32.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_32x32.png rename to package/mac/Bitsquare.iconset/icon_32x32.png diff --git a/package/macosx/Bitsquare.iconset/icon_32x32@2x.png b/package/mac/Bitsquare.iconset/icon_32x32@2x.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_32x32@2x.png rename to package/mac/Bitsquare.iconset/icon_32x32@2x.png diff --git a/package/macosx/Bitsquare.iconset/icon_512x512.png b/package/mac/Bitsquare.iconset/icon_512x512.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_512x512.png rename to package/mac/Bitsquare.iconset/icon_512x512.png diff --git a/package/macosx/Bitsquare.iconset/icon_512x512@2x.png b/package/mac/Bitsquare.iconset/icon_512x512@2x.png similarity index 100% rename from package/macosx/Bitsquare.iconset/icon_512x512@2x.png rename to package/mac/Bitsquare.iconset/icon_512x512@2x.png diff --git a/package/macosx/build_create_app.sh b/package/mac/build_create_app.sh similarity index 87% rename from package/macosx/build_create_app.sh rename to package/mac/build_create_app.sh index 562b2ce0da..1fb59bf829 100644 --- a/package/macosx/build_create_app.sh +++ b/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 \ No newline at end of file + -outfile Bitsquare + +cd package/mac \ No newline at end of file diff --git a/package/mac/build_setup.sh b/package/mac/build_setup.sh new file mode 100644 index 0000000000..44f903d9be --- /dev/null +++ b/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 diff --git a/package/mac/build_update.sh b/package/mac/build_update.sh new file mode 100644 index 0000000000..a14de9941f --- /dev/null +++ b/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 \ No newline at end of file diff --git a/package/win/build_create_app.bat b/package/win/build_create_app.bat deleted file mode 100644 index 8b173f4018..0000000000 --- a/package/win/build_create_app.bat +++ /dev/null @@ -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" diff --git a/package/win/build_update.bat b/package/win/build_update.bat deleted file mode 100644 index ea55e729ae..0000000000 --- a/package/win/build_update.bat +++ /dev/null @@ -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 \ No newline at end of file diff --git a/package/win/windows/Bitsquare.iss b/package/windows/Bitsquare.iss similarity index 100% rename from package/win/windows/Bitsquare.iss rename to package/windows/Bitsquare.iss diff --git a/package/windows/build_create_app.bat b/package/windows/build_create_app.bat new file mode 100644 index 0000000000..17ef44e011 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/package/win/build_setup.bat b/package/windows/build_setup.bat similarity index 65% rename from package/win/build_setup.bat rename to package/windows/build_setup.bat index 29a01337f2..205ed85d61 100644 --- a/package/win/build_setup.bat +++ b/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 diff --git a/package/windows/build_update.bat b/package/windows/build_update.bat new file mode 100644 index 0000000000..d2023db5f7 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/package/win/msvcp100.dll b/package/windows/msvcp100.dll similarity index 100% rename from package/win/msvcp100.dll rename to package/windows/msvcp100.dll diff --git a/package/win/msvcr100.dll b/package/windows/msvcr100.dll similarity index 100% rename from package/win/msvcr100.dll rename to package/windows/msvcr100.dll