Skip to content

Commit

Permalink
Bug 572348: New profile eclipse-package-dmg
Browse files Browse the repository at this point in the history
This change makes the documented `mvn clean verify -Pepp.package.rcp`
actually work.

The CI build configs need a corresponding change.

Change-Id: I5e695e059b1491c885f1d12025556804dd34a594
  • Loading branch information
jonahgraham committed Mar 26, 2021
1 parent a867e27 commit 4979fd1
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 21 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,17 @@ Each package uses its own profile:
- epp.package.rcp
- epp.package.scout

macOS dmg files can only be created within the Eclipse Foundation network. To enable creating
dmg files enable the eclipse-package-dmg profile. Without eclipse-package-dmg enabled, the .tar.gz
for macOS will be created regardless.

With the signing profiles enabled, the build artifacts (bundles, features) and the
Windows and macOS executables are signed. This is done by using the Eclipse Foundation
internal signing service and can be activated only if the build is running there.

- eclipse-sign-jar profile enables signing of the EPP bundles and jar files
- eclipse-sign-mac profile enables usage of macOS signing service
- eclipse-sign-dmg profile enables signing of the DMG files for the macOS platform
- eclipse-sign-dmg profile enables signing of the DMG files for the macOS platform (the eclipse-package-dmg needs to be enabled too!)
- eclipse-sign-windows profile enables usage of Windows signing service

Additional Configuration Possibilities
Expand Down
47 changes: 27 additions & 20 deletions releng/org.eclipse.epp.config/parent/product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,25 +96,6 @@
<artifactId>tycho-p2-director-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-dmg-packager</artifactId>
<executions>
<execution>
<goals>
<goal>package-dmg</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<serviceUrl>https://cbi.eclipse.org/macos/packager/dmg/create</serviceUrl>
<source>${project.build.directory}/products/${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}-macosx.cocoa.x86_64.tar.gz</source>
<sign>${eclipse-sign-dmg-property}</sign>
<timeoutMillis>600000</timeoutMillis>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down Expand Up @@ -144,6 +125,32 @@
</build>

<profiles>
<profile>
<id>eclipse-package-dmg</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-dmg-packager</artifactId>
<executions>
<execution>
<goals>
<goal>package-dmg</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<serviceUrl>https://cbi.eclipse.org/macos/packager/dmg/create</serviceUrl>
<source>${project.build.directory}/products/${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}-macosx.cocoa.x86_64.tar.gz</source>
<sign>${eclipse-sign-dmg-property}</sign>
<timeoutMillis>600000</timeoutMillis>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>eclipse-sign-mac</id>
<build>
Expand Down Expand Up @@ -209,7 +216,7 @@
<profile>
<id>eclipse-sign-dmg</id>
<properties>
<eclipse-sign-dmg-property>true</eclipse-sign-dmg-property>
<eclipse-sign-dmg-property>true</eclipse-sign-dmg-property>
</properties>
</profile>

Expand Down

0 comments on commit 4979fd1

Please sign in to comment.