fix: icon and macos/windows packaging

jedwards1211 · Nov 3, 2020 · c3ae36c · c3ae36c
1 parent 0de89a7
commit c3ae36c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/breakout-main/pom.xml b/breakout-main/pom.xml
@@ -7,7 +7,6 @@
 	<properties>
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm z</maven.build.timestamp.format>
 		<build.date>${maven.build.timestamp}</build.date>
-		<breakout.version>0.0.0-development</breakout.version>
 	</properties>
 	<build>
 		<resources>

diff --git a/breakout.icns b/breakout.icns
diff --git a/breakout.ico b/breakout.ico
diff --git a/build.sh b/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mvn clean install -P osx,windows,windows-i586,windows-amd64,linux,linux-i586,linux-amd64
+mvn clean install -Dbreakout.version="${BREAKOUT_VERSION}"
diff --git a/icon.png b/icon.png
diff --git a/package.sh → package-macos.sh b/package.sh → package-macos.sh
@@ -3,5 +3,5 @@
 javapackager -deploy -native -outdir packages -outfile Breakout \
   -srcdir breakout/target -srcfiles breakout-0.0.0-SNAPSHOT.jar \
   -appclass org.breakout.Breakout -name Breakout -title "Breakout Cave Survey" \
-  -BappVersion=$(./getVersion.sh)
+  -BappVersion="${BREAKOUT_VERSION}" -Bicon=breakout.icns
 
diff --git a/package-windows.sh b/package-windows.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+javapackager -deploy -native msi -outdir packages -outfile Breakout \
+  -srcdir breakout/target -srcfiles breakout-0.0.0-SNAPSHOT.jar \
+  -appclass org.breakout.Breakout -name Breakout -title "Breakout Cave Survey" \
+  -BappVersion="${BREAKOUT_VERSION}" -Bicon=breakout.ico
+