diff options
43 files changed, 474 insertions, 186 deletions
@@ -13,4 +13,4 @@ Icon? Thumbs.db *.tmp target/ -/repository +/archive diff --git a/packages/org.eclipse.epp.package.automotive.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.automotive.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.automotive.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.automotive.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.automotive.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.automotive.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.automotive.product/pom.xml b/packages/org.eclipse.epp.package.automotive.product/pom.xml index a2639040..4b6024ad 100644 --- a/packages/org.eclipse.epp.package.automotive.product/pom.xml +++ b/packages/org.eclipse.epp.package.automotive.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.common.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.common.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.common.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.cpp.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.cpp.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.cpp.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.cpp.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.cpp.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.cpp.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.cpp.product/pom.xml b/packages/org.eclipse.epp.package.cpp.product/pom.xml index 82007eec..5dec4cc3 100644 --- a/packages/org.eclipse.epp.package.cpp.product/pom.xml +++ b/packages/org.eclipse.epp.package.cpp.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.dsl.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.dsl.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.dsl.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.dsl.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.dsl.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.dsl.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.dsl.product/pom.xml b/packages/org.eclipse.epp.package.dsl.product/pom.xml index cc7c0082..fc18ebac 100644 --- a/packages/org.eclipse.epp.package.dsl.product/pom.xml +++ b/packages/org.eclipse.epp.package.dsl.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.java.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.java.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.java.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.java.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.java.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.java.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.java.product/pom.xml b/packages/org.eclipse.epp.package.java.product/pom.xml index 29082c46..4b97db55 100644 --- a/packages/org.eclipse.epp.package.java.product/pom.xml +++ b/packages/org.eclipse.epp.package.java.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.jee.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.jee.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.jee.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.jee.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.jee.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.jee.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.jee.product/pom.xml b/packages/org.eclipse.epp.package.jee.product/pom.xml index 316ffac0..e42aa4f8 100644 --- a/packages/org.eclipse.epp.package.jee.product/pom.xml +++ b/packages/org.eclipse.epp.package.jee.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.modeling.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.modeling.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.modeling.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.modeling.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.modeling.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.modeling.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.modeling.product/pom.xml b/packages/org.eclipse.epp.package.modeling.product/pom.xml index 6501f433..9bb327a4 100644 --- a/packages/org.eclipse.epp.package.modeling.product/pom.xml +++ b/packages/org.eclipse.epp.package.modeling.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.parallel.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.parallel.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.parallel.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.parallel.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.parallel.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.parallel.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.parallel.product/pom.xml b/packages/org.eclipse.epp.package.parallel.product/pom.xml index dc44c737..90c339b4 100644 --- a/packages/org.eclipse.epp.package.parallel.product/pom.xml +++ b/packages/org.eclipse.epp.package.parallel.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.php.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.php.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.php.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.php.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.php.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.php.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.php.product/pom.xml b/packages/org.eclipse.epp.package.php.product/pom.xml index d849c827..02f5f6c2 100644 --- a/packages/org.eclipse.epp.package.php.product/pom.xml +++ b/packages/org.eclipse.epp.package.php.product/pom.xml @@ -75,25 +75,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -104,6 +91,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.rcp.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.rcp.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.rcp.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.rcp.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.rcp.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.rcp.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.rcp.product/pom.xml b/packages/org.eclipse.epp.package.rcp.product/pom.xml index cb84d9a0..9425c7f0 100644 --- a/packages/org.eclipse.epp.package.rcp.product/pom.xml +++ b/packages/org.eclipse.epp.package.rcp.product/pom.xml @@ -76,31 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <!-- - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> - --> </executions> <configuration> - <!-- - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> - --> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <!-- - <archiveFileName>${project.build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> - --> </product> </products> <profile>${project.artifactId}</profile> @@ -139,7 +120,7 @@ <arguments> <argument>${eclipse.epp.archiveDirectory}</argument> <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> - <argument>${project.build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> </arguments> </configuration> </plugin> diff --git a/packages/org.eclipse.epp.package.reporting.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.reporting.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.reporting.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.reporting.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.reporting.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.reporting.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.reporting.product/pom.xml b/packages/org.eclipse.epp.package.reporting.product/pom.xml index 25779ca7..ac09a8fd 100644 --- a/packages/org.eclipse.epp.package.reporting.product/pom.xml +++ b/packages/org.eclipse.epp.package.reporting.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.scout.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.scout.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.scout.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.scout.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.scout.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.scout.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.scout.product/pom.xml b/packages/org.eclipse.epp.package.scout.product/pom.xml index bde4731c..6e77ad5d 100644 --- a/packages/org.eclipse.epp.package.scout.product/pom.xml +++ b/packages/org.eclipse.epp.package.scout.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.standard.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.standard.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.standard.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.standard.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.standard.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.standard.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.standard.product/pom.xml b/packages/org.eclipse.epp.package.standard.product/pom.xml index 00b165f5..ba9abaa8 100644 --- a/packages/org.eclipse.epp.package.standard.product/pom.xml +++ b/packages/org.eclipse.epp.package.standard.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/packages/org.eclipse.epp.package.testing.feature/.forceQualifierUpdate b/packages/org.eclipse.epp.package.testing.feature/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.testing.feature/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.testing.product/.forceQualifierUpdate b/packages/org.eclipse.epp.package.testing.product/.forceQualifierUpdate new file mode 100644 index 00000000..546a7b5d --- /dev/null +++ b/packages/org.eclipse.epp.package.testing.product/.forceQualifierUpdate @@ -0,0 +1 @@ +4.4.0.20140307-2050 diff --git a/packages/org.eclipse.epp.package.testing.product/pom.xml b/packages/org.eclipse.epp.package.testing.product/pom.xml index cf3f6707..19205748 100644 --- a/packages/org.eclipse.epp.package.testing.product/pom.xml +++ b/packages/org.eclipse.epp.package.testing.product/pom.xml @@ -76,25 +76,12 @@ <goal>materialize-products</goal> </goals> </execution> - <execution> - <id>archive-products</id> - <phase>pre-integration-test</phase> - <goals> - <goal>archive-products</goal> - </goals> - </execution> </executions> <configuration> - <formats> - <win32>zip</win32> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> <products> <product> <id>${project.artifactId}</id> <rootFolder>eclipse</rootFolder> - <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> </product> </products> <profile>${project.artifactId}</profile> @@ -105,6 +92,42 @@ <profiles> <profile> + <id>archiving</id> + <!-- This profile is only activated when running the build on a Unix-like OS where we can expect a working Bash --> + <activation> + <activeByDefault>false</activeByDefault> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>archive-products</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>${basedir}/../../releng/org.eclipse.epp.config/tools/createArchives.sh</executable> + <arguments> + <argument>${eclipse.epp.archiveDirectory}</argument> + <argument>${project.build.directory}/products/epp.package.${eclipse.epp.id}</argument> + <argument>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</argument> + </arguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>eclipse-sign</id> <build> <plugins> diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index 9bdd9595..5ffa5e1c 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -31,14 +31,14 @@ <!-- The location that is used to assemble the single EPP configuration p2 repository --> <eclipse.epp.archiveDirectory>${basedir}/../../archive/</eclipse.epp.archiveDirectory> <!-- The location that is used to assemble the single EPP configuration p2 repository --> - <eclipse.epp.targetRepository>${basedir}/../../repository/</eclipse.epp.targetRepository> + <eclipse.epp.targetRepository>${eclipse.epp.archiveDirectory}/repository/</eclipse.epp.targetRepository> <!-- ID used to generate the filename of the packages --> <eclipse.simultaneous.release.id>luna-M6</eclipse.simultaneous.release.id> - <!-- timestamp used in various places, e.g. the about dialog (see about.mappings) --> + <!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) --> <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build> - <!-- human readable name of the release, e.g. used in the about dialog (see about.mappings) --> + <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) --> <eclipse.simultaneous.release.name>Luna M6 Release (4.4.0M6)</eclipse.simultaneous.release.name> - <!-- upstream p2 repository, used as a source for pre-compiled build artifacts --> + <!-- Upstream p2 repository, used as a source for pre-compiled build artifacts --> <eclipse.simultaneous.release.repository>http://download.eclipse.org/releases/staging/</eclipse.simultaneous.release.repository> </properties> diff --git a/releng/org.eclipse.epp.config/tools/createArchives.sh b/releng/org.eclipse.epp.config/tools/createArchives.sh index 9aa14e60..03bc57a3 100755 --- a/releng/org.eclipse.epp.config/tools/createArchives.sh +++ b/releng/org.eclipse.epp.config/tools/createArchives.sh @@ -13,11 +13,13 @@ if [[ ! -d "${TARGET_DIR}" ]]; then echo "Creating target directory ${TARGET_DIR}" mkdir -p ${TARGET_DIR} fi +echo "Starting archive creation in target directory ${TARGET_DIR}" if [[ ! -d "${SOURCE_DIR}" ]]; then echo "Source directory ${SOURCE_DIR} does not exist" exit 1 fi +echo "Using packages from source directory ${SOURCE_DIR}" # definition of OS, WS, ARCH, FORMAT combinations - DO NOT FORGET to adjust the for loop OSes=( win32 win32 linux linux macosx macosx ) @@ -27,18 +29,20 @@ FORMAT=( zip zip tar.gz tar.gz tar.gz tar.gz ) for index in 0 1 2 3 4 5; do - echo -n "...EPP building ${BASENAME} for ${OSes[$index]} ${WSes[$index]} ${ARCHes[$index]} " EXTENSION="${OSes[$index]}.${WSes[$index]}.${ARCHes[$index]}" + echo -n "Building archive ${BASENAME} for ${EXTENSION} : " PACKAGE_DIR="${SOURCE_DIR}/${OSes[$index]}/${WSes[$index]}/${ARCHes[$index]}" - # TODO check existence of directory cd "${PACKAGE_DIR}" if [[ ${OSes[$index]} = "win32" ]]; then PACKAGEFILE="${BASENAME}-${EXTENSION}.zip" - zip -r -o -q ${TARGET_DIR}/${PACKAGEFILE} eclipse + zip -r -o -q ${TARGET_DIR}/${PACKAGEFILE} eclipse || exit 1 else PACKAGEFILE="${BASENAME}-${EXTENSION}.tar.gz" - tar zc --owner=100 --group=100 -f ${TARGET_DIR}/${PACKAGEFILE} eclipse + tar zc --owner=100 --group=100 -f ${TARGET_DIR}/${PACKAGEFILE} eclipse || exit 1 fi - echo "...successfully finished ${OSes[$index]} ${WSes[$index]} ${ARCHes[$index]} package build: ${PACKAGEFILE}" + echo "${PACKAGEFILE}" done +echo "Package archive creation in target directory ${TARGET_DIR} finished successfully" +exit 0 + |