365159b3a7
- Drop upstreamed jetty9/servlet and workspace picker patches - Drop upstreamed patches for bug 903537 and bug 444143 - Update eclipse-build snapshot for ant dependency - Ship missing features used by some other projects' target platform - Build with mvn_build macro - Some spec file clean-up
361 lines
13 KiB
Diff
361 lines
13 KiB
Diff
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
|
@@ -27,4 +27,37 @@
|
|
<ws>gtk</ws>
|
|
<arch>x86_64</arch>
|
|
</properties>
|
|
+ <profiles>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.x86_64</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.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="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+ </profiles>
|
|
</project>
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
|
@@ -27,4 +27,37 @@
|
|
<ws>win32</ws>
|
|
<arch>x86_64</arch>
|
|
</properties>
|
|
+ <profiles>
|
|
+ <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="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+ </profiles>
|
|
</project>
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml.orig 2014-04-16 15:57:02.805249103 +0100
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 2014-04-16 15:57:26.204834155 +0100
|
|
@@ -27,4 +27,37 @@
|
|
<ws>gtk</ws>
|
|
<arch>ppc64le</arch>
|
|
</properties>
|
|
+ <profiles>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.ppc64le</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.ppc64le</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="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+ </profiles>
|
|
</project>
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
|
@@ -27,4 +27,37 @@
|
|
<ws>gtk</ws>
|
|
<arch>x86</arch>
|
|
</properties>
|
|
+ <profiles>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.x86</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.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="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+ </profiles>
|
|
</project>
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
|
@@ -27,4 +27,37 @@
|
|
<ws>win32</ws>
|
|
<arch>x86</arch>
|
|
</properties>
|
|
+ <profiles>
|
|
+ <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="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+ </profiles>
|
|
</project>
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
|
@@ -27,4 +27,37 @@
|
|
<ws>gtk</ws>
|
|
<arch>s390</arch>
|
|
</properties>
|
|
+ <profiles>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.s390</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.s390</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="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+ </profiles>
|
|
</project>
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 2014-04-16 15:53:08.146402075 +0100
|
|
@@ -27,4 +27,37 @@
|
|
<ws>gtk</ws>
|
|
<arch>s390x</arch>
|
|
</properties>
|
|
+ <profiles>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.s390x</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.s390x</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="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+ </profiles>
|
|
</project>
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml 2014-04-16 15:57:28.315796703 +0100
|
|
@@ -27,4 +27,37 @@
|
|
<ws>gtk</ws>
|
|
<arch>ppc64</arch>
|
|
</properties>
|
|
+ <profiles>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.ppc64</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.ppc64</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="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+ </profiles>
|
|
</project>
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml 2014-04-16 15:53:08.146402075 +0100
|
|
@@ -27,4 +27,37 @@
|
|
<ws>gtk</ws>
|
|
<arch>ppc</arch>
|
|
</properties>
|
|
+ <profiles>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.ppc</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.ppc</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="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+ </profiles>
|
|
</project>
|