aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2012-09-10 16:12:49 (EDT)
committerThomas Watson2012-09-13 10:48:07 (EDT)
commit0acc8b1bd54d183dedaa0f82255c97b9b9d7c4ac (patch)
tree4b2cc89a79aad7531e3dcf9ccc9b535113816bee
parent4ce94acdab063186d909b1dc2296bb7b3460f713 (diff)
downloadrt.equinox.framework-0acc8b1bd54d183dedaa0f82255c97b9b9d7c4ac.zip
rt.equinox.framework-0acc8b1bd54d183dedaa0f82255c97b9b9d7c4ac.tar.gz
rt.equinox.framework-0acc8b1bd54d183dedaa0f82255c97b9b9d7c4ac.tar.bz2
Bug 370704 - equinox launchers build
-rw-r--r--bundles/org.eclipse.equinox.executable/pom.xml419
-rw-r--r--launcher-binary-parent/pom.xml2
2 files changed, 352 insertions, 69 deletions
diff --git a/bundles/org.eclipse.equinox.executable/pom.xml b/bundles/org.eclipse.equinox.executable/pom.xml
index c41217b..af3c13d 100644
--- a/bundles/org.eclipse.equinox.executable/pom.xml
+++ b/bundles/org.eclipse.equinox.executable/pom.xml
@@ -25,72 +25,355 @@
<version>3.6.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version> 1.7 </version>
- <executions>
- <execution>
- <id>copy-executable-natives</id>
- <phase>generate-resources</phase>
- <configuration>
- <target>
- <!-- We need to get binary bits from binary repo -->
- <copy todir="bin" overwrite="true">
- <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
- <include name="**/*" />
- </fileset>
- </copy>
-
- <!-- Things below were copied from custombuildCallbacks.xml, as Tycho does not support that -->
- <copy includeEmptyDirs="false" todir="tempBin">
- <fileset dir="bin" />
- </copy>
- <delete dir="bin" />
- <move todir="bin">
- <fileset dir="tempBin" />
- </move>
-
- <!-- rename eclipse launchers to "launcher" -->
- <move todir="bin" verbose="true">
- <fileset dir="bin" />
- <regexpmapper from="^(.*[/\\])eclipse(.exe)?$" to="\1launcher\2" />
- </move>
- <move todir="contributed" verbose="true">
- <fileset dir="contributed" />
- <regexpmapper from="^(.*[/\\])eclipse(.exe)?$" to="\1launcher\2" />
- </move>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>bsf</groupId>
- <artifactId>bsf</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>1.7R2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-apache-bsf</artifactId>
- <version>1.8.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.8.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>build-native-launchers-linux.gtk.x86_64</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>linux.gtk.x86_64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-linux.gtk.x86</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>linux.gtk.x86</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-win32.win32.x86_64</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>win32.win32.x86_64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/win32/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-win32.win32.x86</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>win32.win32.x86</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/win32/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-cocoa.macosx.x86_64</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>cocoa.macosx.x86_64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/carbon/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>assemble-launchers</id>
+ <activation>
+ <property>
+ <!-- workaround. activeByDefault is disabled when another profile is
+ selected. -->
+ <name>!longnotexistingproperty</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>copy-executable-natives</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <!-- We need to get binary bits from binary repo -->
+ <!-- If local binaries had been built, copy will not overwrite
+ them -->
+ <copy todir="bin">
+ <fileset
+ dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+
+ <!-- Things below were copied from custombuildCallbacks.xml, as
+ Tycho does not support that -->
+ <copy includeEmptyDirs="false" todir="tempBin">
+ <fileset dir="bin" />
+ </copy>
+ <delete dir="bin" />
+ <move todir="bin">
+ <fileset dir="tempBin" />
+ </move>
+
+ <!-- rename eclipse launchers to "launcher" -->
+ <move todir="bin" verbose="true">
+ <fileset dir="bin" />
+ <regexpmapper from="^(.*[/\\])eclipse(.exe)?$"
+ to="\1launcher\2" />
+ </move>
+ <move todir="contributed" verbose="true">
+ <fileset dir="contributed" />
+ <regexpmapper from="^(.*[/\\])eclipse(.exe)?$"
+ to="\1launcher\2" />
+ </move>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml
index 40fbb36..1114aeb 100644
--- a/launcher-binary-parent/pom.xml
+++ b/launcher-binary-parent/pom.xml
@@ -51,7 +51,7 @@
<executions>
<execution>
<id>copy-launcher-natives</id>
- <phase>generate-resources</phase>
+ <phase>process-resources</phase>
<configuration>
<property name="feature.base" value="." />
<target>