Updating build to match our new way to release
diff --git a/features/pom.xml b/features/pom.xml
index 1eecd14..ac9d064 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,33 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<artifactId>aggregator</artifactId>
<groupId>org.eclipse.ldt</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.ldt-features</groupId>
- <artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <modules>
- <module>org.eclipse.ldt-feature</module>
- <module>org.eclipse.ldt.product-feature</module>
- <module>org.eclipse.ldt.remote-feature</module>
- </modules>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.ldt-features</groupId>
+ <artifactId>features</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <deployableFeature>true</deployableFeature>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>build-source</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>org.eclipse.ldt-feature</module>
+ <module>org.eclipse.ldt.remote-feature</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>build-product</id>
+ <modules>
+ <module>org.eclipse.ldt.product-feature</module>
+ </modules>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <deployableFeature>true</deployableFeature>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/pom.xml b/pom.xml
index af5af83..b0f52fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
- <module>libraries</module>
- <module>plugins</module>
<module>features</module>
<module>tests</module>
<!-- <module>repository</module> -->
@@ -23,22 +21,29 @@
<maven-antrun-plugin-version>1.7</maven-antrun-plugin-version>
<tycho-version>0.20.0</tycho-version>
<tycho-extras-version>0.20.0</tycho-extras-version>
+ <shared-publish-rootpath>/shared/tools/ldt</shared-publish-rootpath>
+ <shared-products-folder>/products</shared-products-folder>
+ <shared-publish-nightly-product>${shared-publish-rootpath}${shared-products-folder}/nightly</shared-publish-nightly-product>
+ <shared-publish-nightly-maintenance-product>${shared-publish-rootpath}${shared-products-folder}/nightly-maintenance</shared-publish-nightly-maintenance-product>
<download-publish-rootpath>/home/data/httpd/download.eclipse.org/ldt/</download-publish-rootpath>
<download-publish-relativepath>updates-nightly</download-publish-relativepath>
+ <download-publish-maintenance-relativepath>updates-nightly-maintenance</download-publish-maintenance-relativepath>
<download-publish-path>${download-publish-rootpath}${download-publish-relativepath}</download-publish-path>
<eclipse-site>http://download.eclipse.org/releases/luna</eclipse-site>
</properties>
-
- <!-- Precise git as scm for the buildnumber-maven-plugin plugin for the documentor build-->
- <scm>
- <connection>scm:git:</connection>
- </scm>
+
+ <!-- Precise git as scm for the buildnumber-maven-plugin plugin for the
+ documentor build -->
+ <scm>
+ <connection>scm:git:</connection>
+ </scm>
<profiles>
<profile>
<id>maintenance</id>
<properties>
- <download-publish-relativepath>updates-nightly-maintenance</download-publish-relativepath>
+ <download-publish-relativepath>${download-publish-maintenance-relativepath}</download-publish-relativepath>
+ <shared-publish-nightly-product>${shared-publish-nightly-maintenance-product}</shared-publish-nightly-product>
</properties>
</profile>
<profile>
@@ -48,6 +53,16 @@
</modules>
</profile>
<profile>
+ <id>build-source</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>libraries</module>
+ <module>plugins</module>
+ </modules>
+ </profile>
+ <profile>
<id>platform-indigo</id>
<activation>
<property>
@@ -125,11 +140,11 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>pack200-normalize</id>
- <goals>
- <goal>normalize</goal>
- </goals>
- <phase>verify</phase>
+ <id>pack200-normalize</id>
+ <goals>
+ <goal>normalize</goal>
+ </goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -139,11 +154,11 @@
<version>${eclipse-jarsigner-version}</version>
<executions>
<execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>verify</phase>
+ <id>sign</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -153,11 +168,11 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>pack200-pack</id>
- <goals>
- <goal>pack</goal>
- </goals>
- <phase>verify</phase>
+ <id>pack200-pack</id>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -167,11 +182,11 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>p2-metadata</id>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- <phase>verify</phase>
+ <id>p2-metadata</id>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ <phase>verify</phase>
</execution>
</executions>
<configuration>
@@ -215,7 +230,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>plugin-source</id>
+ <id>plugin-source</id>
<goals>
<goal>plugin-source</goal>
</goals>
@@ -290,7 +305,7 @@
<pluginRepositories>
<!-- repo for eclipse-jarsigner-plugin -->
<pluginRepository>
- <id>eclipse-cbi</id>
+ <id>eclipse-cbi</id>
<url>https://repo.eclipse.org/content/groups/cbi/</url>
</pluginRepository>
</pluginRepositories>
diff --git a/product/pom.xml b/product/pom.xml
index c7ccbd3..e027d96 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -34,7 +34,7 @@
</formats>
<products>
<product>
- <id>org.eclipse.ldt.product-product</id>
+ <id>org.eclipse.ldt.product-product</id>
<archiveFileName>org.eclipse.ldt.product</archiveFileName>
</product>
</products>
@@ -56,7 +56,7 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>deploy-nightly-update-site</id>
@@ -76,12 +76,23 @@
<tasks>
<delete includeemptydirs="false">
<fileset dir="${download-publish-path}">
- <include name="**"/>
+ <include name="**" />
</fileset>
</delete>
<copy includeemptydirs="false" todir="${download-publish-path}">
<fileset dir="target/repository">
- <include name="**"/>
+ <include name="**" />
+ </fileset>
+ </copy>
+ <delete includeemptydirs="false">
+ <fileset dir="${shared-publish-nightly-product}">
+ <include name="**" />
+ </fileset>
+ </delete>
+ <copy includeemptydirs="false"
+ todir="${shared-publish-nightly-product}">
+ <fileset dir="target/products/">
+ <include name="*" />
</fileset>
</copy>
</tasks>
