diff options
author | Markus Knauer | 2017-09-04 11:43:39 +0000 |
---|---|---|
committer | Markus Knauer | 2017-09-04 13:52:34 +0000 |
commit | d6854bc2bb0cbc18c354664d7083a1a6895dbbb7 (patch) | |
tree | a5693c4023cd332af02a9a16ec235f43e2b75ad6 /releng/org.eclipse.epp.config | |
parent | 02b719ff4d203042cd647e5140800488d7e4275e (diff) | |
download | org.eclipse.epp.packages-d6854bc2bb0cbc18c354664d7083a1a6895dbbb7.tar.gz org.eclipse.epp.packages-d6854bc2bb0cbc18c354664d7083a1a6895dbbb7.tar.xz org.eclipse.epp.packages-d6854bc2bb0cbc18c354664d7083a1a6895dbbb7.zip |
Enable Mac OS / DMG builds again
Revert "Fix XML error in product pom.xml"
This reverts commit 02b719ff4d203042cd647e5140800488d7e4275e.
Change-Id: Id7910fb153077f128eacaf0dea20b3b8c7b75630
Revert "Disable building DMG files for Mac OS"
This reverts commit 42715ccd66b02d05e98042ace1f1cc72941d96c7.
Change-Id: If31f27419644d9cb2e0206706f437bf7ac057e83
Revert "Disable building Mac OS packages to circumvent build errors"
This reverts commit de2a40ae114e255fb255b7c550dec6ec6b0702be.
Change-Id: I65949a76f446ab9dfb2353d5a783cadc5a3ba9af
Change-Id: I1c8fd88027196c2e8b18b6ca571c290fb761ddc8
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
Diffstat (limited to 'releng/org.eclipse.epp.config')
-rw-r--r-- | releng/org.eclipse.epp.config/parent/pom.xml | 6 | ||||
-rw-r--r-- | releng/org.eclipse.epp.config/parent/product/pom.xml | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index 18eda5a7..1c14d09b 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -123,13 +123,11 @@ <ws>win32</ws> <arch>x86_64</arch> </environment> -<!-- <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86_64</arch> </environment> - --> </environments> </configuration> </plugin> @@ -355,13 +353,11 @@ <profile>${project.artifactId}</profile> </configuration> </plugin> -<!-- <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-dmg-packager</artifactId> <version>${cbi.version}</version> </plugin> ---> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> @@ -376,9 +372,7 @@ <fileset dir="${project.build.directory}/products"> <include name="*.zip" /> <include name="*linux*.tar.gz" /> -<!-- <include name="*.dmg" /> ---> </fileset> </copy> </target> diff --git a/releng/org.eclipse.epp.config/parent/product/pom.xml b/releng/org.eclipse.epp.config/parent/product/pom.xml index 6281d887..b7490b70 100644 --- a/releng/org.eclipse.epp.config/parent/product/pom.xml +++ b/releng/org.eclipse.epp.config/parent/product/pom.xml @@ -79,7 +79,6 @@ <artifactId>tycho-p2-director-plugin</artifactId> </plugin> -<!-- <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-dmg-packager</artifactId> @@ -92,12 +91,11 @@ <configuration> <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> - <connectTimeoutMillis>600000</connectTimeoutMillis> + <connectTimeoutMillis>600000</connectTimeoutMillis> <!-- 10 min --> </configuration> </execution> </executions> </plugin> - --> <plugin> <groupId>org.apache.maven.plugins</groupId> |