new build scripts for git migration

14 files changed, 398 insertions, 90 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh
index 9b912dad2e..776c23adf7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh
@@ -12,9 +12,9 @@
 
 cd `dirname $0`
 
-OUTPUT_DIR=../../../org.eclipse.swt.carbon.macosx
-
-export OUTPUT_DIR
+if [ "x${OUTPUT_DIR}" = "x" ]; then
+	export OUTPUT_DIR=../../../org.eclipse.swt.carbon.macosx
+fi
 
 export MACOSX_DEPLOYMENT_TARGET=10.4
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
index 8da4914cf8..2e0d25721b 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
@@ -12,12 +12,30 @@
 
 cd `dirname $0`
 
-OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx
-
-export OUTPUT_DIR
+if [ "x${MODEL}" = "xx86_64" ]; then
+	export ARCHS="-arch x86_64"
+	if [ "x${OUTPUT_DIR}" = "x" ]; then
+		export OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx.x86_64
+	fi
+	if [ "x${XULRUNNER_SDK}" = "x" ]; then
+		export XULRUNNER_SDK="/Users/Shared/xulrunner/64-bit/mozilla/dist"
+	fi
+	if [ "x${XULRUNNER_LIBS}" = "x" ]; then
+		export XULRUNNER_LIBS="${XULRUNNER_SDK}/lib/libxpcomglue.a"
+	fi
+else
+	export ARCHS="-arch i386 -arch ppc"
+	if [ "x${OUTPUT_DIR}" = "x" ]; then
+		export OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx
+	fi
+	if [ "x${XULRUNNER_SDK}" = "x" ]; then
+		export XULRUNNER_SDK="/Users/Shared/xulrunner/1.8.0.1/mozilla/dist/i386/dist/sdk"
+	fi
+	if [ "x${XULRUNNER_LIBS}" = "x" ]; then
+		export XULRUNNER_LIBS="${XULRUNNER_SDK}/lib/libxpcomglue.a ${XULRUNNER_SDK}/../../../ppc/dist/sdk/lib/libxpcomglue.a"
+	fi
+fi
 
 export MACOSX_DEPLOYMENT_TARGET=10.5
 
-export ARCHS="-arch i386 -arch ppc -arch x86_64"
-
 make -f make_macosx.mak $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build32.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build32.sh
deleted file mode 100755
index 8c6577dee0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build32.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2000, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#*******************************************************************************
-
-cd `dirname $0`
-
-OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx
-
-export OUTPUT_DIR
-
-export MACOSX_DEPLOYMENT_TARGET=10.5
-
-export ARCHS="-arch i386 -arch ppc"
-
-make -f make_macosx.mak $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build64.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build64.sh
deleted file mode 100755
index 4e70a71103..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build64.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2000, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#*******************************************************************************
-
-cd `dirname $0`
-
-OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx.x86_64
-
-export OUTPUT_DIR
-
-export MACOSX_DEPLOYMENT_TARGET=10.5
-
-export ARCHS="-arch x86_64"
-
-make -f make_macosx.mak $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
index 4ae25a0a42..3173424d0a 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
@@ -44,9 +44,7 @@ XULRUNNERCFLAGS = -c -Wall $(ARCHS) -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS)
 	-Wno-non-virtual-dtor -include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include 
 XULRUNNERLFLAGS = $(LFLAGS)
 
-all: $(SWT_LIB) $(SWTPI_LIB) $(AWT_LIB) #$(XULRUNNER_LIB)
-
-all_x86_64: $(SWT_LIB) $(SWTPI_LIB) $(AWT_LIB) #$(XULRUNNER_LIB)
+all: $(SWT_LIB) $(SWTPI_LIB) $(AWT_LIB) $(XULRUNNER_LIB)
 
 .c.o:
 	cc $(CFLAGS) $*.c
@@ -80,9 +78,6 @@ xpcominit_stats.o: xpcominit_stats.cpp
 
 install: all
 	cp *.jnilib $(OUTPUT_DIR)
