From e1aa67f5a56f405ab69c836000850a651d11a6cf Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Thu, 17 Aug 2017 11:56:27 +0200
Subject: [PATCH] integrated dmg package creation for macOS

---
 .../common/html/nightly-generic-snippet.html  |  2 +-
 .../pom.xml                                   | 60 +++++++++++++++++++
 .../springbootide-dmg-config-e4.7.json        | 10 ++++
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e47/springbootide-dmg-config-e4.7.json

diff --git a/eclipse-distribution/common/html/nightly-generic-snippet.html b/eclipse-distribution/common/html/nightly-generic-snippet.html
index 9323acc7e..a48497173 100644
--- a/eclipse-distribution/common/html/nightly-generic-snippet.html
+++ b/eclipse-distribution/common/html/nightly-generic-snippet.html
@@ -1,7 +1,7 @@
 <ul>
 
 	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-boot-ide-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip">spring-boot-ide-@QUALIFIER@-@TARGET@-win32.win32.x86_64.zip</li>
-	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-boot-ide-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.tar.gz">spring-boot-ide-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.tar.gz</li>
+	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-boot-ide-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg">spring-boot-ide-@QUALIFIER@-@TARGET@-macosx.cocoa.x86_64.dmg</li>
 	<li><a href="http://download.springsource.com/snapshot/STS4/nightly/dist/@MAJOR-TARGET@/spring-boot-ide-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz">spring-boot-ide-@QUALIFIER@-@TARGET@-linux.gtk.x86_64.tar.gz</li>
 
 </ul>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
index 46b13142d..e0fb7eb55 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
@@ -120,6 +120,53 @@
 						</goals>
 					</execution>
 
+					<execution>
+						<id>osx-dmg-creation</id>
+						<phase>verify</phase>
+						<configuration>
+							<target>
+
+								<exec executable="/usr/local/bin/appdmg" failonerror="true">
+									<arg value="${project.build.directory}/../springbootide-dmg-config-${dist.target.major}.json"/>
+									<arg value="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
+								</exec>
+
+								<delete file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
+								
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>osx-dmg-signing</id>
+						<phase>verify</phase>
+						<configuration>
+							<skip>${skip.osx.signing}</skip>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
+								<property name="dmgName" value="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
+
+								<exec executable="codesign" failonerror="true">
+									<arg value="--verbose"/>
+								    <arg value="--keychain"/>
+								    <arg value="${env.KEYCHAIN}"/>
+								    <arg value="-s"/>
+								    <arg value="Developer ID Application: Trevor Marshall"/>
+								    <arg value="${dmgName}"/>
+								</exec>
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
 					<execution>
 						<id>upload-product-bundles</id>
 						<phase>deploy</phase>
@@ -129,6 +176,13 @@
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
 
+								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
+								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
+								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
+
 								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
 
 									<delete bucketName="${dist.bucket}">
@@ -139,6 +193,9 @@
 											<include name="spring-boot-ide*.tar.gz" />
 											<include name="spring-boot-ide*.tar.gz.md5" />
 											<include name="spring-boot-ide*.tar.gz.sha1" />
+											<include name="spring-boot-ide*.dmg" />
+											<include name="spring-boot-ide*.dmg.md5" />
+											<include name="spring-boot-ide*.dmg.sha1" />
 										</fileset>
 									</delete>
 
@@ -151,6 +208,9 @@
 											<include name="spring-boot-ide*.tar.gz" />
 											<include name="spring-boot-ide*.tar.gz.md5" />
 											<include name="spring-boot-ide*.tar.gz.sha1" />
+											<include name="spring-boot-ide*.dmg" />
+											<include name="spring-boot-ide*.dmg.md5" />
+											<include name="spring-boot-ide*.dmg.sha1" />
 										</fileset>
 									</upload>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/springbootide-dmg-config-e4.7.json b/eclipse-distribution/org.springframework.boot.ide.product.e47/springbootide-dmg-config-e4.7.json
new file mode 100644
index 000000000..2deb20b56
--- /dev/null
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/springbootide-dmg-config-e4.7.json
@@ -0,0 +1,10 @@
+{
+  "title": "Spring Boot IDE",
+  "icon": "../org.springframework.boot.ide.branding/sts.icns",
+  "contents": [
+    { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide/macosx/cocoa/x86_64/SpringBootIDE.app" },
+    { "x": 448, "y": 100, "type": "link", "path": "/Applications" },
+    { "x": 1000, "y": 2000, "type": "file", "path": "../org.springframework.boot.ide.branding/sts.icns", "name": ".VolumeIcon.icns" }
+  ],
+  "format": "UDBZ"
+}