diff options
author | Sravan Kumar Lakkimsetti | 2020-04-28 05:56:39 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2020-07-15 12:07:08 +0000 |
commit | 7b8add0abdf251b073712d1837c4bb4e17c9ef0c (patch) | |
tree | 5cbd4c7e1ca73cb0aa95725c81902f4656074d88 | |
parent | 654d258568aff095441690f2eca63dd738d2206e (diff) | |
download | eclipse.platform.releng.aggregator-7b8add0abdf251b073712d1837c4bb4e17c9ef0c.tar.gz eclipse.platform.releng.aggregator-7b8add0abdf251b073712d1837c4bb4e17c9ef0c.tar.xz eclipse.platform.releng.aggregator-7b8add0abdf251b073712d1837c4bb4e17c9ef0c.zip |
Bug 564820 - Produce signed windows launcher bundles in the platform repo
Change-Id: Ieea83d6a56d6ff12b2db74793b31a152b8f08452
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
2 files changed, 83 insertions, 7 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product index 749956391..cfc0e281e 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product @@ -20,7 +20,8 @@ <launcher name="rt"> <linux icon="icon.xpm"/> <macosx icon="rt.icns"/> - <win useIco="false"> + <win useIco="true"> + <ico path="rt.ico"/> <bmp/> </win> </launcher> @@ -187,8 +188,8 @@ United States, other countries, or both. <plugin id="org.eclipse.equinox.frameworkadmin.equinox" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.equinox.p2.console" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator" autoStart="true" startLevel="3" /> - <property name="osgi.noShutdown" value="true" /> <property name="eclipse.ignoreApp" value="true" /> + <property name="osgi.noShutdown" value="true" /> </configurations> </product> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml index 30f0f72bd..6fc19cfcc 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, 2017 Eclipse Foundation. + Copyright (c) 2012, 2020 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 @@ -66,6 +66,7 @@ <executions> <execution> <id>materialize-products</id> + <phase>pre-integration-test</phase> <goals> <goal>materialize-products</goal> </goals> @@ -84,7 +85,7 @@ </execution> <execution> <id>archive-products</id> - <phase>pre-integration-test</phase> + <phase>post-integration-test</phase> <goals> <goal>archive-products</goal> </goals> @@ -98,6 +99,27 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tycho.version}</version> + <executions> + <execution> + <id>default-assemble-repository</id> + <phase>package</phase> + <goals> + <goal>assemble-repository</goal> + </goals> + </execution> + <execution> + <id>default-archive-repository</id> + <phase>pre-integration-test</phase> + <goals> + <goal>archive-repository</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -106,6 +128,59 @@ <build> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>natives</id> + <phase>package</phase> + <configuration> + <target> + <path id="binary.id"> + <fileset dir="${project.build.directory}/repository/binary/"> + <include name="org.eclipse.rt.osgistarterkit.product.executable.win32.win32.x86_64_*"/> + </fileset> + </path> + <property name="binary.file" refid="binary.id"/> + + <echo message="BINARY = ${binary.file}" /> + + <unzip + src="${binary.file}" + dest="${project.build.directory}/tosign/" /> + + <exec dir="${project.build.directory}/tosign/" executable="curl"> + <arg value="--output"/> + <arg value="rt.exe"/> + <arg value="--form"/> + <arg value="file=@rt.exe"/> + <arg value="--silent"/> + <arg value="--show-error"/> + <arg value="--fail"/> + <arg value="http://build.eclipse.org:31338/winsign.php"/> + </exec> + <exec dir="${project.build.directory}/tosign/" executable="curl"> + <arg value="--output"/> + <arg value="eclipsec.exe"/> + <arg value="--form"/> + <arg value="file=@eclipsec.exe"/> + <arg value="--silent"/> + <arg value="--show-error"/> + <arg value="--fail"/> + <arg value="http://build.eclipse.org:31338/winsign.php"/> + </exec> + + <zip + destfile="${binary.file}" + basedir="${project.build.directory}/tosign/" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-winsigner-plugin</artifactId> <version>${cbi-plugins.version}</version> @@ -114,7 +189,7 @@ <goals> <goal>sign</goal> </goals> - <phase>package</phase> + <phase>integration-test</phase> <configuration> <fileNames> <fileName>rt.exe</fileName> @@ -132,7 +207,7 @@ <goals> <goal>sign</goal> </goals> - <phase>package</phase> + <phase>integration-test</phase> <configuration> <fileNames> <fileName>Rt.app</fileName> @@ -154,7 +229,7 @@ <goals> <goal>package-dmg</goal> </goals> - <phase>integration-test</phase> + <phase>verify</phase> <configuration> <source>${project.build.directory}/products/org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz</source> <continueOnFail>true</continueOnFail> |