-	
-install_x86_64: all_x86_64
-	cp *.jnilib $(OUTPUT_DIR)
 
 clean:
 	rm -f *.jnilib *.o
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index 1eb3a06eaa..52c43edd25 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -16,14 +16,6 @@ cd `dirname $0`
 
 MAKE_TYPE=make
 
-if [ "${JAVA_HOME}" = "" ]; then
-	echo "Please set JAVA_HOME to point at a JRE."
-fi
-if [ "${CC}" = "" ]; then
-	CC=gcc
-	export CC
-fi
-
 # Check if we have to compile external.xpt from external.idl
 COMPONENTS_DIR=`pwd`/../../components
 if test ! -f ${COMPONENTS_DIR}/external.xpt; then
@@ -106,7 +98,316 @@ case $MODEL in
 		AWT_ARCH=$MODEL
 		;;
 esac
-echo "Model is ${MODEL}"
+echo "Building SWT OS=${SWT_OS} SWT ARCH=${SWT_ARCH}"
+
+case $SWT_OS.$SWT_ARCH in
+	"linux.x86")
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50"
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_x86/lib/pkgconfig"
+		fi
+		if [ "${MOZILLA_SDK}" = "" ]; then
+			export MOZILLA_SDK="/bluebird/teamswt/swt-builddir/mozilla/1.4/linux_gtk2/mozilla/dist/sdk"
+		fi
+		if [ "${XULRUNNER_SDK}" = "" ]; then
+			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/1.8.0.4/gecko-sdk"
+		fi
+		if [ "${MOZILLA_INCLUDES}" = "" ]; then
+			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/mozilla-config.h -I${MOZILLA_SDK}/../include/xpcom -I${MOZILLA_SDK}/../include/nspr -I${MOZILLA_SDK}/../include/embed_base -I${MOZILLA_SDK}/../include/embedstring -I${MOZILLA_SDK}/../include/string"
+		fi
+		if [ "${MOZILLA_LIBS}" = "" ]; then
+			export MOZILLA_LIBS="${MOZILLA_SDK}/../lib/libembedstring.a -L${MOZILLA_SDK}/../bin -L${MOZILLA_SDK}/../lib/ -lxpcom -lnspr4 -lplds4 -lplc4"
+		fi
+		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
+			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
+		fi
+		if [ "${XULRUNNER_LIBS}" = "" ]; then
+			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
+		fi
+		;;
+	"linux.x86_64")
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/x86_64/jdk1.5.0"
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			export PKG_CONFIG_PATH="/usr/lib64/pkgconfig:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_x86_64/lib/pkgconfig"
+		fi
+		if [ "${MOZILLA_SDK}" = "" ]; then
+			export MOZILLA_SDK="/bluebird/teamswt/swt-builddir/mozilla/1.7/amd64/mozilla/dist/sdk"
+		fi
+		if [ "${XULRUNNER_SDK}" = "" ]; then
+			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/amd64/mozilla/dist/sdk/"
+		fi
+		if [ "${MOZILLA_INCLUDES}" = "" ]; then
+			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
+		fi
+		if [ "${MOZILLA_LIBS}" = "" ]; then
+			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+		fi
+		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
+			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
+		fi
+		if [ "${XULRUNNER_LIBS}" = "" ]; then
+			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
+		fi
+		;;
+	"linux.ppc")
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50"
+		fi
+		if [ "${MOZILLA_SDK}" = "" ]; then
+			export MOZILLA_SDK=" /bluebird/teamswt/swt-builddir/mozilla/1.7/ppc/mozilla/dist/sdk"
+		fi
+		if [ "${XULRUNNER_SDK}" = "" ]; then
+			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.1.1/ppc/mozilla/dist/sdk/"
+		fi
+		if [ "${MOZILLA_INCLUDES}" = "" ]; then
+			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
+		fi
+		if [ "${MOZILLA_LIBS}" = "" ]; then
+			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+		fi
+		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
+			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
+		fi
+		if [ "${XULRUNNER_LIBS}" = "" ]; then
+			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			export PKG_CONFIG_PATH="/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc/lib/pkgconfig/"
+		fi
+		;;
+	"linux.ppc64")
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
+		fi
+		if [ "${MOZILLA_SDK}" = "" ]; then
+			export MOZILLA_SDK=" /bluebird/teamswt/swt-builddir/mozilla/1.7/ppc64/mozilla/dist/sdk"
+		fi
+		if [ "${MOZILLA_LIBS}" = "" ]; then
+			export MOZILLA_LIBS="-m64 -L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+		fi
+		if [ "${MOZILLA_INCLUDES}" = "" ]; then
+			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
+		fi
+		if [ "${XULRUNNER_SDK}" = "" ]; then
+			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.1.1/ppc64/mozilla/dist/sdk/"
+		fi
+		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
+			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
+		fi
+		if [ "${XULRUNNER_LIBS}" = "" ]; then
+			export XULRUNNER_LIBS="-m64 -L${XULRUNNER_SDK}/lib -lxpcomglue"
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc64/lib/pkgconfig/:/usr/local/GNOME/lib/pkgconfig:/usr/local/gtk2.4/lib/pkgconfig/"
+		fi
+		;;
+	"solaris.x86")
+		if [ "${CC}" = "" ]; then
+			export CC="cc"
+		fi
+		if [ "${CXX}" = "" ]; then
+			export CXX="CC"
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50"
+		fi
+		if [ "${MOZILLA_SDK}" = "" ]; then
+			export MOZILLA_SDK="/bluebird/teamswt/bog/mozilla/solaris_x86/1.7/mozilla/dist/sdk"
+		fi
+		if [ "${XULRUNNER_SDK}" = "" ]; then
+			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/solaris-x86/mozilla/dist/sdk"
+		fi
+		if [ "${MOZILLA_INCLUDES}" = "" ]; then
+			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
+		fi
+		if [ "${MOZILLA_LIBS}" = "" ]; then
+			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+		fi
+		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
+			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
+		fi
+		if [ "${XULRUNNER_LIBS}" = "" ]; then
+			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
+		fi
+		;;
+	"solaris.sparc64")
+#		export PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin"
+		if [ "${CC}" = "" ]; then
+			export CC="cc"
+		fi
+		if [ "${CXX}" = "" ]; then
+			export CXX="CC"
+		fi
+		if [ "${CDE_HOME}" = "" ]; then
+			export CDE_HOME="/usr/dt"
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/SOLARIS/SPARC64/jdk1.5.0_22"
+		fi
+#		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+#			export PKG_CONFIG_PATH="/usr/local/cairo-1.4.10/lib/pkgconfig"
+#		fi
+#		if [ "${MOZILLA_SDK}" = "" ]; then
+#			export MOZILLA_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk"
+#		fi
+#		if [ "${MOZILLA_INCLUDES}" = "" ]; then
+#			export MOZILLA_INCLUDES="-I${MOZILLA_SDK} -I${MOZILLA_SDK}/xpcom/include -I${MOZILLA_SDK}/nspr/include -I${MOZILLA_SDK}/embed_base/include -I${MOZILLA_SDK}/embedstring/include -I${MOZILLA_SDK}/string/include"
+#		fi
+#		if [ "${MOZILLA_LIBS}" = "" ]; then
+#			export MOZILLA_LIBS="${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+#		fi
+		;;
+	"solaris.sparc")
+		PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin:$PATH"
+		if [ "${CC}" = "" ]; then
+			CC="cc"
+		fi
+		if [ "${CXX}" = "" ]; then
+			CXX="CC"
+		fi
+		if [ "${CDE_HOME}" = "" ]; then
+			CDE_HOME="/usr/dt"
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			JAVA_HOME="/usr/j2se"
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			PKG_CONFIG_PATH="/usr/local/cairo-1.4.10/lib/pkgconfig/"
+		fi
+		if [ "${MOZILLA_SDK}" = "" ]; then
+			MOZILLA_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk"
+		fi
+		if [ "${MOZILLA_INCLUDES}" = "" ]; then
+			MOZILLA_INCLUDES="-I${MOZILLA_SDK} -I${MOZILLA_SDK}/xpcom/include -I${MOZILLA_SDK}/nspr/include -I${MOZILLA_SDK}/embed_base/include -I${MOZILLA_SDK}/embedstring/include -I${MOZILLA_SDK}/string/include"
+		fi
+		if [ "${MOZILLA_LIBS}" = "" ]; then
+			MOZILLA_LIBS="${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+		fi
+		export PATH CC CXX CDE_HOME JAVA_HOME PKG_CONFIG_PATH MOZILLA_SDK MOZILLA_INCLUDES MOZILLA_LIBS;
+		;;
+	"linux.s390")
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/home/swtbuild/java5/ibm-java2-s390-50"
+		fi
+		if [ "${MOZILLA_SDK}" = "" ]; then
+			export MOZILLA_SDK="/home/swtbuild/mozilla-1.7.13/mozilla/dist/sdk"
+		fi
+		if [ "${MOZILLA_INCLUDES}" = "" ]; then
+			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/../include/xpcom -I${MOZILLA_SDK}/../include/nspr -I${MOZILLA_SDK}/../include/embed_base -I${MOZILLA_SDK}/../include/embedstring -I${MOZILLA_SDK}/../include/string"
+		fi
+		if [ "${MOZILLA_LIBS}" = "" ]; then
+			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+		fi
+		if [ "${XULRUNNER_SDK}" = "" ]; then
+			export XULRUNNER_SDK="/home/swtbuild/xulrunner-1.8.0.1/mozilla/dist/sdk"
+		fi
+		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
+			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
+		fi
+		if [ "${XULRUNNER_LIBS}" = "" ]; then
+			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+		fi
+		;;
+	"linux.s390x")
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/home/swtbuild/java5/ibm-java2-s390x-50"
+		fi
+		if [ "${MOZILLA_SDK}" = "" ]; then
+			export MOZILLA_SDK="/home/swtbuild/mozilla1.7.13/mozilla/dist/sdk"
+		fi
+		if [ "${MOZILLA_INCLUDES}" = "" ]; then
+			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/../include/xpcom -I${MOZILLA_SDK}/../include/nspr -I${MOZILLA_SDK}/../include/embed_base -I${MOZILLA_SDK}/../include/embedstring -I${MOZILLA_SDK}/../include/string"
+		fi
+		if [ "${MOZILLA_LIBS}" = "" ]; then
+			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+		fi
+		if [ "${XULRUNNER_SDK}" = "" ]; then
+			export XULRUNNER_SDK="/home/swtbuild/xulrunner-1.8.0.1/mozilla/dist/sdk"
+		fi
+		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
+			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
+		fi
+		if [ "${XULRUNNER_LIBS}" = "" ]; then
+			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			export PKG_CONFIG_PATH="/usr/local/cairo64/lib/pkgconfig"
+		fi
+		;;
+	"aix.ppc")
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/aixj9_r5"
+		fi
+		;;
+	"aix.ppc64")
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk"
+		fi
+		;;
+	"hpux.ia64_32")
+		export PATH="/opt/hp-gcc/bin:/opt/gtk2.6/bin:/opt/${PATH}"
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/opt/java1.5"
+		fi
+		if [ "${AWT_LIB_PATH}" = "" ]; then
+			export AWT_LIB_PATH="/opt/java1.5/jre/lib/IA64N/"
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			export PKG_CONFIG_PATH="/opt/gtk2.6/lib/pkgconfig"
+		fi
+		;;
+	"hpux.ia64")
+#		export PATH="/bluebird/teamswt/bog/gtk/hpux/bin:${PATH}"
+		if [ "${CC}" = "" ]; then
+			export CC=gcc
+		fi
+		if [ "${JAVA_HOME}" = "" ]; then
+			export JAVA_HOME="/opt/java1.5"
+		fi
+		if [ "${AWT_HOME}" = "" ]; then
+			export AWT_HOME="/opt/java1.5/jre/lib/IA64W/"
+		fi
+		if [ "${PKG_CONFIG_PATH}" = "" ]; then
+			export PKG_CONFIG_PATH="/bluebird/teamswt/bog/gtk/hpux/lib/pkgconfig"
+		fi
+		;;
+esac	
+
+
 # For 64-bit CPUs, we have a switch
 if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64'  -o ${MODEL} = 's390x' ]; then
 	SWT_PTR_CFLAGS=-DJNI64
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 25bb83b9e0..8c27bffab0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -61,7 +61,7 @@ ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
 GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
 GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
 
-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
+GLXLIBS = -lGL -lGLU -lm
 
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
index 59105838c6..50c5be7499 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
@@ -28,15 +28,20 @@ case $OS in
 		case $MODEL in		
 		*) 
 			if [ "${JAVA_HOME}" = "" ]; then
-				echo "Please set JAVA_HOME to point at a JRE."
+				JAVA_HOME="/bluebird/teamswt/swt-builddir/aixj9_r5"
+			fi
+			if [ "${AWT_HOME}" = "" ]; then
+				AWT_HOME="/bluebird/teamswt/swt-builddir/aixj9_r5/jre/bin"
 			fi
 			if [ "${MOTIF_HOME}" = "" ]; then
-				MOTIF_HOME=/usr
+				MOTIF_HOME="/bluebird/teamswt/swt-builddir/motif21"
 			fi
 			if [ "${CDE_HOME}" = "" ]; then
 				CDE_HOME=/usr/dt
 			fi
-			OUTPUT_DIR=../../../org.eclipse.swt.motif.aix.ppc
+			if [ "${OUTPUT_DIR}" = "" ]; then
+				OUTPUT_DIR=../../../org.eclipse.swt.motif.aix.ppc
+			fi
 			makefile="make_aix.mak"
 			echo "Building AIX motif ppc version of SWT"
 		esac
@@ -45,10 +50,31 @@ case $OS in
 		case $MODEL in
 		*)
 			if [ "${JAVA_HOME}" = "" ]; then
-				echo "Please set JAVA_HOME to point at a JRE."
+				JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50"
 			fi
 			if [ "${MOTIF_HOME}" = "" ]; then
-				echo "Please set MOTIF_HOME to point at a Motif dev path."
+				MOTIF_HOME="/bluebird/teamswt/swt-builddir/motif21"
+			fi
+			if [ "${MOZILLA_SDK}" = "" ]; then
+				MOZILLA_SDK="/bluebird/teamswt/swt-builddir/mozilla/1.4/linux_gtk2/mozilla/dist/sdk"
+			fi
+			if [ "${XULRUNNER_SDK}" = "" ]; then
+				XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/1.8.0.4/gecko-sdk"
+			fi
+			if [ "${MOZILLA_INCLUDES}" = "" ]; then
+				MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/mozilla-config.h -I${MOZILLA_SDK}/../include/xpcom -I${MOZILLA_SDK}/../include/nspr -I${MOZILLA_SDK}/../include/embed_base -I${MOZILLA_SDK}/../include/embedstring -I${MOZILLA_SDK}/../include/string"
+			fi
+			if [ "${MOZILLA_LIBS}" = "" ]; then
+				MOZILLA_LIBS="${MOZILLA_SDK}/../lib/libembedstring.a -L${MOZILLA_SDK}/../bin -L${MOZILLA_SDK}/../lib/ -lxpcom -lnspr4 -lplds4 -lplc4"
+			fi
+			if [ "${XULRUNNER_INCLUDES}" = "" ]; then
+				XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
+			fi
+			if [ "${XULRUNNER_LIBS}" = "" ]; then
+				XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
+			fi
+			if [ "${PKG_CONFIG_PATH}" = "" ]; then
+				PKG_CONFIG_PATH="/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_x86/lib/pkgconfig"
 			fi
 			if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
 				if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
