Bundle JRE on Windows and macOS

brailleapps · Feb 21, 2018 · c7ac56b · c7ac56b
1 parent 84711a6
commit c7ac56b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -95,10 +95,6 @@ setupBuilder {
     from ("${appBase}") {
         include '**/*'
     }
-	desktopStarter {
-        displayName = releaseName
-        description = "Creates, manages and embosses PEF-files"
-    }   
     failOnEmptyFrom=true
 }
 
@@ -116,7 +112,7 @@ launch4j {
 	jar = "lib/${artifactName}-${version}.jar"
 	copyConfigurable = files { file("${tempDir}/dotify-studio/lib").listFiles() }
 	outfile = 'dotify-studio.exe'
-	jreMinVersion = '1.8.0_40'
+	bundledJrePath = 'jre'
 }
 
 configure( [msi, msi32] ) {
@@ -127,19 +123,36 @@ configure( [msi, msi32] ) {
     doFirst {
         setupBuilder {
 		    desktopStarter {
+		    	displayName = releaseName
+        		description = appDescription
 		        executable = "dotify-studio.exe"
 		        location = "ApplicationMenu"
-		    }            
+		    }
+		    bundleJre = 1.8
         }
     }
 }
 
+configure( [dmg] ) {
+	doFirst {
+		setupBuilder {
+			desktopStarter {
+				displayName = releaseName
+				description = appDescription
+			}
+			bundleJre = 1.8
+		}
+	}
+}
+
 configure( [deb, rpm] ) {
     doFirst {
         setupBuilder {
 		defaultResourceLanguage 'en'
 		longDescription 'ant-build/resources/longDesc_en.txt'
 		desktopStarter {
+			displayName = releaseName
+        	description = appDescription
 			executable = "bin/dotify-studio"
 			location = "ApplicationMenu"
 			categories = "Office"

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
 version=0.7.0
-releaseName=Dotify Studio
+releaseName=Dotify Studio
+appDescription=Creates, manages and embosses PEF-files