Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2017-04-03 06:49:14 -0400
committerSravan Kumar Lakkimsetti2017-04-06 04:25:18 -0400
commit28b0cf8616006e3791fd7f749a829f1bd03f43ac (patch)
tree77b6bbb9f8a7b3bc42ddd3d50b6e7d3781d4bb63
parent1a91d1011b623c87a4565673f48739a26e5ba3ff (diff)
downloadeclipse.platform.releng.aggregator-28b0cf8616006e3791fd7f749a829f1bd03f43ac.tar.gz
eclipse.platform.releng.aggregator-28b0cf8616006e3791fd7f749a829f1bd03f43ac.tar.xz
eclipse.platform.releng.aggregator-28b0cf8616006e3791fd7f749a829f1bd03f43ac.zip
Bug 461670 - Make Mac download available as signed dmgslakkimsetti/signedDmgWork
Work in progress Do not commit Conflicts: eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml Change-Id: I068c67af946da7f81a5afeb11bf1e5365b6092b3
-rwxr-xr-xeclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh11
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml45
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml41
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml42
-rwxr-xr-xproduction/build-functions.shsource2
-rwxr-xr-xproduction/publish-equinox.sh1
7 files changed, 84 insertions, 60 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
index d903b5d8..d45afbf1 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh
@@ -65,6 +65,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 b857a5db..49dd9715 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 ae42a85d..0e779cc0 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -26,6 +26,10 @@
<version>4.7.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
+ <properties>
+ <signDmg>false</signDmg>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -109,11 +113,32 @@
</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>${signDmg}</sign>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
<profile>
<id>eclipse-sign</id>
+ <properties>
+ <signDmg>true</signDmg>
+ </properties>
<build>
<plugins>
<plugin>
@@ -134,7 +159,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-macsigner-plugin</artifactId>
@@ -153,25 +177,6 @@
</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 46d7d502..aa0e69a3 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
@@ -35,6 +35,7 @@
<properties>
<product-id>org.eclipse.platform.ide</product-id>
+ <signDmg>false</signDmg>
</properties>
<build>
@@ -86,11 +87,32 @@
</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>${signDmg}</sign>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
<profile>
<id>eclipse-sign</id>
+ <properties>
+ <signDmg>true</signDmg>
+ </properties>
<build>
<plugins>
<plugin>
@@ -119,25 +141,6 @@
</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 8a05df7b..ad62010c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -34,6 +34,7 @@
<properties>
<product-id>org.eclipse.sdk.ide</product-id>
+ <signDmg>false</signDmg>
</properties>
<build>
@@ -85,12 +86,33 @@
</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>${signDmg}</sign>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
<profile>
<id>eclipse-sign</id>
+ <properties>
+ <signDmg>true</signDmg>
+ </properties>
<build>
<plugins>
<plugin>
@@ -106,7 +128,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-macsigner-plugin</artifactId>
@@ -120,25 +141,6 @@
</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 8b22c2ff..1451ac6c 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -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 02ee688c..6f9c8318 100755
--- a/production/publish-equinox.sh
+++ b/production/publish-equinox.sh
@@ -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

Back to the top