Attachment #240406 for bug #429335

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

Lines 50-55 root.hpux.gtk.ia64.permissions.755=launcher Link Here

(-)a/features/org.eclipse.equinox.executable.feature/build.properties (+4 lines)
50		50
51	root.solaris.gtk.x86=bin/gtk/solaris/x86	51	root.solaris.gtk.x86=bin/gtk/solaris/x86
52	root.solaris.gtk.x86.permissions.755=launcher	52	root.solaris.gtk.x86.permissions.755=launcher
		53
		54	root.solaris.gtk.x86_64=bin/gtk/solaris/x86_64
		55	root.solaris.gtk.x86_64.permissions.755=launcher
		56
53	root.solaris.gtk.sparc=bin/gtk/solaris/sparc	57	root.solaris.gtk.sparc=bin/gtk/solaris/sparc
54	root.solaris.gtk.sparc.permissions.755=launcher	58	root.solaris.gtk.sparc.permissions.755=launcher
55		59




         fragment="true"/>

   <plugin
         id="org.eclipse.equinox.launcher.gtk.solaris.x86_64"
         os="solaris"
         ws="gtk"
         arch="x86_64"
         download-size="0"
         install-size="0"
         version="0.0.0"
         fragment="true"/>

   <plugin
         id="org.eclipse.equinox.launcher.cocoa.macosx"
         os="macosx"
         ws="cocoa"

Lines 160-168 case $defaultOS in Link Here

(-)a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh (-2 / +7 lines)
160	fi	160	fi
161	case ${PROC} in	161	case ${PROC} in
162	"i386" \| "x86")	162	"i386" \| "x86")
163	defaultOSArch="x86"	163	if [ "`isainfo -k`" = "amd64" ]; then
		164	defaultOSArch="x86_64"
		165	CC="cc -m64"
		166	else
		167	defaultOSArch="x86"
		168	CC=cc
		169	fi
164	[ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14"	170	[ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14"
165	CC=cc
166	;;	171	;;
167	"sparc")	172	"sparc")
168	defaultOSArch="sparc"	173	defaultOSArch="sparc"




      </build>
    </profile>
    <profile>
      <id>build-native-launchers-gtk.solaris.x86_64</id>
      <activation>
        <property>
          <name>native</name>
          <value>gtk.solaris.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.solaris.x86</id>
      <activation>
        <property>
          <name>native</name>
          <value>gtk.solaris.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>

Lines 44-49 root.hpux.gtk.ia64.permissions.755=launcher Link Here

(-)a/features/org.eclipse.equinox.executable.feature/resources/build.properties (+4 lines)
44		44
45	root.solaris.gtk.x86=bin/gtk/solaris/x86	45	root.solaris.gtk.x86=bin/gtk/solaris/x86
46	root.solaris.gtk.x86.permissions.755=launcher	46	root.solaris.gtk.x86.permissions.755=launcher
		47
		48	root.solaris.gtk.x86_64=bin/gtk/solaris/x86_64
		49	root.solaris.gtk.x86_64.permissions.755=launcher
		50
47	root.solaris.gtk.sparc=bin/gtk/solaris/sparc	51	root.solaris.gtk.sparc=bin/gtk/solaris/sparc
48	root.solaris.gtk.sparc.permissions.755=launcher	52	root.solaris.gtk.sparc.permissions.755=launcher
49		53

Lines 221-226 Link Here

(-)a/features/org.eclipse.equinox.executable.feature/resources/build.xml (-1 / +9 lines)
221	</copy>	221	</copy>
222	<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="launcher" />	222	<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="launcher" />
223	</target>	223	</target>
		224	<target name="rootFilessolaris_gtk_x86_64">
		225	<mkdir dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}"/>
		226	<copy todir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
		227	<fileset dir="${basedir}/bin/gtk/solaris/x86_64" includes="**" />
		228	</copy>
		229	<chmod perm="755" dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" includes="launcher" />
		230	</target>
224	<target name="rootFilessolaris_motif_sparc">	231	<target name="rootFilessolaris_motif_sparc">
225	<mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/>	232	<mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/>
226	<copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true">	233	<copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true">
Lines 287-292 Link Here
287	<antcall target="rootFileslinux_motif_x86"/>	294	<antcall target="rootFileslinux_motif_x86"/>
288	<antcall target="rootFilessolaris_gtk_sparc"/>	295	<antcall target="rootFilessolaris_gtk_sparc"/>
289	<antcall target="rootFilessolaris_gtk_x86"/>	296	<antcall target="rootFilessolaris_gtk_x86"/>
		297	<antcall target="rootFilessolaris_gtk_x86_64"/>
290	<antcall target="rootFilessolaris_motif_sparc"/>	298	<antcall target="rootFilessolaris_motif_sparc"/>
291	<antcall target="rootFilesaix_motif_ppc"/>	299	<antcall target="rootFilesaix_motif_ppc"/>
292	<antcall target="rootFilesaix_gtk_ppc64"/>	300	<antcall target="rootFilesaix_gtk_ppc64"/>
Lines 319-322 Link Here
319	<target name="gather.logs" depends="init">	327	<target name="gather.logs" depends="init">
320	</target>	328	</target>
321		329
322	</project>	330	</project>

Lines 25-31 Link Here

