Attachment #246197 for bug #442260

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

Lines 117-122 Link Here

(-)eclipse.platform.swt.orig/bundles/org.eclipse.swt/buildSWT.xml (-1 / +19 lines)
117	<param name="library_count" value="8"/>	117	<param name="library_count" value="8"/>
118	<param name="fragment" value="org.eclipse.swt.gtk.solaris.x86"/>	118	<param name="fragment" value="org.eclipse.swt.gtk.solaris.x86"/>
119	</antcall>	119	</antcall>
		120	<antcall target="check_fragment_libraries">
		121	<param name="library_count" value="6"/>
		122	<param name="fragment" value="org.eclipse.swt.gtk.solaris.x86_64"/>
		123	</antcall>
120	<!-- Motif is not being built	124	<!-- Motif is not being built
121	antcall target="check_fragment_libraries">	125	antcall target="check_fragment_libraries">
122	<param name="library_count" value="9"/>	126	<param name="library_count" value="9"/>
Lines 274-279 Link Here
274	trust="true"	278	trust="true"
275	outputproperty="m_solaris_x86_output"	279	outputproperty="m_solaris_x86_output"
276	command="hostname"/>	280	command="hostname"/>
		281	<sshexec host="${m_solaris_x86_64}"
		282	username="swtbuild"
		283	keyfile="${keyfile}"
		284	failonerror="false"
		285	trust="true"
		286	outputproperty="m_solaris_x86_64_output"
		287	command="hostname"/>
277		288
278	<sshexec host="${m_aix}"	289	<sshexec host="${m_aix}"
279	username="swtbuild"	290	username="swtbuild"
Lines 349-354 Link Here
349	<matches pattern="x${m_solaris_x86_output}*" string="x${m_solaris_x86}"/>	360	<matches pattern="x${m_solaris_x86_output}*" string="x${m_solaris_x86}"/>
350	</and>	361	</and>
351	</condition>	362	</condition>
		363	<condition property="m_solaris_x86_64_test" value="${success_msg}" else="${fail_msg}">
		364	<and>
		365	<length string="${m_solaris_x86_64_output}" when="greater" length="0"/>
		366	<matches pattern="x${m_solaris_x86_64_output}*" string="x${m_solaris_x86_64}"/>
		367	</and>
		368	</condition>
352	<condition property="m_aix_test" value="${success_msg}" else="${fail_msg}">	369	<condition property="m_aix_test" value="${success_msg}" else="${fail_msg}">
353	<and>	370	<and>
354	<length string="${m_aix_output}" when="greater" length="0"/>	371	<length string="${m_aix_output}" when="greater" length="0"/>
Lines 378-389 Link Here
378	<echo>${m_linux_ppc64} - ${m_linux_ppc64_test}</echo>	395	<echo>${m_linux_ppc64} - ${m_linux_ppc64_test}</echo>
379	<echo>${m_solaris_sparc} - ${m_solaris_sparc_test}</echo>	396	<echo>${m_solaris_sparc} - ${m_solaris_sparc_test}</echo>
380	<echo>${m_solaris_x86} - ${m_solaris_x86_test}</echo>	397	<echo>${m_solaris_x86} - ${m_solaris_x86_test}</echo>
		398	<echo>${m_solaris_x86_64} - ${m_solaris_x86_64_test}</echo>
381	<echo>${m_aix} - ${m_aix_test}</echo>	399	<echo>${m_aix} - ${m_aix_test}</echo>
382	<echo>${m_hpux} - ${m_hpux_test}</echo>	400	<echo>${m_hpux} - ${m_hpux_test}</echo>
383	<echo>${m_mac} - ${m_mac_test}</echo>	401	<echo>${m_mac} - ${m_mac_test}</echo>
384	<echo>-------------------------</echo>	402	<echo>-------------------------</echo>
385	<condition property="m_fail">	403	<condition property="m_fail">
386	<matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc_test} ${m_linux_ppc64_test} ${m_solaris_sparc_test} ${m_solaris_x86_test} ${m_aix_test} ${m_hpux_test} ${m_mac_test}"/>	404	<matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc_test} ${m_linux_ppc64_test} ${m_solaris_sparc_test} ${m_solaris_x86_test} ${m_solaris_x86_64_test} ${m_aix_test} ${m_hpux_test} ${m_mac_test}"/>
387	</condition>	405	</condition>
388	<fail if="m_fail" message="Failed"/>	406	<fail if="m_fail" message="Failed"/>
389	</target>	407	</target>

Lines 54-60 Link Here

(-)eclipse.platform.swt.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh (-4 / +41 lines)
54	PROC=`uname -i`	54	PROC=`uname -i`
55	MAKEFILE=make_solaris.mak	55	MAKEFILE=make_solaris.mak
56	if [ "${MODEL}" = "" ]; then	56	if [ "${MODEL}" = "" ]; then
57	if uname -p > /dev/null 2>&1; then	57	if [ "`isainfo -b`" = "64" ]; then
		58	MODEL=x86_64
		59	elif uname -p > /dev/null 2>&1; then
58	MODEL=`uname -p`	60	MODEL=`uname -p`
59	fi	61	fi
60	fi	62	fi
Lines 63-68 Link Here
63	MAKEFILE=make_solaris_x86.mak	65	MAKEFILE=make_solaris_x86.mak
64	MAKE_TYPE=gmake	66	MAKE_TYPE=gmake
65	;;	67	;;
		68	"x86_64")
		69	MAKEFILE=make_solaris_x86_64.mak
		70	MAKE_TYPE=gmake
		71	;;
66	esac	72	esac
67	;;	73	;;
68	"FreeBSD")	74	"FreeBSD")
Lines 258-263 Link Here
258	export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"	264	export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
259	fi	265	fi
260	;;	266	;;
		267	"solaris.x86_64")
		268	if [ "${CC}" = "" ]; then
		269	export CC="cc -m64"
		270	fi
		271	if [ "${CXX}" = "" ]; then
		272	export CXX="CC -m64"
		273	fi
		274	if [ "${JAVA_HOME}" = "" ]; then
		275	export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50"
		276	fi
		277	# if [ "${MOZILLA_SDK}" = "" ]; then
		278	# export MOZILLA_SDK="/bluebird/teamswt/bog/mozilla/solaris_x86/1.7/mozilla/dist/sdk"
		279	# fi
		280	# if [ "${XULRUNNER_SDK}" = "" ]; then
		281	# export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/solaris-x86/mozilla/dist/sdk"
		282	# fi
		283	# if [ "${MOZILLA_INCLUDES}" = "" ]; then
		284	# export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
		285	# fi
		286	# if [ "${MOZILLA_LIBS}" = "" ]; then
		287	# export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
		288	# fi
		289	# if [ "${XULRUNNER_INCLUDES}" = "" ]; then
		290	# export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
		291	# fi
		292	# if [ "${XULRUNNER_LIBS}" = "" ]; then
		293	# export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
		294	# fi
		295	;;
261	"solaris.sparc64")	296	"solaris.sparc64")
262	# export PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin"	297	# export PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin"
263	if [ "${CC}" = "" ]; then	298	if [ "${CC}" = "" ]; then
Lines 466-473 Link Here
466	fi	501	fi
467		502
468	if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" -a ${MODEL} != "sparc64" -a ${MODEL} != 'ia64' -a ${GTK_VERSION} != '3.0' ]; then	503	if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" -a ${MODEL} != "sparc64" -a ${MODEL} != 'ia64' -a ${GTK_VERSION} != '3.0' ]; then
469	echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"	504	if [ "${SWT_OS}" != "solaris" -o "${MODEL}" != "x86_64" ]; then
470	MAKE_GNOME=make_gnome	505	echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
		506	MAKE_GNOME=make_gnome
		507	fi
471	else	508	else
472	if [ ${GTK_VERSION} != '3.0' ]; then	509	if [ ${GTK_VERSION} != '3.0' ]; then
473	echo "libgnome-2.0 and libgnomeui-2.0 not found:"	510	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
Lines 483-489 Link Here
483	echo " *** Advanced graphics support using cairo will not be compiled."	520	echo " *** Advanced graphics support using cairo will not be compiled."
484	fi	521	fi
485		522
486	if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then	523	if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' -a ${MODEL} != 'x86_64' ]; then
487	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then	524	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
488	MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`	525	MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
489	MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`	526	MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`





CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc

AWT_LFLAGS = -G ${SWT_PTR_CFLAGS}
AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt 

ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`

	+w \
	-I. \
	-I$(JAVA_HOME)/include \
	-I$(JAVA_HOME)/include/solaris \
	${SWT_PTR_CFLAGS}
MOZILLALFLAGS =  -G
MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \

SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
GNOME_OBJECTS = 
MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o

		$(NATIVE_STATS) \
		-DLINUX -DGTK \
		-I$(JAVA_HOME)/include \
		-I$(JAVA_HOME)/include/solaris \
		-KPIC \
		${SWT_PTR_CFLAGS}
LFLAGS = -G -KPIC ${SWT_PTR_CFLAGS}

ifndef NO_STRIP
	AWT_LFLAGS := $(AWT_LFLAGS) -s

make_gnome: $(GNOME_LIB)

$(GNOME_LIB): $(GNOME_OBJECTS)
	# $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)

gnome.o: gnome.c 
	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c

Return to bug 442260

Lines 51-57 Link Here

(-)eclipse.platform.swt.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak (-6 / +6 lines)
51		51
52	CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc	52	CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
53		53
54	AWT_LFLAGS = -G	54	AWT_LFLAGS = -G ${SWT_PTR_CFLAGS}
55	AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt	55	AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
56		56
57	ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`	57	ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
Lines 73-79 Link Here
73	+w \	73	+w \
74	-I. \	74	-I. \
75	-I$(JAVA_HOME)/include \	75	-I$(JAVA_HOME)/include \
76	-I$(JAVA_HOME)/include/linux \	76	-I$(JAVA_HOME)/include/solaris \
77	${SWT_PTR_CFLAGS}	77	${SWT_PTR_CFLAGS}
78	MOZILLALFLAGS = -G	78	MOZILLALFLAGS = -G
79	MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \	79	MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
Lines 93-99 Link Here
93	SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o	93	SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
94	CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o	94	CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
95	ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o	95	ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
96	GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o	96	GNOME_OBJECTS =
97	MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o	97	MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
98	XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o	98	XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
99	XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o	99	XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
Lines 104-113 Link Here
104	$(NATIVE_STATS) \	104	$(NATIVE_STATS) \
105	-DLINUX -DGTK \	105	-DLINUX -DGTK \
106	-I$(JAVA_HOME)/include \	106	-I$(JAVA_HOME)/include \
107	-I$(JAVA_HOME)/include/linux \	107	-I$(JAVA_HOME)/include/solaris \
108	-KPIC \	108	-KPIC \
109	${SWT_PTR_CFLAGS}	109	${SWT_PTR_CFLAGS}
110	LFLAGS = -G -KPIC	110	LFLAGS = -G -KPIC ${SWT_PTR_CFLAGS}
111		111
112	ifndef NO_STRIP	112	ifndef NO_STRIP
113	AWT_LFLAGS := $(AWT_LFLAGS) -s	113	AWT_LFLAGS := $(AWT_LFLAGS) -s
Lines 197-203 Link Here
197	make_gnome: $(GNOME_LIB)	197	make_gnome: $(GNOME_LIB)
198		198
199	$(GNOME_LIB): $(GNOME_OBJECTS)	199	$(GNOME_LIB): $(GNOME_OBJECTS)
200	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)	200	# $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
201		201
202	gnome.o: gnome.c	202	gnome.o: gnome.c
203	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c	203	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c