bug 209478v20071112

8 files changed, 42 insertions, 24 deletions

diff --git a/bundles/org.eclipse.equinox.executable/.project b/bundles/org.eclipse.equinox.executable/.project
index cb017d40a..adabd60b5 100644
--- a/bundles/org.eclipse.equinox.executable/.project
+++ b/bundles/org.eclipse.equinox.executable/.project
@@ -10,65 +10,65 @@
 			<triggers>clean,full,incremental,</triggers>
 			<arguments>
 				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.arguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
 					<key>org.eclipse.cdt.core.errorOutputParser</key>
 					<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
 				</dictionary>
 				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.environment</key>
-					<value>JAVA_JNI=C:/Dev/Java/IBM_1.5.0/include|X11_HOME=/usr/X11R6|DEFAULT_OS=${system_property:osgi.os}|DEFAULT_WS=${system_property:osgi.ws}|MOTIF_HOME=/usr/X11|DEFAULT_OS_ARCH=${system_property:osgi.arch}|</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
 					<value>true</value>
 				</dictionary>
 				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.inc</key>
-					<value>all</value>
+					<key>org.eclipse.cdt.make.core.build.arguments</key>
+					<value></value>
 				</dictionary>
 				<dictionary>
-					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
-					<value>true</value>
+					<key>org.eclipse.cdt.make.core.build.command</key>
+					<value>make</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.build.location</key>
 					<value>\org.eclipse.equinox.executable\library\${system_property:osgi.ws}</value>
 				</dictionary>
 				<dictionary>
+					<key>org.eclipse.cdt.make.core.build.target.auto</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
 					<key>org.eclipse.cdt.make.core.build.target.clean</key>
 					<value>clean</value>
 				</dictionary>
 				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.command</key>
-					<value>make</value>
+					<key>org.eclipse.cdt.make.core.build.target.inc</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
 					<value>true</value>
 				</dictionary>
 				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
 					<value>true</value>
 				</dictionary>
 				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
 					<value>true</value>
 				</dictionary>
 				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.auto</key>
-					<value>all</value>
+					<key>org.eclipse.cdt.make.core.environment</key>
+					<value>MOTIF_HOME=/usr/X11|X11_HOME=/usr/X11R6|DEFAULT_OS_ARCH=${system_property:osgi.arch}|DEFAULT_WS=${system_property:osgi.ws}|DEFAULT_OS=${system_property:osgi.os}|</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.stopOnError</key>
 					<value>false</value>
 				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>true</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
diff --git a/bundles/org.eclipse.equinox.executable/bin/motif/solaris/sparc/Eclipse.l.pm b/bundles/org.eclipse.equinox.executable/contributed/motif/solaris/sparc/Eclipse.l.pm
index 995d7c9bb..995d7c9bb 100644
--- a/bundles/org.eclipse.equinox.executable/bin/motif/solaris/sparc/Eclipse.l.pm
+++ b/bundles/org.eclipse.equinox.executable/contributed/motif/solaris/sparc/Eclipse.l.pm
diff --git a/bundles/org.eclipse.equinox.executable/bin/motif/solaris/sparc/Eclipse.m.pm b/bundles/org.eclipse.equinox.executable/contributed/motif/solaris/sparc/Eclipse.m.pm
index e64aa0cc0..e64aa0cc0 100644
--- a/bundles/org.eclipse.equinox.executable/bin/motif/solaris/sparc/Eclipse.m.pm
+++ b/bundles/org.eclipse.equinox.executable/contributed/motif/solaris/sparc/Eclipse.m.pm
diff --git a/bundles/org.eclipse.equinox.executable/bin/motif/solaris/sparc/Eclipse.s.pm b/bundles/org.eclipse.equinox.executable/contributed/motif/solaris/sparc/Eclipse.s.pm
index e2b9379f3..e2b9379f3 100644
--- a/bundles/org.eclipse.equinox.executable/bin/motif/solaris/sparc/Eclipse.s.pm
+++ b/bundles/org.eclipse.equinox.executable/contributed/motif/solaris/sparc/Eclipse.s.pm
diff --git a/bundles/org.eclipse.equinox.executable/bin/motif/solaris/sparc/Eclipse.t.pm b/bundles/org.eclipse.equinox.executable/contributed/motif/solaris/sparc/Eclipse.t.pm
index 3f6b21f42..3f6b21f42 100644
--- a/bundles/org.eclipse.equinox.executable/bin/motif/solaris/sparc/Eclipse.t.pm
+++ b/bundles/org.eclipse.equinox.executable/contributed/motif/solaris/sparc/Eclipse.t.pm
diff --git a/bundles/org.eclipse.equinox.executable/feature.xml b/bundles/org.eclipse.equinox.executable/feature.xml
index 09457cbf5..bc3205e91 100644
--- a/bundles/org.eclipse.equinox.executable/feature.xml
+++ b/bundles/org.eclipse.equinox.executable/feature.xml
@@ -28,6 +28,16 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
+            
+	<plugin
+         id="org.eclipse.equinox.launcher.motif.solaris.sparc"
+         os="solaris"
+         ws="motif"
+         arch="sparc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
 
    <plugin
          id="org.eclipse.equinox.launcher.carbon.macosx"
diff --git a/bundles/org.eclipse.equinox.executable/target.build.properties b/bundles/org.eclipse.equinox.executable/target.build.properties
index cc1655332..89b2325ef 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.properties
+++ b/bundles/org.eclipse.equinox.executable/target.build.properties
@@ -35,7 +35,7 @@ root.aix.motif.ppc=bin/motif/aix/ppc
 root.hpux.motif.PA_RISC=bin/motif/hpux/PA_RISC
 root.hpux.motif.ia64_32=bin/motif/hpux/ia64_32
 
-root.solaris.motif.sparc=bin/motif/solaris/sparc
+root.solaris.motif.sparc=contributed/motif/solaris/sparc
 root.solaris.gtk.sparc=bin/gtk/solaris/sparc
 
 root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
diff --git a/bundles/org.eclipse.equinox.executable/target.build.xml b/bundles/org.eclipse.equinox.executable/target.build.xml
index 6d740d264..34aeb370e 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.xml
+++ b/bundles/org.eclipse.equinox.executable/target.build.xml
@@ -138,6 +138,13 @@
 		</copy>
 		<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="${launcherName}" /> 
 	</target>
+	<target name="rootFilessolaris_motif_sparc">
+		<mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/>
+		<copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/contributed/motif/solaris/sparc" includes="**"			/>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="${launcherName}" /> 
+	</target>
 	<target name="rootFilesaix_motif_ppc">
 		<mkdir dir="${feature.base}/aix.motif.ppc/${collectingFolder}"/>
 		<copy todir="${feature.base}/aix.motif.ppc/${collectingFolder}" failonerror="true" overwrite="true">
@@ -184,6 +191,7 @@
 		<antcall target="rootFileslinux_gtk_ia64"/>
 		<antcall target="rootFileslinux_motif_x86"/>
 		<antcall target="rootFilessolaris_gtk_sparc"/>
+		<antcall target="rootFilessolaris_motif_sparc"/>
 		<antcall target="rootFilesaix_motif_ppc"/>
 		<antcall target="rootFileshpux_motif_PA_RISC"/>
 		<antcall target="rootFileshpux_motif_ia64"/>