(-)a/pom.xml (-1 / +2 lines)
25	<packaging>pom</packaging>	25	<packaging>pom</packaging>
26		26
27	<properties>	27	<properties>
28	<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git</tycho.scmUrl>	28	<tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git</tycho.scmUrl>
29	</properties>	29	</properties>
30		30
31	<repositories>	31	<repositories>
Lines 63-68 Link Here
63	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>	63	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
64	<module>bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc</module>	64	<module>bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc</module>
65	<module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86</module>	65	<module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86</module>
		66	<module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64</module>
66	<module>bundles/org.eclipse.equinox.launcher.motif.aix.ppc</module>	67	<module>bundles/org.eclipse.equinox.launcher.motif.aix.ppc</module>
67	<module>bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32</module>	68	<module>bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32</module>
68	<module>bundles/org.eclipse.equinox.launcher.motif.linux.x86</module>	69	<module>bundles/org.eclipse.equinox.launcher.motif.linux.x86</module>

Return to bug 429335

Lines 42-47 Link Here

(-)a/features/org.eclipse.equinox.executable.feature/feature.xml (+10 lines)
42	fragment="true"/>	42	fragment="true"/>
43		43
44	<plugin	44	<plugin
		45	id="org.eclipse.equinox.launcher.gtk.solaris.x86_64"
		46	os="solaris"
		47	ws="gtk"
		48	arch="x86_64"
		49	download-size="0"
		50	install-size="0"
		51	version="0.0.0"
		52	fragment="true"/>
		53
		54	<plugin
45	id="org.eclipse.equinox.launcher.cocoa.macosx"	55	id="org.eclipse.equinox.launcher.cocoa.macosx"
46	os="macosx"	56	os="macosx"
47	ws="cocoa"	57	ws="cocoa"

Lines 207-212 Link Here

(-)a/features/org.eclipse.equinox.executable.feature/pom.xml (+106 lines)
207	</build>	207	</build>
208	</profile>	208	</profile>
209	<profile>	209	<profile>
		210	<id>build-native-launchers-gtk.solaris.x86_64</id>
		211	<activation>
		212	<property>
		213	<name>native</name>
		214	<value>gtk.solaris.x86_64</value>
		215	</property>
		216	</activation>
		217	<build>
		218	<plugins>
		219	<plugin>
		220	<artifactId>maven-antrun-plugin</artifactId>
		221	<version> 1.7 </version>
		222	<executions>
		223	<execution>
		224	<id>compile-executable-natives</id>
		225	<phase>generate-resources</phase>
		226	<configuration>
		227	<target>
		228	<ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
		229	</target>
		230	</configuration>
		231	<goals>
		232	<goal>run</goal>
		233	</goals>
		234	</execution>
		235	</executions>
		236	<dependencies>
		237	<dependency>
		238	<groupId>bsf</groupId>
		239	<artifactId>bsf</artifactId>
		240	<version>2.4.0</version>
		241	</dependency>
		242	<dependency>
		243	<groupId>rhino</groupId>
		244	<artifactId>js</artifactId>
		245	<version>1.7R2</version>
		246	</dependency>
		247	<dependency>
		248	<groupId>org.apache.ant</groupId>
		249	<artifactId>ant-apache-bsf</artifactId>
		250	<version>1.8.3</version>
		251	</dependency>
		252	<dependency>
		253	<groupId>org.apache.ant</groupId>
		254	<artifactId>ant-nodeps</artifactId>
		255	<version>1.8.1</version>
		256	</dependency>
		257	</dependencies>
		258	</plugin>
		259	</plugins>
		260	</build>
		261	</profile>
		262	<profile>
		263	<id>build-native-launchers-gtk.solaris.x86</id>
		264	<activation>
		265	<property>
		266	<name>native</name>
		267	<value>gtk.solaris.x86</value>
		268	</property>
		269	</activation>
		270	<build>
		271	<plugins>
		272	<plugin>
		273	<artifactId>maven-antrun-plugin</artifactId>
274	<version> 1.7 </version>
275	<executions>
276	<execution>
277	<id>compile-executable-natives</id>
278	<phase>generate-resources</phase>
279	<configuration>
280	<target>
281	<ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
282	</target>
283	</configuration>
284	<goals>
285	<goal>run</goal>
286	</goals>
287	</execution>
288	</executions>
289	<dependencies>
290	<dependency>
291	<groupId>bsf</groupId>
292	<artifactId>bsf</artifactId>
293	<version>2.4.0</version>
294	</dependency>
295	<dependency>
296	<groupId>rhino</groupId>
297	<artifactId>js</artifactId>
298	<version>1.7R2</version>
299	</dependency>
300	<dependency>
301	<groupId>org.apache.ant</groupId>
302	<artifactId>ant-apache-bsf</artifactId>
303	<version>1.8.3</version>
304	</dependency>
305	<dependency>
306	<groupId>org.apache.ant</groupId>
307	<artifactId>ant-nodeps</artifactId>
308	<version>1.8.1</version>
309	</dependency>
310	</dependencies>
311	</plugin>
312	</plugins>
313	</build>
314	</profile>
315	<profile>
210	<id>build-native-launchers-win32.win32.x86_64</id>	316	<id>build-native-launchers-win32.win32.x86_64</id>
211	<activation>	317	<activation>
212	<property>	318	<property>