From 12c991ab837e7927c3a30ce408f42cde420197ea Mon Sep 17 00:00:00 2001
From: Thanh Ha
Date: Mon, 25 Jun 2012 10:36:48 -0400
Subject: Bug 370704 - equinox launchers build - patch v2
---
bundles/org.eclipse.equinox.executable/pom.xml | 68 +++++++++++++++++++--
.../pom.xml | 3 +
.../pom.xml | 3 +
.../pom.xml | 3 +
.../pom.xml | 3 +
.../pom.xml | 3 +
launcher-binary-parent/pom.xml | 71 ++++++++++++++++------
pom.xml | 17 +++---
8 files changed, 138 insertions(+), 33 deletions(-)
diff --git a/bundles/org.eclipse.equinox.executable/pom.xml b/bundles/org.eclipse.equinox.executable/pom.xml
index 5ac0e1824..c41217b47 100644
--- a/bundles/org.eclipse.equinox.executable/pom.xml
+++ b/bundles/org.eclipse.equinox.executable/pom.xml
@@ -28,13 +28,69 @@
- org.eclipse.tycho
- target-platform-configuration
-
- true
-
+ maven-antrun-plugin
+ 1.7
+
+
+ copy-executable-natives
+ generate-resources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+ bsf
+ bsf
+ 2.4.0
+
+
+ rhino
+ js
+ 1.7R2
+
+
+ org.apache.ant
+ ant-apache-bsf
+ 1.8.3
+
+
+ org.apache.ant
+ ant-nodeps
+ 1.8.1
+
+
-
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 d90abfb25..06dc606d6 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
@@ -26,6 +26,9 @@
1500
+ macosx
+ cocoa
+ x86_64
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 fdd83c008..65d08f35c 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
@@ -27,5 +27,8 @@
1500
+ linux
+ gtk
+ x86
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 b16654b08..020a15682 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
@@ -27,5 +27,8 @@
1500
+ linux
+ gtk
+ x86_64
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 94d5e4fe9..2e92534b6 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
@@ -28,5 +28,8 @@
1500
dll
+ win32
+ win32
+ x86
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 3666980cd..e0fdfbb31 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
@@ -28,5 +28,8 @@
1500
dll
+ win32
+ win32
+ x86_64
diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml
index 6c6d10bc5..40fbb3602 100644
--- a/launcher-binary-parent/pom.xml
+++ b/launcher-binary-parent/pom.xml
@@ -32,34 +32,65 @@
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.3
+ org.eclipse.tycho
+ target-platform-configuration
+ ${tycho.version}
+
+
+
+ ${os}
+ ${ws}
+ ${arch}
+
+
+
+
+
+ maven-antrun-plugin
+ 1.7
- copy-binary
-
- copy
-
+ copy-launcher-natives
generate-resources
-
-
- ${project.groupId}
- ${project.artifactId}
- ${launcher-binary.version}
- binary
- ${launcher-binary.ext}
-
- ${project.basedir}
- eclipse_${launcher-binary.version}.${launcher-binary.ext}
-
-
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+ bsf
+ bsf
+ 2.4.0
+
+
+ rhino
+ js
+ 1.7R2
+
+
+ org.apache.ant
+ ant-apache-bsf
+ 1.8.3
+
+
+ org.apache.ant
+ ant-nodeps
+ 1.8.1
+
+
-
diff --git a/pom.xml b/pom.xml
index d38a50697..3d4b77f68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,11 +33,19 @@
bundles/org.eclipse.osgi.util
bundles/org.eclipse.osgi/supplement
-
+
+
bundles/org.eclipse.osgi.tests
--
cgit v1.2.3