Bug 461670 - Make Mac download available as signed dmg

Change-Id: I068c67af946da7f81a5afeb11bf1e5365b6092b3
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

7 files changed, 98 insertions, 27 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
index d903b5d83..d83e3d642 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
-
+#*******************************************************************************
+# Copyright (c) 2017 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     David Williams - initial API and implementation
+#*******************************************************************************
+#
 # this localBuildProperties.shsource file is to ease local builds to
 # override some variables.
 # It should not be used for production builds.
@@ -65,6 +75,17 @@ do
   fi
 done
 
+#array of dmgfiles
+dmgfiles=`ls *.zip`
+
+for dmgfile in ${dmgfiles}
+do
+  echo [sha256] ${dmgfile}
+  sha256sum -b ${dmgfile} | tee checksum/${zipfile}.sha256 >>${allCheckSumsSHA256}
+  echo [sha512] ${dmgfile}
+  sha512sum -b ${dmgfile} | tee checksum/${zipfile}.sha512  >>${allCheckSumsSHA512}
+done
+
 #array of tar.gzip files
 gzipfiles=`ls *.gz`
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
index b857a5dbb..49dd9715f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
@@ -33,7 +33,7 @@
       <platform
         id="SMCC64"
         name="Mac OSX (Mac/Cocoa/x86_64)"
-        fileName="eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz"></platform>
+        fileName="eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg"></platform>
 
       <!--
         <platform id="SAA2" name='Source Build (Source in .zip) (&lt;a href="srcIncludedBuildInstructions.html">instructions&lt;/a>)'
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index f77b9a22e..a7e5ac0de 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2014 Eclipse Foundation.
+  Copyright (c) 2012, 2017 Eclipse Foundation.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -134,7 +134,6 @@
               </execution>
             </executions>
           </plugin>
-
           <plugin>
             <groupId>org.eclipse.cbi.maven.plugins</groupId>
             <artifactId>eclipse-macsigner-plugin</artifactId>
@@ -153,7 +152,24 @@
               </execution>
             </executions>
           </plugin>
-
+          <plugin>
+            <groupId>org.eclipse.cbi.maven.plugins</groupId>
+            <artifactId>eclipse-dmg-packager</artifactId>
+            <version>${cbi-plugins.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>package-dmg</goal>
+                </goals>
+                <phase>integration-test</phase>
+                <configuration>
+                  <source>${project.build.directory}/products/org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz</source>
+                  <continueOnFail>true</continueOnFail>
+                  <sign>true</sign>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
index 1150ebe8f..e92d1881c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2014 Eclipse Foundation.
+  Copyright (c) 2012, 2017 Eclipse Foundation.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -86,7 +86,6 @@
           </execution>
         </executions>
       </plugin>
-
     </plugins>
   </build>
   <profiles>
@@ -107,7 +106,6 @@
               </execution>
             </executions>
           </plugin>
-
           <plugin>
             <groupId>org.eclipse.cbi.maven.plugins</groupId>
             <artifactId>eclipse-macsigner-plugin</artifactId>
@@ -121,7 +119,24 @@
               </execution>
             </executions>
           </plugin>
-
+          <plugin>
+            <groupId>org.eclipse.cbi.maven.plugins</groupId>
+            <artifactId>eclipse-dmg-packager</artifactId>
+            <version>${cbi-plugins.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>package-dmg</goal>
+                </goals>
+                <phase>integration-test</phase>
+                <configuration>
+                  <source>${project.build.directory}/products/org.eclipse.platform.ide-macosx.cocoa.x86_64.tar.gz</source>
+                  <continueOnFail>true</continueOnFail>
+                  <sign>true</sign>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
index ec87cf34c..41502f611 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2014 Eclipse Foundation.
+  Copyright (c) 2012, 2017 Eclipse Foundation.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -106,21 +106,37 @@
               </execution>
             </executions>
           </plugin>
-
-            <plugin>
-              <groupId>org.eclipse.cbi.maven.plugins</groupId>
-              <artifactId>eclipse-macsigner-plugin</artifactId>
-              <version>${cbi-plugins.version}</version>
-              <executions>
-                <execution>
-                  <goals>
-                    <goal>sign</goal>
-                  </goals>
-                  <phase>package</phase>
-                </execution>
-              </executions>
-            </plugin>
-
+          <plugin>
+            <groupId>org.eclipse.cbi.maven.plugins</groupId>
+            <artifactId>eclipse-macsigner-plugin</artifactId>
+            <version>${cbi-plugins.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.cbi.maven.plugins</groupId>
+            <artifactId>eclipse-dmg-packager</artifactId>
+            <version>${cbi-plugins.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>package-dmg</goal>
+                </goals>
+                <phase>integration-test</phase>
+                <configuration>
+                  <source>${project.build.directory}/products/org.eclipse.sdk.ide-macosx.cocoa.x86_64.tar.gz</source>
+                  <continueOnFail>true</continueOnFail>
+                  <sign>true</sign>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 8b22c2ff1..15fd61b26 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
+# Copyright (c) 2017 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -703,6 +703,7 @@ fn-gather-sdk ()
     cp org.eclipse.sdk.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-x86_64.tar.gz
     cp org.eclipse.sdk.ide-linux.gtk.x86.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk.tar.gz
     cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz
+    cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.dmg "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg
     cp org.eclipse.sdk.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32-x86_64.zip
     cp org.eclipse.sdk.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32.zip
     if [ "$buildType" == "M" ]
@@ -744,6 +745,7 @@ fn-gather-platform ()
     cp org.eclipse.platform.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz
     cp org.eclipse.platform.ide-linux.gtk.x86.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk.tar.gz
     cp org.eclipse.platform.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz
+    cp org.eclipse.platform.ide-macosx.cocoa.x86_64.dmg "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg
     cp org.eclipse.platform.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32-x86_64.zip
     cp org.eclipse.platform.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32.zip
     if [ "$buildType" == "M" ]
diff --git a/production/publish-equinox.sh b/production/publish-equinox.sh
index 02ee688ce..bac131794 100755
--- a/production/publish-equinox.sh
+++ b/production/publish-equinox.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
+# Copyright (c) 2017 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -84,6 +84,7 @@ fn-eq-gather-starterkit ()
     cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.x86.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz
 
     cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz
+    cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.dmg "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.dmg
 
 
     cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86_64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip