Attachment #59659 for bug #92606

Lines 56-64 Link Here

(-)eclipse.orig/build (-2 / +2 lines)
56	then	56	then
57	ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH	57	ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH
58	ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml	58	ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
59	CLASSPATH=$PWD/jdtcoresrc/ecj.jar:$CLASSPATH;export CLASSPATH	59	LOCALCLASSPATH=$PWD/jdtcoresrc/ecj.jar:$CLASSPATH;export LOCALCLASSPATH
60	ant -q -buildfile jdtcoresrc/compilejdtcore.xml	60	ant -q -buildfile jdtcoresrc/compilejdtcore.xml
61	CLASSPATH=$PWD/ecj.jar:$ORIGCLASSPATH;export CLASSPATH	61	LOCALCLASSPATH=$PWD/ecj.jar:$ORIGCLASSPATH;export LOCALCLASSPATH
62	ant -q -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch $compilelibs $bootclasspath	62	ant -q -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch $compilelibs $bootclasspath
63	else	63	else
64	echo "The os-ws-arch combination of $os-$ws-$arch is not valid."	64	echo "The os-ws-arch combination of $os-$ws-$arch is not valid."

Lines 53-59 Link Here

(-)eclipse.orig/build.xml (-3 / +3 lines)
53	<exec dir="${swtlibs}/" executable="sh" failonerror="true">	53	<exec dir="${swtlibs}/" executable="sh" failonerror="true">
54	<arg line="build.sh"/>	54	<arg line="build.sh"/>
55	</exec>	55	</exec>
56	<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.{installOs}.{installArch}"/>	56	<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}"/>
57	<mkdir dir="${swtdir}"/>	57	<mkdir dir="${swtdir}"/>
58	<move todir="${swtdir}/">	58	<move todir="${swtdir}/">
59	<fileset dir="${swtlibs}">	59	<fileset dir="${swtlibs}">
Lines 160-167 Link Here
160	</condition>	160	</condition>
161	</fail>	161	</fail>
162	<property name="compilerArg" value="-encoding ISO-8859-1" />	162	<property name="compilerArg" value="-encoding ISO-8859-1" />
163	<property name="javacSource" value="1.3" />	163	<property name="javacSource" value="1.4" />
164	<property name="javacTarget" value="1.2" />	164	<property name="javacTarget" value="1.4" />
165	<property name="javacDebugInfo" value="true" />	165	<property name="javacDebugInfo" value="true" />
166	<property name="javacFailOnError" value="true" />	166	<property name="javacFailOnError" value="true" />
167		167

Lines 57-66 Link Here

(-)eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml (-1 / +6 lines)
57		57
58	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">	58	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
59	<mkdir dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0"/>	59	<mkdir dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0"/>
		60	<exec dir="./src" executable="make">
		61	</exec>
		62	<copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
		63	<fileset dir="src" includes="*.so"/>
		64	</copy>
60	<copy todir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" failonerror="true" overwrite="false">	65	<copy todir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" failonerror="true" overwrite="false">
61	<fileset dir="${basedir}" includes="os/,META-INF/,about.html" />	66	<fileset dir="${basedir}" includes="os/,META-INF/,about.html" />
62	</copy>	67	</copy>
63	<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/x86/*.so" />	68	<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/${basearch}/*.so" />
64	</target>	69	</target>
65		70
66	<target name="build.zips" depends="init">	71	<target name="build.zips" depends="init">




OS_TYPE = linux

#Set this to be the location of your JRE
#JAVA_HOME = ~/vm/sun142

JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}

core :
	gcc -O2 -fPIC -g -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
	gcc -g -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc

clean :

Lines 128-131 Link Here

(-)eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh (-1 / +1 lines)
128		128
129	export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR	129	export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
130		130
131	make -f $makefile ${1} ${2} ${3} ${4}	131	make -f $makefile ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}

Lines 38-44 Link Here

(-)eclipse.orig/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml (-1 / +1 lines)
38	<property name="destdir" value="${temp.folder}/@dot.bin"/>	38	<property name="destdir" value="${temp.folder}/@dot.bin"/>
39	<delete dir="${temp.folder}/@dot.bin"/>	39	<delete dir="${temp.folder}/@dot.bin"/>
40	<mkdir dir="${temp.folder}/@dot.bin"/>	40	<mkdir dir="${temp.folder}/@dot.bin"/>
41	<javac destdir="${temp.folder}/@dot.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" source="1.3" target="1.2">	41	<javac destdir="${temp.folder}/@dot.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" source="1.4" target="1.4">
42	<src path="${basedir}/src/Eclipse SWT/cairo/"/>	42	<src path="${basedir}/src/Eclipse SWT/cairo/"/>
43	<src path="${basedir}/src/Eclipse SWT/common/"/>	43	<src path="${basedir}/src/Eclipse SWT/common/"/>
44	<src path="${basedir}/src/Eclipse SWT/common_j2se/"/>	44	<src path="${basedir}/src/Eclipse SWT/common_j2se/"/>




  <!-- Set a meaningful default value for when it is not. -->
  <property name="eclipse-home" value="${basedir}/../.."/>
  <property name="jdk-path" value="${java.home}"/>  
  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/>
  <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
  <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>  
  

    <property name="header-path" value="${jdk-path}/../include"/>
    <property name="header-linux-path" value="${header-path}/linux" />

	<echo message="gcc -o  ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file} -lc"/>

    <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
      <arg value="-o"/>
      <arg value="${library-file}"/>
      <arg value="-shared"/>
      <arg value="-fPIC"/>
      <arg value="-I${src-path}"/>
      <arg value="-I${header-path}"/>      
      <arg value="-I${header-linux-path}"/>  
	  <srcfile/>
	  <arg value="-static"/>           
      <arg value="-lc"/>	  
      <fileset dir="${src-path}" includes="*.c"/>
      <mapper type="glob" from="*.c" to="*.o"/>

  </target>
  
  
</project>

Lines 86-92 Link Here

(-)eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak (-1 / +1 lines)
86	LIBS = -shared -fpic -s	86	LIBS = -shared -fpic -s
87		87
88		88
89	all: make_swt make_atk make_gnome make_awt	89	all: make_swt make_atk make_gnome make_awt make_cairo make_mozilla
90		90
91	#	91	#
92	# SWT libs	92	# SWT libs

Return to bug 92606

Lines 17-28 Link Here

(-)eclipse.orig/plugins/org.eclipse.core.resources.linux/src/Makefile (-2 / +2 lines)
17	OS_TYPE = linux	17	OS_TYPE = linux
18		18
19	#Set this to be the location of your JRE	19	#Set this to be the location of your JRE
20	JAVA_HOME = ~/vm/sun142	20	#JAVA_HOME = ~/vm/sun142
21		21
22	JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}	22	JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
23		23
24	core :	24	core :
25	gcc -fPIC -g -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)	25	gcc -O2 -fPIC -g -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
26	gcc -g -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc	26	gcc -g -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
27		27
28	clean :	28	clean :

Lines 5-11 Link Here

(-)eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml (-4 / +4 lines)
5	<!-- Set a meaningful default value for when it is not. -->	5	<!-- Set a meaningful default value for when it is not. -->
6	<property name="eclipse-home" value="${basedir}/../.."/>	6	<property name="eclipse-home" value="${basedir}/../.."/>
7	<property name="jdk-path" value="${java.home}"/>	7	<property name="jdk-path" value="${java.home}"/>
8	<property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>	8	<property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/>
9	<property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>	9	<property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
10	<property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>	10	<property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
11		11
Lines 47-63 Link Here
47	<property name="header-path" value="${jdk-path}/../include"/>	47	<property name="header-path" value="${jdk-path}/../include"/>
48	<property name="header-linux-path" value="${header-path}/linux" />	48	<property name="header-linux-path" value="${header-path}/linux" />
49		49
50	<echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>	50	<echo message="gcc -o ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file} -lc"/>
51		51
52	<apply executable="gcc" dest="${eclipse-home}/" parallel="false">	52	<apply executable="gcc" dest="${eclipse-home}/" parallel="false">
53	<arg value="-o"/>	53	<arg value="-o"/>
54	<arg value="${library-file}"/>	54	<arg value="${library-file}"/>
55	<arg value="-shared"/>	55	<arg value="-shared"/>
		56	<arg value="-fPIC"/>
56	<arg value="-I${src-path}"/>	57	<arg value="-I${src-path}"/>
57	<arg value="-I${header-path}"/>	58	<arg value="-I${header-path}"/>
58	<arg value="-I${header-linux-path}"/>	59	<arg value="-I${header-linux-path}"/>
59	<srcfile/>	60	<srcfile/>
60	<arg value="-static"/>
61	<arg value="-lc"/>	61	<arg value="-lc"/>
62	<fileset dir="${src-path}" includes="*.c"/>	62	<fileset dir="${src-path}" includes="*.c"/>
63	<mapper type="glob" from=".c" to=".o"/>	63	<mapper type="glob" from=".c" to=".o"/>
Lines 67-70 Link Here
67	</target>	67	</target>
68		68
69		69
70	</project>	70	</project>