diff options
8 files changed, 235 insertions, 154 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties index 50352aaa7..a9467c1b8 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties +++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties @@ -18,40 +18,61 @@ root.aix.gtk.ppc=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gt root.aix.gtk.ppc.permissions.755=eclipse root.aix.gtk.ppc64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/aix/ppc64 root.aix.gtk.ppc64.permissions.755=eclipse -root.hpux.gtk.ia64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/hpux/ia64 -root.hpux.gtk.ia64.permissions.755=eclipse + +# One or the other? +#./rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.hpux.ia64 +#./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64 +root.hpux.gtk.ia64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/hpux/ia64,../.././rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.hpux.ia64 +root.hpux.gtk.ia64.permissions.755=eclipse,*.so + root.solaris.gtk.sparc=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/sparc root.solaris.gtk.sparc.permissions.755=eclipse root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 root.solaris.gtk.x86.permissions.755=eclipse -root.linux.gtk.x86=target/resources/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86 +root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86 root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse -root.linux.gtk.ppc=target/resources/linux.gtk.ppc,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc +root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc root.linux.gtk.ppc.permissions.755=eclipse -root.linux.gtk.ppc64=target/resources/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64 +root.linux.gtk.ppc64=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64 root.linux.gtk.ppc64.permissions.755=eclipse -root.linux.gtk.x86_64=target/resources/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64 +root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64 root.linux.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse -root.linux.gtk.s390x=target/resources/linux.gtk.s390x,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390x + +root.linux.gtk.s390x=rootfiles/linux.gtk.s390x root.linux.gtk.s390x.permissions.755=eclipse -root.linux.gtk.s390=target/resources/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390 +root.linux.gtk.s390=rootfiles/linux.gtk.s390 root.linux.gtk.s390.permissions.755=eclipse -root.macosx.cocoa.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86 +#root.linux.gtk.ia64=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ia64 +# Need to be fixed to reflect eventual change into feature.xml +#root.qnx.photon.x86=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/photon/qnx/x86 + +#root.linux.motif.x86=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/motif/linux/x86,absolue:file:${buildDirectory}/features/plugins/org.eclipse.swt.motif.linux.x86/libXm.so.2 +#root.linux.motif.x86.permissions.755=*.so* + +root.macosx.cocoa.x86=rootfiles/macosx.cocoa.x86 +# No 'folder' support in Tycho, so we "copy up" to rootfiles, in POM +# http://wiki.eclipse.org/Tycho/Demo_Projects/RCP_Application +#root.macosx.cocoa.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86 #root.macosx.cocoa.x86.folder.Eclipse.app/Contents/MacOS=absolute:file:${buildDirectory}/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86/Eclipse.app/Contents/MacOS/eclipse #root.macosx.cocoa.x86.folder.Eclipse.app/Contents/Resources=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86/Eclipse.app/Contents/Resources #root.macosx.cocoa.x86.folder.Eclipse.app/Contents=absolute:file:${buildDirectory}/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86/Eclipse.app/Contents/Info.plist root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse -root.macosx.cocoa.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64 +root.macosx.cocoa.x86_64=rootfiles/macosx.cocoa.x86_64 +# No 'folder' support in Tycho, so we "copy up" to rootfiles, in POM +# http://wiki.eclipse.org/Tycho/Demo_Projects/RCP_Application +#root.macosx.cocoa.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64 #root.macosx.cocoa.x86_64.folder.Eclipse.app/Contents/MacOS=absolute:file:${buildDirectory}/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/MacOS/eclipse #root.macosx.cocoa.x86_64.folder.Eclipse.app/Contents/Resources=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Resources #root.macosx.cocoa.x86_64.folder.Eclipse.app/Contents=absolute:file:${buildDirectory}/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse +bin.includes = feature.properties + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml index 6e0828067..eb52d45ec 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml @@ -1,140 +1,199 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>eclipse.platform.releng.tychoeclipsebuilder</groupId> - <artifactId>eclipse.platform.releng.tychoeclipsebuilder</artifactId> - <version>4.3.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>eclipse.platform.releng.tychoeclipsebuilder</groupId> + <artifactId>eclipse.platform.releng.tychoeclipsebuilder</artifactId> + <version>4.3.0-SNAPSHOT</version> + </parent> - <groupId>org.eclipse.osgi.configuration</groupId> - <artifactId>org.eclipse.osgi.configuration</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-feature</packaging> + <groupId>org.eclipse.osgi.configuration</groupId> + <artifactId>org.eclipse.osgi.configuration</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-resources-gtk.linux.x86</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/resources/linux.gtk.x86</outputDirectory> - <resources> - <resource> - <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x86</directory> - <includes> - <include>about_files/*</include> - <include>about.html</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-resources-gtk.linux.x86_64</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/resources/linux.gtk.x86_64</outputDirectory> - <resources> - <resource> - <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x86_64</directory> - <includes> - <include>about_files/*</include> - <include>about.html</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-resources-gtk.linux.ppc</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/resources/linux.gtk.ppc</outputDirectory> - <resources> - <resource> - <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc</directory> - <includes> - <include>about_files/*</include> - <include>about.html</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-resources-gtk.linux.ppc64</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/resources/linux.gtk.ppc64</outputDirectory> - <resources> - <resource> - <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc64</directory> - <includes> - <include>about_files/*</include> - <include>about.html</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-resources-gtk.linux.s390</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/resources/linux.gtk.s390</outputDirectory> - <resources> - <resource> - <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.s390</directory> - <includes> - <include>about_files/*</include> - <include>about.html</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-resources-gtk.linux.s390x</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/resources/linux.gtk.s390x</outputDirectory> - <resources> - <resource> - <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.s390x</directory> - <includes> - <include>about_files/*</include> - <include>about.html</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-resources-gtk.linux.x86</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/rootfiles/linux.gtk.x86</outputDirectory> + <resources> + <resource> + <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x86</directory> + <includes> + <include>about_files/*</include> + <include>about.html</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources-gtk.linux.x86_64</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/rootfiles/linux.gtk.x86_64</outputDirectory> + <resources> + <resource> + <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x86_64 + </directory> + <includes> + <include>about_files/*</include> + <include>about.html</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources-gtk.linux.ppc</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/rootfiles/linux.gtk.ppc</outputDirectory> + <resources> + <resource> + <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc</directory> + <includes> + <include>about_files/*</include> + <include>about.html</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources-gtk.linux.ppc64</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/rootfiles/linux.gtk.ppc64</outputDirectory> + <resources> + <resource> + <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc64 + </directory> + <includes> + <include>about_files/*</include> + <include>about.html</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources-gtk.linux.s390</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/rootfiles/linux.gtk.s390</outputDirectory> + <resources> + <resource> + <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.s390 + </directory> + <includes> + <include>about_files/*</include> + <include>about.html</include> + </includes> + </resource> + <resource> + <directory>../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390 + </directory> + <includes> + <include>eclipse</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources-gtk.linux.s390x</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/rootfiles/linux.gtk.s390x</outputDirectory> + <resources> + <resource> + <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.s390x + </directory> + <includes> + <include>about_files/*</include> + <include>about.html</include> + </includes> + </resource> + <resource> + <directory>../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390x + </directory> + <includes> + <include>eclipse</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources-macosx.cocoa.x86_64</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/rootfiles/macosx.cocoa.x86_64</outputDirectory> + <resources> + <resource> + <directory>../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64 + </directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources-macosx.cocoa.x86</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/rootfiles/macosx.cocoa.x86</outputDirectory> + <resources> + <resource> + <directory>../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86 + </directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product index c60c161e6..2ca6b40d5 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product @@ -157,10 +157,11 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U </plugins> <features> + <feature id="org.eclipse.rcp.configuration" /> <feature id="org.eclipse.platform"/> <feature id="org.eclipse.platform.source"/> <feature id="org.eclipse.equinox.p2.user.ui"/> - <feature id="org.eclipse.rcp.configuration" /> + <feature id="org.eclipse.equinox.p2.user.ui.source"/> </features> <configurations> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product index ea0a2a287..9b68fc6f0 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product @@ -157,9 +157,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U </plugins> <features> + <feature id="org.eclipse.rcp.configuration" /> <feature id="org.eclipse.platform"/> <feature id="org.eclipse.equinox.p2.user.ui"/> - <feature id="org.eclipse.rcp.configuration" /> </features> <configurations> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml index 9f4cae025..c87cc59af 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml @@ -26,13 +26,13 @@ <modules> <module>rcp.config</module> - <module>eclipse-junit-tests</module> - <module>equinox.starterkit.product</module> - <module>osgistarter.config.launcher</module> <module>platform</module> <module>platform.sdk</module> <module>rcp</module> <module>rcp.sdk</module> <module>sdk</module> + <module>osgistarter.config.launcher</module> + <module>equinox.starterkit.product</module> + <module>eclipse-junit-tests</module> </modules> </project> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product index cebda6291..1b1c8f2f5 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product @@ -155,9 +155,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U </plugins> <features> + <feature id="org.eclipse.rcp.configuration" /> <feature id="org.eclipse.rcp"/> <feature id="org.eclipse.rcp.source"/> - <feature id="org.eclipse.rcp.configuration" /> </features> <configurations> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product index cfbfee4bf..8f7d80636 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product @@ -154,8 +154,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U </plugins> <features> - <feature id="org.eclipse.rcp"/> <feature id="org.eclipse.rcp.configuration" /> + <feature id="org.eclipse.rcp"/> </features> <configurations> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product index fde19d3ec..c75f66088 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product @@ -160,10 +160,10 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U </plugins> <features> + <feature id="org.eclipse.rcp.configuration" /> <feature id="org.eclipse.sdk"/> <feature id="org.eclipse.equinox.p2.user.ui"/> - <feature id="org.eclipse.equinox.p2.user.ui.source"/> - <feature id="org.eclipse.rcp.configuration" /> + <feature id="org.eclipse.equinox.p2.user.ui.source"/> </features> <configurations> |