Attachment #246085 for bug #429335

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

Lines 48-53 root.hpux.gtk.ia64.permissions.755=launcher Link Here

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




         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>

                        <include name="gtk/linux/x86_64/**/*" />
                        <include name="gtk/solaris/sparc/**/*" />
                        <include name="gtk/solaris/x86/**/*" />
                        <include name="gtk/solaris/x86_64/**/*" />
                        <include name="win32/win32/x86/**/*" />
                        <include name="win32/win32/x86_64/**/*" />
                      </fileset>

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 212-217 Link Here

(-)a/features/org.eclipse.equinox.executable.feature/resources/build.xml (-1 / +9 lines)
212	</copy>	212	</copy>
213	<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="launcher" />	213	<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="launcher" />
214	</target>	214	</target>
		215	<target name="rootFilessolaris_gtk_x86_64">
		216	<mkdir dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}"/>
		217	<copy todir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
		218	<fileset dir="${basedir}/bin/gtk/solaris/x86_64" includes="**" />
		219	</copy>
		220	<chmod perm="755" dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" includes="launcher" />
		221	</target>
215	<target name="rootFileshpux_gtk_ia64_32">	222	<target name="rootFileshpux_gtk_ia64_32">
216	<mkdir dir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}"/>	223	<mkdir dir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}"/>
217	<copy todir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}" failonerror="true" overwrite="true">	224	<copy todir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}" failonerror="true" overwrite="true">
Lines 243-248 Link Here
243	<antcall target="rootFileslinux_gtk_s390x"/>	250	<antcall target="rootFileslinux_gtk_s390x"/>
244	<antcall target="rootFilessolaris_gtk_sparc"/>	251	<antcall target="rootFilessolaris_gtk_sparc"/>
245	<antcall target="rootFilessolaris_gtk_x86"/>	252	<antcall target="rootFilessolaris_gtk_x86"/>
		253	<antcall target="rootFilessolaris_gtk_x86_64"/>
246	<antcall target="rootFilesaix_gtk_ppc64"/>	254	<antcall target="rootFilesaix_gtk_ppc64"/>
247	<antcall target="rootFilesaix_gtk_ppc"/>	255	<antcall target="rootFilesaix_gtk_ppc"/>
248	<antcall target="rootFileshpux_gtk_ia64_32"/>	256	<antcall target="rootFileshpux_gtk_ia64_32"/>
Lines 270-273 Link Here
270	<target name="gather.logs" depends="init">	278	<target name="gather.logs" depends="init">
271	</target>	279	</target>
272		280
273	</project>	281	</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.win32.win32.ia64</module>	67	<module>bundles/org.eclipse.equinox.launcher.win32.win32.ia64</module>
67	<module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module>	68	<module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module>
68	<module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>	69	<module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</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 220-225 Link Here

(-)a/features/org.eclipse.equinox.executable.feature/pom.xml (+107 lines)
220	</build>	220	</build>
221	</profile>	221	</profile>
222	<profile>	222	<profile>
		223	<id>build-native-launchers-gtk.solaris.x86_64</id>
		224	<activation>
		225	<property>
		226	<name>native</name>
		227	<value>gtk.solaris.x86_64</value>
		228	</property>
		229	</activation>
		230	<build>
		231	<plugins>
		232	<plugin>
		233	<artifactId>maven-antrun-plugin</artifactId>
		234	<version> 1.7 </version>
		235	<executions>
		236	<execution>
		237	<id>compile-executable-natives</id>
		238	<phase>generate-resources</phase>
		239	<configuration>
		240	<target>
		241	<ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
		242	</target>
		243	</configuration>
		244	<goals>
		245	<goal>run</goal>
		246	</goals>
		247	</execution>
		248	</executions>
		249	<dependencies>
		250	<dependency>
		251	<groupId>bsf</groupId>
		252	<artifactId>bsf</artifactId>
		253	<version>2.4.0</version>
		254	</dependency>
		255	<dependency>
		256	<groupId>rhino</groupId>
		257	<artifactId>js</artifactId>
		258	<version>1.7R2</version>
		259	</dependency>
		260	<dependency>
		261	<groupId>org.apache.ant</groupId>
		262	<artifactId>ant-apache-bsf</artifactId>
		263	<version>1.8.3</version>
		264	</dependency>
		265	<dependency>
		266	<groupId>org.apache.ant</groupId>
		267	<artifactId>ant-nodeps</artifactId>
		268	<version>1.8.1</version>
		269	</dependency>
		270	</dependencies>
		271	</plugin>
		272	</plugins>
		273	</build>
		274	</profile>
		275	<profile>
		276	<id>build-native-launchers-gtk.solaris.x86</id>
		277	<activation>
		278	<property>
		279	<name>native</name>
		280	<value>gtk.solaris.x86</value>
		281	</property>
		282	</activation>
		283	<build>
		284	<plugins>
		285	<plugin>
		286	<artifactId>maven-antrun-plugin</artifactId>
287	<version> 1.7 </version>
288	<executions>
289	<execution>
290	<id>compile-executable-natives</id>
291	<phase>generate-resources</phase>
292	<configuration>
293	<target>
294	<ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
295	</target>
296	</configuration>
297	<goals>
298	<goal>run</goal>
299	</goals>
300	</execution>
301	</executions>
302	<dependencies>
303	<dependency>
304	<groupId>bsf</groupId>
305	<artifactId>bsf</artifactId>
306	<version>2.4.0</version>
307	</dependency>
308	<dependency>
309	<groupId>rhino</groupId>
310	<artifactId>js</artifactId>
311	<version>1.7R2</version>
312	</dependency>
313	<dependency>
314	<groupId>org.apache.ant</groupId>
315	<artifactId>ant-apache-bsf</artifactId>
316	<version>1.8.3</version>
317	</dependency>
318	<dependency>
319	<groupId>org.apache.ant</groupId>
320	<artifactId>ant-nodeps</artifactId>
321	<version>1.8.1</version>
322	</dependency>
323	</dependencies>
324	</plugin>
325	</plugins>
326	</build>
327	</profile>
328	<profile>
223	<id>build-native-launchers-win32.win32.x86_64</id>	329	<id>build-native-launchers-win32.win32.x86_64</id>
224	<activation>	330	<activation>
225	<property>	331	<property>
Lines 345-350 Link Here
345	<include name="gtk/linux/x86_64/*/" />	451	<include name="gtk/linux/x86_64/*/" />
346	<include name="gtk/solaris/sparc/*/" />	452	<include name="gtk/solaris/sparc/*/" />
347	<include name="gtk/solaris/x86/*/" />	453	<include name="gtk/solaris/x86/*/" />
		454	<include name="gtk/solaris/x86_64/*/" />
348	<include name="win32/win32/x86/*/" />	455	<include name="win32/win32/x86/*/" />
349	<include name="win32/win32/x86_64/*/" />	456	<include name="win32/win32/x86_64/*/" />
350	</fileset>	457	</fileset>