diff options
author | Markus Knauer | 2013-11-27 21:14:21 +0000 |
---|---|---|
committer | Markus Knauer | 2013-11-27 22:44:13 +0000 |
commit | 279a593929f6774fcaea30ff065ac4f7db3676be (patch) | |
tree | 9944aee99edb13c3a036bf6a9116c77044e9a437 | |
parent | b3399e377083cc8f30aadf14bb4c0991444b6ee2 (diff) | |
download | org.eclipse.epp.packages-279a593929f6774fcaea30ff065ac4f7db3676be.tar.gz org.eclipse.epp.packages-279a593929f6774fcaea30ff065ac4f7db3676be.tar.xz org.eclipse.epp.packages-279a593929f6774fcaea30ff065ac4f7db3676be.zip |
Tune product's pom files: change artifactId, p2 profile, directory
- change Maven artifact ID of product modules
- use dedicated p2 profile ID instead of default profile
- create package content in 'eclipse' directory
- harmonize pom files
24 files changed, 160 insertions, 64 deletions
diff --git a/packages/org.eclipse.epp.package.automotive.feature/.project b/packages/org.eclipse.epp.package.automotive.feature/.project index dd1e8b4c..59923843 100644 --- a/packages/org.eclipse.epp.package.automotive.feature/.project +++ b/packages/org.eclipse.epp.package.automotive.feature/.project @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.epp.package.automotive.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.epp.package.automotive.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> diff --git a/packages/org.eclipse.epp.package.automotive.product/pom.xml b/packages/org.eclipse.epp.package.automotive.product/pom.xml index 627e9e5b..90371e87 100644 --- a/packages/org.eclipse.epp.package.automotive.product/pom.xml +++ b/packages/org.eclipse.epp.package.automotive.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.automotive.product</artifactId> + <artifactId>epp.package.automotive</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.automotive</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.automotive</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.common.feature/.project b/packages/org.eclipse.epp.package.common.feature/.project index acd74016..fdb7e348 100644 --- a/packages/org.eclipse.epp.package.common.feature/.project +++ b/packages/org.eclipse.epp.package.common.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.common.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.cpp.feature/.project b/packages/org.eclipse.epp.package.cpp.feature/.project index 701cb623..22c91e8f 100644 --- a/packages/org.eclipse.epp.package.cpp.feature/.project +++ b/packages/org.eclipse.epp.package.cpp.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.cpp.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.cpp.product/pom.xml b/packages/org.eclipse.epp.package.cpp.product/pom.xml index 1bc4b596..662f5ddb 100644 --- a/packages/org.eclipse.epp.package.cpp.product/pom.xml +++ b/packages/org.eclipse.epp.package.cpp.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.cpp.product</artifactId> + <artifactId>epp.package.cpp</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.cpp</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.cpp</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.dsl.feature/.project b/packages/org.eclipse.epp.package.dsl.feature/.project index a0920e47..890f5b56 100644 --- a/packages/org.eclipse.epp.package.dsl.feature/.project +++ b/packages/org.eclipse.epp.package.dsl.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.dsl.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.dsl.product/pom.xml b/packages/org.eclipse.epp.package.dsl.product/pom.xml index f647a8ec..c80a85e9 100644 --- a/packages/org.eclipse.epp.package.dsl.product/pom.xml +++ b/packages/org.eclipse.epp.package.dsl.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.dsl.product</artifactId> + <artifactId>epp.package.dsl</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.dsl</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.dsl</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.java.feature/.project b/packages/org.eclipse.epp.package.java.feature/.project index 7215382f..b62916b9 100644 --- a/packages/org.eclipse.epp.package.java.feature/.project +++ b/packages/org.eclipse.epp.package.java.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.java.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.java.product/pom.xml b/packages/org.eclipse.epp.package.java.product/pom.xml index f3082b4e..1b7580b3 100644 --- a/packages/org.eclipse.epp.package.java.product/pom.xml +++ b/packages/org.eclipse.epp.package.java.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.java.product</artifactId> + <artifactId>epp.package.java</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.java</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.java</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.jee.feature/.project b/packages/org.eclipse.epp.package.jee.feature/.project index 4f1de524..cb61a0c3 100644 --- a/packages/org.eclipse.epp.package.jee.feature/.project +++ b/packages/org.eclipse.epp.package.jee.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.jee.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.jee.product/pom.xml b/packages/org.eclipse.epp.package.jee.product/pom.xml index c141a0ce..f48553e6 100644 --- a/packages/org.eclipse.epp.package.jee.product/pom.xml +++ b/packages/org.eclipse.epp.package.jee.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.jee.product</artifactId> + <artifactId>epp.package.jee</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.jee</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.jee</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.modeling.feature/.project b/packages/org.eclipse.epp.package.modeling.feature/.project index 2a323db9..8a653b35 100644 --- a/packages/org.eclipse.epp.package.modeling.feature/.project +++ b/packages/org.eclipse.epp.package.modeling.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.modeling.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.modeling.product/pom.xml b/packages/org.eclipse.epp.package.modeling.product/pom.xml index c09e20b6..1e307f50 100644 --- a/packages/org.eclipse.epp.package.modeling.product/pom.xml +++ b/packages/org.eclipse.epp.package.modeling.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.modeling.product</artifactId> + <artifactId>epp.package.modeling</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.modeling</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.modeling</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.parallel.feature/.project b/packages/org.eclipse.epp.package.parallel.feature/.project index c9cc5675..bcc03267 100644 --- a/packages/org.eclipse.epp.package.parallel.feature/.project +++ b/packages/org.eclipse.epp.package.parallel.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.parallel.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.parallel.product/pom.xml b/packages/org.eclipse.epp.package.parallel.product/pom.xml index b5e71514..82c4d91f 100644 --- a/packages/org.eclipse.epp.package.parallel.product/pom.xml +++ b/packages/org.eclipse.epp.package.parallel.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.parallel.product</artifactId> + <artifactId>epp.package.parallel</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.parallel</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.parallel</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.rcp.feature/.project b/packages/org.eclipse.epp.package.rcp.feature/.project index 29abdac7..15bb6fb9 100644 --- a/packages/org.eclipse.epp.package.rcp.feature/.project +++ b/packages/org.eclipse.epp.package.rcp.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.rcp.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.rcp.product/pom.xml b/packages/org.eclipse.epp.package.rcp.product/pom.xml index fc87e607..3c1be532 100644 --- a/packages/org.eclipse.epp.package.rcp.product/pom.xml +++ b/packages/org.eclipse.epp.package.rcp.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.rcp.product</artifactId> + <artifactId>epp.package.rcp</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.rcp</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.rcp</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.reporting.feature/.project b/packages/org.eclipse.epp.package.reporting.feature/.project index c07dd474..54de00b7 100644 --- a/packages/org.eclipse.epp.package.reporting.feature/.project +++ b/packages/org.eclipse.epp.package.reporting.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.reporting.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.reporting.product/pom.xml b/packages/org.eclipse.epp.package.reporting.product/pom.xml index 51db5dad..6c99d716 100644 --- a/packages/org.eclipse.epp.package.reporting.product/pom.xml +++ b/packages/org.eclipse.epp.package.reporting.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.reporting.product</artifactId> + <artifactId>epp.package.reporting</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.reporting</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.reporting</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.scout.feature/.project b/packages/org.eclipse.epp.package.scout.feature/.project index bc057c31..98c40591 100644 --- a/packages/org.eclipse.epp.package.scout.feature/.project +++ b/packages/org.eclipse.epp.package.scout.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.scout.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.scout.product/pom.xml b/packages/org.eclipse.epp.package.scout.product/pom.xml index 0446810d..72c46a0a 100644 --- a/packages/org.eclipse.epp.package.scout.product/pom.xml +++ b/packages/org.eclipse.epp.package.scout.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.scout.product</artifactId> + <artifactId>epp.package.scout</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.scout</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.scout</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.standard.feature/.project b/packages/org.eclipse.epp.package.standard.feature/.project index f2e9909e..2fc96235 100644 --- a/packages/org.eclipse.epp.package.standard.feature/.project +++ b/packages/org.eclipse.epp.package.standard.feature/.project @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.eclipse.epp.package.standard.feature</name> - <comment></comment> + <comment></comment> <projects> </projects> <buildSpec> diff --git a/packages/org.eclipse.epp.package.standard.product/pom.xml b/packages/org.eclipse.epp.package.standard.product/pom.xml index 3bbe5522..44ba2f91 100644 --- a/packages/org.eclipse.epp.package.standard.product/pom.xml +++ b/packages/org.eclipse.epp.package.standard.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.standard.product</artifactId> + <artifactId>epp.package.standard</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.standard</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.standard</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> diff --git a/packages/org.eclipse.epp.package.testing.product/pom.xml b/packages/org.eclipse.epp.package.testing.product/pom.xml index 22e9c51b..08e24348 100644 --- a/packages/org.eclipse.epp.package.testing.product/pom.xml +++ b/packages/org.eclipse.epp.package.testing.product/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.eclipse.epp</groupId> - <artifactId>org.eclipse.epp.package.testing.product</artifactId> + <artifactId>epp.package.testing</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> @@ -51,9 +51,17 @@ </executions> <configuration> <formats> + <win32>zip</win32> <linux>tar.gz</linux> <macosx>tar.gz</macosx> </formats> + <products> + <product> + <id>${project.artifactId}</id> + <rootFolder>eclipse</rootFolder> + </product> + </products> + <profile>${project.artifactId}</profile> </configuration> </plugin> </plugins> @@ -76,7 +84,7 @@ <goal>sign</goal> </goals> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.testing</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>Eclipse.app</fileName> </fileNames> @@ -96,7 +104,7 @@ </goals> <phase>package</phase> <configuration> - <baseSearchDir>${project.build.directory}/products/epp.package.testing</baseSearchDir> + <baseSearchDir>${project.build.directory}/products/${project.artifactId}</baseSearchDir> <fileNames> <fileName>eclipse.exe</fileName> <fileName>eclipsec.exe</fileName> |