diff options
author | Thanh Ha | 2012-06-25 14:36:48 +0000 |
---|---|---|
committer | Thomas Watson | 2012-09-12 14:09:10 +0000 |
commit | 12c991ab837e7927c3a30ce408f42cde420197ea (patch) | |
tree | d60dd0ae93556f69301d99206889a3f8662d2e65 | |
parent | 4c0a6844156e526a9bfef65ae11f4ff3babec4a5 (diff) | |
download | rt.equinox.framework-12c991ab837e7927c3a30ce408f42cde420197ea.tar.gz rt.equinox.framework-12c991ab837e7927c3a30ce408f42cde420197ea.tar.xz rt.equinox.framework-12c991ab837e7927c3a30ce408f42cde420197ea.zip |
Bug 370704 - equinox launchers build - patch v2v20120912-140910
-rw-r--r-- | bundles/org.eclipse.equinox.executable/pom.xml | 68 | ||||
-rw-r--r-- | bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml | 3 | ||||
-rw-r--r-- | bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml | 3 | ||||
-rw-r--r-- | launcher-binary-parent/pom.xml | 71 | ||||
-rw-r--r-- | 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 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <configuration> - <allowConflictingDependencies>true</allowConflictingDependencies> - </configuration> + <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> - </project> 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 @@ <properties> <launcher-binary.version>1500</launcher-binary.version> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86_64</arch> </properties> </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 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 @@ <properties> <launcher-binary.version>1500</launcher-binary.version> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> </properties> </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 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 @@ <properties> <launcher-binary.version>1500</launcher-binary.version> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> </properties> </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 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 @@ <properties> <launcher-binary.version>1500</launcher-binary.version> <launcher-binary.ext>dll</launcher-binary.ext> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> </properties> </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 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 @@ <properties> <launcher-binary.version>1500</launcher-binary.version> <launcher-binary.ext>dll</launcher-binary.ext> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> </properties> </project> 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 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.3</version> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + <configuration> + <environments> + <environment> + <os>${os}</os> + <ws>${ws}</ws> + <arch>${arch}</arch> + </environment> + </environments> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> <executions> <execution> - <id>copy-binary</id> - <goals> - <goal>copy</goal> - </goals> + <id>copy-launcher-natives</id> <phase>generate-resources</phase> <configuration> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${launcher-binary.version}</version> - <classifier>binary</classifier> - <type>${launcher-binary.ext}</type> - - <outputDirectory>${project.basedir}</outputDirectory> - <destFileName>eclipse_${launcher-binary.version}.${launcher-binary.ext}</destFileName> - </artifactItem> - </artifactItems> + <property name="feature.base" value="." /> + <target> + <copy todir="." overwrite="true"> + <fileset dir="../../../rt.equinox.binaries/${project.artifactId}/"> + <include name="*.so" /> + <include name="*.dll" /> + </fileset> + </copy> + </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> - </project> @@ -33,11 +33,19 @@ <module>bundles/org.eclipse.osgi.util</module> <module>bundles/org.eclipse.osgi/supplement</module> - <!-- +<!-- th: Bug 370704 - leave commented out until Bug 383290 is resolved. + <module>bundles/org.eclipse.equinox.executable</module> <module>bundles/org.eclipse.equinox.launcher</module> + <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module> + <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module> + <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module> + <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module> + <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module> +--> + + <!-- <module>bundles/org.eclipse.equinox.launcher.carbon.macosx</module> <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx</module> - <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module> <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module> <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module> <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32</module> @@ -45,8 +53,6 @@ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module> <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module> <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module> - <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module> - <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module> <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc</module> <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86</module> <module>bundles/org.eclipse.equinox.launcher.motif.aix.ppc</module> @@ -54,10 +60,7 @@ <module>bundles/org.eclipse.equinox.launcher.motif.linux.x86</module> <module>bundles/org.eclipse.equinox.launcher.motif.solaris.sparc</module> <module>bundles/org.eclipse.equinox.launcher.win32.win32.ia64</module> - <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module> - <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module> <module>bundles/org.eclipse.equinox.launcher.wpf.win32.x86</module> - <module>bundles/org.eclipse.equinox.executable</module> <module>features/rt.equinox.framework.site</module> --> <module>bundles/org.eclipse.osgi.tests</module> |