@@ -74,7 +100,9 @@ case $OS in
 					echo "    *** Mozilla embedding support will not be compiled."
 				fi
 			fi
-			OUTPUT_DIR=../../../org.eclipse.swt.motif.linux.x86
+			if [ "${OUTPUT_DIR}" = "" ]; then
+				OUTPUT_DIR=../../../org.eclipse.swt.motif.linux.x86
+			fi
 			makefile="make_linux.mak"
 			echo "Building Linux motif x86 version of SWT"
 		esac
@@ -91,8 +119,13 @@ case $OS in
 			if [ "${CDE_HOME}" = "" ]; then
 				CDE_HOME=/usr/dt		
 			fi
-			OUTPUT_DIR=../../../org.eclipse.swt.motif.solaris.sparc
-			PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
+			if [ "${PKG_CONFIG_PATH}" = "" ]; then
+				PKG_CONFIG_PATH="/usr/local/cairo-1.4.10/lib/pkgconfig/"
+			fi
+			if [ "${OUTPUT_DIR}" = "" ]; then
+				OUTPUT_DIR=../../../org.eclipse.swt.motif.solaris.sparc
+			fi
+			PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin:$PATH"
 			export PATH
 			makefile="make_solaris.mak"
 			echo "Building Solaris motif sparc version of SWT"
@@ -102,7 +135,7 @@ case $OS in
 		case $MODEL in
 			"ia64")
 				if [ "${JAVA_HOME}" = "" ]; then
-					echo "Please set JAVA_HOME to point at a JRE."
+					JAVA_HOME="/opt/java1.5/"
 				fi
 				if [ "${MOTIF_HOME}" = "" ]; then
 					MOTIF_HOME=/usr
@@ -110,7 +143,12 @@ case $OS in
 				if [ "${CDE_HOME}" = "" ]; then
 					CDE_HOME=/usr/dt
 				fi
-				OUTPUT_DIR=../../../org.eclipse.swt.motif.hpux.ia64_32
+				if [ "${AWT_HOME}" = "" ]; then
+					AWT_HOME="/opt/java1.5/jre/lib/IA64N/"
+				fi
+				if [ "${OUTPUT_DIR}" = "" ]; then
+					OUTPUT_DIR=../../../org.eclipse.swt.motif.hpux.ia64_32
+				fi
 				makefile="make_hpux_ia64_32.mak"
 				echo "Building HPUX motif 32 bit ia64 version of SWT"
 				;;
@@ -124,7 +162,9 @@ case $OS in
 				if [ "${CDE_HOME}" = "" ]; then
 					CDE_HOME=/usr/dt
 				fi
-				OUTPUT_DIR=../../../org.eclipse.swt.motif.hpux.PA_RISC
+				if [ "${OUTPUT_DIR}" = "" ]; then
+					OUTPUT_DIR=../../../org.eclipse.swt.motif.hpux.PA_RISC
+				fi
 				makefile="make_hpux_PA_RISC.mak"
 				echo "Building HPUX motif risc version of SWT"
 				;;
@@ -136,6 +176,6 @@ case $OS in
 		;;
 esac
 
-export JAVA_HOME MOTIF_HOME CDE_HOME MOZILLA_SDK MOZILLA_INCLUDES MOZILLA_LIBS XULRUNNER_SDK XULRUNNER_INCLUDES XULRUNNER_LIBS OUTPUT_DIR
+export JAVA_HOME MOTIF_HOME CDE_HOME AWT_HOME MOZILLA_SDK MOZILLA_INCLUDES MOZILLA_LIBS XULRUNNER_SDK XULRUNNER_INCLUDES XULRUNNER_LIBS PKG_CONFIG_PATH OUTPUT_DIR
 
 make -f $makefile $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat
index e304bf6626..c3abb32a53 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat
@@ -40,7 +40,7 @@ IF "%CFG%"=="hpc2000" GOTO HPC2000
 IF "%CFG%"=="SmartPhone 2002" GOTO SMARTPHONE
 
 :POCKETPC
-set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.wce_ppc.arm
+IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.wce_ppc.arm
 set OSVERSION=WCE300
 set PLATFORM=MS Pocket PC
 set PATH=%WCEROOT%\bin;%WCEROOT%\%OSVERSION%\bin;%path%
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
index 130bcbcf2f..a51de39e4c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
@@ -19,7 +19,7 @@ IF x.%1==x.x86_64 GOTO X86_64
 IF x.%1==x.ia64 GOTO IA64
 
 :X86
-IF x.%OUTPUT_DIR%==x. set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86
+IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86
 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-java2-sdk-50-win-i386
 IF x.%BUILD_XULRUNNER%==x.true GOTO XULRUNNER
 call "%SWT_BUILDDIR%\MSVCs\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat"
@@ -39,7 +39,7 @@ GOTO MAKE
 :X86_64
 
 call %MSSDK%\setenv /X64 /RETAIL
-IF x.%OUTPUT_DIR%==x. set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86_64
+IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86_64
 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-sdk50-x86_64
 set CFLAGS=-DJNI64
 shift
@@ -48,7 +48,7 @@ GOTO MAKE
 :IA64
 
 call %MSSDK%\setenv /SRV64 /RETAIL
-IF x.%OUTPUT_DIR%==x. set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.ia64
+IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.ia64
 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-sdk142-ia64
 set CFLAGS=-DJNI64
 shift
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
index aabec23a51..43c88c8b45 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
@@ -192,7 +192,7 @@ swt_xpcominit.res:
 	rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(XPCOMINIT_LIB)\" -r -fo swt_xpcom.res swt_xpcom.rc
 
 install:
-	copy *.dll $(OUTPUT_DIR)
+	copy *.dll "$(OUTPUT_DIR)"
 
 clean:
     del *.obj *.res *.dll *.lib *.exp
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak
index 964410e3d4..4cdec3d8c2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak
@@ -113,7 +113,7 @@ swt.res:
 	rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(SWT_LIB)\" -r -fo swt.res swt.rc
 
 install: all
-	copy *.dll $(OUTPUT_DIR)
+	copy *.dll "$(OUTPUT_DIR)"
 
 clean:
     del *.obj *.res *.dll *.lib *.exp
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/build.bat
index 4afe977fa9..7806691722 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/build.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/build.bat
@@ -25,6 +25,6 @@ call "S:\swt-builddir\MSSDKs\Microsoft SDK 6.0 Vista\Bin\setenv.cmd" /x86 /vista
 rem ****** 
 rem OUTPUT DIR
 rem ******
-set OUTPUT_DIR=..\..\..\org.eclipse.swt.wpf.win32.x86
+IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.wpf.win32.x86
 
 nmake -f make_wpf.mak %1 %2 %3 %4
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/make_wpf.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/make_wpf.mak
index f4a8ace583..d4ee6062a6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/make_wpf.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/make_wpf.mak
@@ -53,7 +53,7 @@ $(SWT_WIN32_LIB): $(SWT_C_OBJS) $(SWT_WIN32_OBJS)
 	link $(WIN32LFLAGS) -OUT:$(SWT_WIN32_LIB) $(SWT_C_OBJS) $(SWT_WIN32_OBJS)
 
 install: all
-	copy *.dll $(OUTPUT_DIR)
+	copy *.dll "$(OUTPUT_DIR)"
 
 clean:
     del *.obj *.res *.dll *.lib *.exp *.manifest