rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7511cd7779
eclipse/eclipse-bug-386377.patch

601 lines
21 KiB
Diff
Raw Normal View History

Improvements to the build
2013-07-31 09:06:35 +00:00
From 7aae376547c5f3306e311ce91c475c9a9667a0a0 Mon Sep 17 00:00:00 2001
From: Krzysztof Daniel <kdaniel@redhat.com>
Date: Tue, 30 Jul 2013 12:22:42 +0200
Subject: [PATCH] Build executables in the first run.
---
bundles/org.eclipse.equinox.executable/pom.xml | 265 ---------------------
.../pom.xml | 56 ++++-
.../pom.xml | 55 +++++
.../pom.xml | 55 +++++
.../pom.xml | 56 +++++
.../pom.xml | 56 +++++
6 files changed, 277 insertions(+), 266 deletions(-)
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
index 5a15c5b..d4fb54e 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
@@ -28,5 +28,59 @@
<ws>cocoa</ws>
<arch>x86_64</arch>
</properties>
-
+ <profiles>
+ <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>
Build right launcher version.
2013-10-14 16:55:49 +00:00
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/carbon/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/carbon/" target="build_eclipse"/>
Improvements to the build
2013-07-31 09:06:35 +00:00
+ </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/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
index 59f46ae..e7616ed 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
@@ -28,4 +28,59 @@
<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>
Build right launcher version.
2013-10-14 16:55:49 +00:00
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
Improvements to the build
2013-07-31 09:06:35 +00:00
+ </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/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
index d639b6e..8bf7d74 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
@@ -28,4 +28,59 @@
<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>
Build right launcher version.
2013-10-14 16:55:49 +00:00
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
Improvements to the build
2013-07-31 09:06:35 +00:00
+ </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/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
index e0b59be..f82005c 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
@@ -29,4 +29,60 @@
<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>
Build right launcher version.
2013-10-14 16:55:49 +00:00
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/win32/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/win32/" target="build_eclipse"/>
Improvements to the build
2013-07-31 09:06:35 +00:00
+ </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/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
index ce4252c..4b72b1f 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
@@ -29,4 +29,60 @@
<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>
Build right launcher version.
2013-10-14 16:55:49 +00:00
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/win32/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/win32/" target="build_eclipse"/>
Improvements to the build
2013-07-31 09:06:35 +00:00
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
Update to 4.3.1
2013-09-03 07:41:09 +00:00
+ </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/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
index ce4252c..4b72b1f 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
@@ -27,4 +27,60 @@
<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>
Build right launcher version.
2013-10-14 16:55:49 +00:00
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
Update to 4.3.1
2013-09-03 07:41:09 +00:00
+ </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/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
index ce4252c..4b72b1f 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
@@ -27,4 +27,60 @@
<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>
Build right launcher version.
2013-10-14 16:55:49 +00:00
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
Update to 4.3.1
2013-09-03 07:41:09 +00:00
+ </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/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
index ce4252c..4b72b1f 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
@@ -29,4 +29,60 @@
<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>
Build right launcher version.
2013-10-14 16:55:49 +00:00
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
Update to 4.3.1
2013-09-03 07:41:09 +00:00
+ </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/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
index ce4252c..4b72b1f 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
@@ -28,4 +28,60 @@
<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>
Build right launcher version.
2013-10-14 16:55:49 +00:00
+ <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
Update to 4.3.1
2013-09-03 07:41:09 +00:00
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
Improvements to the build
2013-07-31 09:06:35 +00:00
+ </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>
--
1.8.3.1
Reference in New Issue Copy Permalink