From 0d160f3c495d16052237809722bcda9d4f247e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20H=C3=A5kansson?= <joel.hakansson@mtm.se>
Date: Wed, 20 Dec 2017 18:49:30 +0100
Subject: [PATCH 1/5] Removes Eclipse files

---
 .gitignore |  1 +
 .project   | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 .project

diff --git a/.gitignore b/.gitignore
index 398e8f1..229899a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 ant-build/output/
 /build/
 .settings/
+.project
diff --git a/.project b/.project
deleted file mode 100644
index 3e8ca47..0000000
--- a/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>E2U Installers</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

From b9f01f5ccc59e311f7149ace701a6b7c1820acbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20H=C3=A5kansson?= <joel.hakansson@mtm.se>
Date: Tue, 13 Feb 2018 09:08:09 +0100
Subject: [PATCH 2/5] Updates travis osx image

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5cb55fb..16428f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: java
 os: osx
-osx_image: xcode9.1
+osx_image: xcode9.2
 script: ./gradlew dmg
 after_success: ./publish.sh
\ No newline at end of file

From 590c28595ca4b2bec7466202875e264f591bfded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20H=C3=A5kansson?= <joel.hakansson@mtm.se>
Date: Fri, 16 Feb 2018 12:27:18 +0100
Subject: [PATCH 3/5] Updates to dotify-studio v0.7.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 632d162..ff8faec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version=0.6.1
+version=0.7.0
 releaseName=Dotify Studio
\ No newline at end of file

From 84711a6fa8f541a92fcf33f895396b68e3a10982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20H=C3=A5kansson?= <joel.hakansson@mtm.se>
Date: Tue, 14 Nov 2017 13:18:01 +0100
Subject: [PATCH 4/5] Uses a separate launch4j wrapper

---
 ant-build/resources/launch4j.manifest | 21 ++++++++++++++
 build.gradle                          | 42 ++++++++++++++++++++++-----
 2 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 ant-build/resources/launch4j.manifest

diff --git a/ant-build/resources/launch4j.manifest b/ant-build/resources/launch4j.manifest
new file mode 100644
index 0000000..a35eb9e
--- /dev/null
+++ b/ant-build/resources/launch4j.manifest
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity name="Dotify Studio" processorArchitecture="X86" type="win32" version="0.0.0.0"/>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+  <description>Creates, manages and embosses PEF-files</description>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/build.gradle b/build.gradle
index 13afdbd..45297ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
   id "de.inetsoftware.setupbuilder" version "3.4.3"
+  id 'edu.sc.seis.launch4j' version '2.4.2'
 }
 
 apply plugin: 'base'
@@ -55,10 +56,31 @@ task copyIcon(type: Copy, dependsOn: 'unzip', description: 'Copies file icon to
 	into ("${appBase}")
 }
 
+task copyExe(type: Copy, dependsOn: 'createExe') {
+	from ('build/launch4j') {
+		include '*.exe'
+	} 
+	into ("${appBase}")
+}
+
 task deleteBin(type: Delete, dependsOn: 'unzip', description: 'Removes the bin folder from the distribution.') {
 	delete "${appBase}/bin"
 }
 
+def launch4jManifest = file("$buildDir/launch4j.manifest") 
+
+task createLaunch4jManifest(description: 'Creates the Launch4j manifest from a template.') {
+	doLast() {
+		String contents = file('ant-build/resources/launch4j.manifest').getText('UTF-8')
+		launch4jManifest.getParentFile().mkdirs()
+		launch4jManifest.write(contents.replaceAll('(<assemblyIdentity.+? version=")([\\d\\.A-Za-z\\-]+)("\\/>)', "\$1$version.0\$3"), 'UTF-8')
+	}
+	outputs.file launch4jManifest
+	outputs.upToDateWhen{ file('gradle.properties').lastModified()<file(launch4jManifest).lastModified() }
+}
+
+createExe.dependsOn('createLaunch4jManifest')
+
 setupBuilder {
     vendor = 'DAISY Consortium'
     application = releaseName
@@ -86,15 +108,21 @@ task msi32( type: com.inet.gradle.setup.msi.Msi ) {
     classifier = "x86"
 }
 
+launch4j {
+	mainClassName = 'application.MainFx'
+	dontWrapJar = true
+	icon = '../../ant-build/resources/app-icon.ico'
+	manifest = '../launch4j.manifest'
+	jar = "lib/${artifactName}-${version}.jar"
+	copyConfigurable = files { file("${tempDir}/dotify-studio/lib").listFiles() }
+	outfile = 'dotify-studio.exe'
+	jreMinVersion = '1.8.0_40'
+}
+
 configure( [msi, msi32] ) {
     // included to reduce the build time
     languages = ['en-US']
     wxsTemplate = './ant-build/resources/template.wxs'
-    launch4j {
-		mainJar = "lib/${artifactName}-${version}.jar"
-		mainClass = 'application.MainFx'
-		executable = 'dotify-studio.exe'
-    }
 
     doFirst {
         setupBuilder {
@@ -120,8 +148,8 @@ configure( [deb, rpm] ) {
     }
 }
 
-msi.dependsOn('unzip', 'deleteBin', 'copyIcon', 'copyPlugins')
-msi32.dependsOn('unzip', 'deleteBin', 'copyIcon', 'copyPlugins')
+msi.dependsOn('unzip', 'deleteBin', 'copyIcon', 'copyPlugins', 'copyExe')
+msi32.dependsOn('unzip', 'deleteBin', 'copyIcon', 'copyPlugins', 'copyExe')
 dmg.dependsOn('unzip', 'copyPlugins')
 deb.dependsOn('unzip', 'copyPlugins')
 rpm.dependsOn('unzip', 'copyPlugins')

From c7ac56be096b63450041a539a6ee4b446cb12c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20H=C3=A5kansson?= <joel.hakansson@mtm.se>
Date: Wed, 21 Feb 2018 09:13:35 +0100
Subject: [PATCH 5/5] Bundle JRE on Windows and macOS

---
 build.gradle      | 25 +++++++++++++++++++------
 gradle.properties |  3 ++-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 45297ab..cf18880 100644
--- 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
index ff8faec..8ad1f7b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,3 @@
 version=0.7.0
-releaseName=Dotify Studio
\ No newline at end of file
+releaseName=Dotify Studio
+appDescription=Creates, manages and embosses PEF-files
\ No newline at end of file