Attachment 233950 Details for Bug 386377 – No refactoring patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] No refactoring patch

0001-Bug-386377-Native-launcher-not-built-during-first-bu.patch (text/plain), 21.62 KB, created by Krzysztof Daniel

on 2013-07-30 12:15:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2013-07-30 12:15:36 EDT

Size: 21.62 KB

patch

obsolete

>From 24be2cfdb0688c1631755403c49dceefa6222626 Mon Sep 17 00:00:00 2001
>From: Krzysztof Daniel <kdaniel@redhat.com>
>Date: Tue, 30 Jul 2013 12:22:42 +0200
>Subject: [PATCH] Bug 386377 - Native launcher not built during first build
>
>Ensure that native libraries are rather build together with fragments
>instead of the feature, which was built last, and fragments failed to
>include native libraries.
>
>
>Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
>Signed-off-by: Krzysztof Daniel <kdaniel@redhat.com>
>---
> 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.executable/pom.xml b/bundles/org.eclipse.equinox.executable/pom.xml
>index 182de7d..2a3a52d 100644
>--- a/bundles/org.eclipse.equinox.executable/pom.xml
>+++ b/bundles/org.eclipse.equinox.executable/pom.xml
>@@ -24,271 +24,6 @@
> 
>   <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="build.xml" dir="library/gtk/" target="build_eclipse"/>
>-                  </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-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="build.xml" dir="library/gtk/" target="build_eclipse"/>
>-                  </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"/>
>-                  </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"/>
>-                  </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"/>
>-                  </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>
>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..31fed7e 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>
>+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/carbon/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/carbon/" target="build_eclipse"/>
>+                  </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..9bd2edb 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>
>+                    <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>
>+            <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..981ebcb 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>
>+                    <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>
>+            <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..fd370eb 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>
>+                    <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>
>+            <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..abe4ced 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>
>+                    <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>
>+            <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
>

Actions: View | Diff

Attachments on bug 386377: 233950 | 233951