new build scripts for git migration

18 files changed, 1470 insertions, 1850 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
diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml
index 59c270366e..e84f1c49d9 100644
--- a/bundles/org.eclipse.swt/buildFragment.xml
+++ b/bundles/org.eclipse.swt/buildFragment.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
     Copyright (c) 2009, 2010 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
@@ -9,7 +10,7 @@
         IBM Corporation - initial API and implementation
  -->
 
-<project name="org.eclipse.swt.fragment" default="" basedir=".">
+<project name="org.eclipse.swt.fragment" default="" basedir="../../..">
 
 	<target name="init" depends="properties">
 		<property name="compilerArg" value="" />
@@ -17,11 +18,12 @@
 			<isset property="swt.arch"/>
 		</condition>
 		<property name="full.name" value="${fragment}_${version.suffix}" />
-		<property name="temp.folder" value="${basedir}/temp.folder" />
-		<property name="plugin.destination" value="${basedir}" />
-		<property name="build.result.folder" value="${basedir}" />
-		<property name="destination" value="${basedir}" />
-		<property name="plugindir" value="../org.eclipse.swt" />
+		<property name="plugindir" value="eclipse.platform.swt/bundles/org.eclipse.swt" />
+		<property name="fragmentdir" value="${basedir}/eclipse.platform.swt.binaries/bundles/${fragment}" />
+		<property name="temp.folder" value="${fragmentdir}/temp.folder" />
+		<property name="plugin.destination" value="${fragmentdir}" />
+		<property name="build.result.folder" value="${fragmentdir}" />
+		<property name="destination" value="${fragmentdir}" />
 		<property name="javacVerbose" value="false" />
 		<property name="logExtension" value=".xml" />
 		<property name="javacSource" value="1.3" />
@@ -136,7 +138,8 @@
 			<fileset dir="${plugindir}/Eclipse SWT AWT/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT AWT/carbon/"/>
 			<fileset dir="${plugindir}/Eclipse SWT WebKit/carbon/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
			<fileset dir="${plugindir}/Eclipse SWT Browser/carbon/"/>
+			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
+			<fileset dir="${plugindir}/Eclipse SWT Browser/carbon/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/carbon/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/"/>
@@ -173,7 +176,8 @@
 			<fileset dir="${plugindir}/Eclipse SWT AWT/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT AWT/cocoa/"/>
 			<fileset dir="${plugindir}/Eclipse SWT WebKit/cocoa/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
			<fileset dir="${plugindir}/Eclipse SWT Browser/cocoa/"/>
+			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
+			<fileset dir="${plugindir}/Eclipse SWT Browser/cocoa/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/cocoa/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/"/>
@@ -209,7 +213,8 @@
 			<fileset dir="${plugindir}/Eclipse SWT Accessibility/gtk/"/>
 			<fileset dir="${plugindir}/Eclipse SWT AWT/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT AWT/gtk/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
			<fileset dir="${plugindir}/Eclipse SWT Browser/gtk/"/>
+			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
+			<fileset dir="${plugindir}/Eclipse SWT Browser/gtk/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/gtk/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/"/>
@@ -257,7 +262,8 @@
 			<fileset dir="${plugindir}/Eclipse SWT Accessibility/emulated/"/>
 			<fileset dir="${plugindir}/Eclipse SWT AWT/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT AWT/motif/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
			<fileset dir="${plugindir}/Eclipse SWT Browser/motif/"/>
+			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
+			<fileset dir="${plugindir}/Eclipse SWT Browser/motif/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/motif/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/"/>
@@ -336,7 +342,8 @@
 			<fileset dir="${plugindir}/Eclipse SWT Browser/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Browser/win32/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/"/>
-			<fileset dir="${plugindir}/Eclipse SWT Mozilla/win32/"/>
			<fileset dir="${plugindir}/Eclipse SWT WebKit/win32/"/>
+			<fileset dir="${plugindir}/Eclipse SWT Mozilla/win32/"/>
+			<fileset dir="${plugindir}/Eclipse SWT WebKit/win32/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Drag and Drop/common/"/>
 			<fileset dir="${plugindir}/Eclipse SWT Drag and Drop/win32/"/>
@@ -496,7 +503,9 @@
 		<copy file="${build.result.folder}/swt.jar" todir="${temp.folder}/swtdownload" />
 		<antcall target="build.sources" />
 		<copy file="${build.result.folder}/src.zip" todir="${temp.folder}/swtdownload" />
-		<copy file="${plugindir}/build/.project" todir="${temp.folder}/swtdownload" />
		<copy file="${plugindir}/build/.classpath" todir="${temp.folder}/swtdownload" />
		<copy todir="${temp.folder}/swtdownload">
+		<copy file="${plugindir}/build/.project" todir="${temp.folder}/swtdownload" />
+		<copy file="${plugindir}/build/.classpath" todir="${temp.folder}/swtdownload" />
+		<copy todir="${temp.folder}/swtdownload">
 			<fileset dir="${basedir}" includes="about.html,about_files/" />
 		</copy>
 		<condition property="zipfilename" value="swt-${buildid}-${swt.ws}-${swt.os}-${swt.arch}.zip" else="swt-${buildid}-${swt.ws}-${swt.os}.zip">
diff --git a/bundles/org.eclipse.swt/buildNatives.xml b/bundles/org.eclipse.swt/buildNatives.xml
new file mode 100644
index 0000000000..b314cea763
--- /dev/null
+++ b/bundles/org.eclipse.swt/buildNatives.xml
@@ -0,0 +1,1050 @@
+<?xml version="1.0" encoding="UTF-8"?>

+

+<!--

+    Copyright (c) 2009, 2011 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

+ -->

+

+<!-- 

+ 

+	TAG: a tag param can be passed in to work on branch. If no tag is set master is used.

+		For example: ant -f buildNatives.xml increment_version -DTAG=R3_5_maintenance

+		

+	natives_changed: when starting a integration build the increment of the version 

+		can be forced by setting this project. If property is not defined the increment 

+		is determine automatically based on changes in the native code since the last 

+		revision in the swp.map.

+		for Example: ant -f buildNatives.xml increment_version -Dnatives_changed=true

+	

+	To build the libraries of a fragment, run

+		ant -f <fragment dir>/build.xml build_libraries 

+	

+	Notes:

+	 To void clean after build define a property named "clean" to empty ("").

+	 To run only clean define a property named "targets" to empty ("").

+	 

+ -->

+

+<project name="swtbuild" basedir="../../..">

+	<property name="gitroot" value="fheidric@dev.eclipse.org:/gitroot/platform/"/>

+	<property name="keyfile" value="C:\BUILD\ssh\swtbuild_dsa_private" /> 

+	<property name="TAG" value="master"/>

+	<property name="src.repo" value="eclipse.platform.swt"/>

+	<property name="bin.repo" value="eclipse.platform.swt.binaries"/>

+	<property name="releng.repo" value="eclipse.platform.releng"/>

+	<property name="tmphome" value="./tmp"/>

+

+	<property name="cp_common" value="'bundles/org.eclipse.swt/Eclipse SWT/common/library' 'bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/common/library'"/>

+	<property name="cp_win32" value="${cp_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library'"/>

+	<property name="cp_gtk" value="${cp_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/cde/library'"/>

+	<property name="cp_cocoa" value="${cp_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library'"/>

+	<property name="cp_carbon" value="${cp_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library'"/>

+	<property name="cp_motif" value="${cp_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/motif/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library'  'bundles/org.eclipse.swt/Eclipse SWT AWT/motif/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library' 'bundles/org.eclipse.swt/Eclipse SWT Program/cde/library'"/>

+	<property name="cp_wpf" value="${cp_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library'"/>

+	<property name="cp_photon" value="${cp_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/photon/library'"/>

+	

+	<property name="library_j2se" value="bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java"/>

+	<property name="library_j2me" value="bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java"/>

+	<property name="make_common" value="bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/>

+	<property name="version_file" value="bundles/org.eclipse.swt/Eclipse SWT/common/version.txt"/>

+		

+	<target name="check_libraries" depends="get_version">

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="5"/>

+			<param name="fragment" value="org.eclipse.swt.carbon.macosx"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="4"/>

+			<param name="fragment" value="org.eclipse.swt.cocoa.macosx"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="4"/>

+			<param name="fragment" value="org.eclipse.swt.cocoa.macosx.x86_64"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="5"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.aix.ppc"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="5"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.aix.ppc64"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="4"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.hpux.ia64_32"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="11"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="10"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="10"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.linux.s390"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="10"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.linux.s390x"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="12"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="12"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="9"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.solaris.sparc"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="8"/>

+			<param name="fragment" value="org.eclipse.swt.gtk.solaris.x86"/>

+		</antcall>

+		<!-- Motif is not being built

+		antcall target="check_fragment_libraries">

+			<param name="library_count" value="9"/>

+			<param name="fragment" value="org.eclipse.swt.motif.linux.x86"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="4"/>

+			<param name="fragment" value="org.eclipse.swt.motif.aix.ppc"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="3"/>

+			<param name="fragment" value="org.eclipse.swt.motif.hpux.ia64_32"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="5"/>

+			<param name="fragment" value="org.eclipse.swt.motif.solaris.sparc"/>

+		</antcall-->

+		<!-- Photon is not being built

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="1"/>

+			<param name="fragment" value="org.eclipse.swt.photon.qnx.x86"/>

+		</antcall>

+		-->

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="4"/>

+			<param name="fragment" value="org.eclipse.swt.win32.win32.ia64"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="6"/>

+			<param name="fragment" value="org.eclipse.swt.win32.win32.x86"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="4"/>

+			<param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/>

+		</antcall>

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="1"/>

+			<param name="fragment" value="org.eclipse.swt.win32.wce_ppc.arm"/>

+		</antcall>

+		<!-- WPF is not being built

+		<antcall target="check_fragment_libraries">

+			<param name="library_count" value="2"/>

+			<param name="fragment" value="org.eclipse.swt.wpf.win32.x86"/>

+		</antcall>

+		-->

+	</target>

+	

+	<target name="check_fragment_libraries" depends="get_version">

+		<property name="checkdir" value="~/build/check_libraries"/>

+		<property name="library_count" value="124"/>

+		<property name="fragment" value=""/>

+		<fileset id="match" dir="${bin.repo}/bundles/${fragment}">

+			<filename regex="[0-9][0-9][0-9][0-9]."/>

+			<filename regex="${swt_version}."/>

+			<exclude name="**/.git/**"/>

+			<exclude name="**/org.eclipse.swt.gtk.hpux.ia64/**"/>

+			<exclude name="**/org.eclipse.swt.gtk.linux.ia64/**"/>

+			<exclude name="**/org.eclipse.swt.motif.aix.ppc/**"/>

+			<exclude name="**/org.eclipse.swt.motif.hpux.ia64_32/**"/>

+			<exclude name="**/org.eclipse.swt.motif.hpux.PA_RISC/**"/>

+			<exclude name="**/org.eclipse.swt.motif.linux.x86/**"/>

+			<exclude name="**/org.eclipse.swt.motif.solaris.sparc/**"/>

+			<exclude name="**/org.eclipse.swt.photon.qnx.x86/**"/>

+			<exclude name="**/org.eclipse.swt.wpf.win32.x86/**"/>

+		</fileset>

+		<fileset id="not_match" dir="${bin.repo}/bundles/${fragment}">

+			<filename regex="[0-9][0-9][0-9][0-9]."/>

+			<filename regex="${swt_version}." negate="true"/>

+			<exclude name="**/.git/**"/>

+			<exclude name="**/org.eclipse.swt.gtk.hpux.ia64/**"/>

+			<exclude name="**/org.eclipse.swt.gtk.linux.ia64/**"/>

+			<exclude name="**/org.eclipse.swt.motif.aix.ppc/**"/>

+			<exclude name="**/org.eclipse.swt.motif.hpux.ia64_32/**"/>

+			<exclude name="**/org.eclipse.swt.motif.hpux.PA_RISC/**"/>

+			<exclude name="**/org.eclipse.swt.motif.linux.x86/**"/>

+			<exclude name="**/org.eclipse.swt.motif.solaris.sparc/**"/>

+			<exclude name="**/org.eclipse.swt.photon.qnx.x86/**"/>

+			<exclude name="**/org.eclipse.swt.wpf.win32.x86/**"/>

+		</fileset>

+		<property name="not_match_text" refid="not_match"/>

+		<echo>Old libraries: ${not_match_text}</echo>

+		<resourcecount refid="match" property="match_count"/>

+		<resourcecount refid="not_match" property="not_match_count"/>

+		<echo>Found ${match_count} libraries with version ${swt_version} and ${not_match_count} libraries with old versions</echo>

+		<condition property="m_fail">

+			<not>

+				<and>

+					<equals arg1="${match_count}" arg2="${library_count}"/>

+					<equals arg1="${not_match_count}" arg2="0"/>

+				</and>

+			</not>

+		</condition>

+		<fail if="m_fail" message="Failed. Expecting ${library_count} and 0."/>

+		<echo>Success</echo>

+	</target>	

+	

+	<target name="check_machines">

+		<parallel>

+		<sshexec host="${m_linux_x86}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_linux_x86_output"

+			command="hostname"/>

+		<sshexec host="${m_linux_x86_64}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_linux_x86_64_output"

+			command="hostname"/>

+		<!-- These machines are only used for 3.5.x builds. -->

+		<!--sshexec host="${m_linux_rh3_x86}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_linux_rh3_x86_output"

+			command="hostname"/>

+		<sshexec host="${m_linux_rh3_x86_64}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_linux_rh3_x86_64_output"

+			command="hostname"/-->

+			

+		<sshexec host="${m_linux_ppc}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_linux_ppc_output"

+			command="hostname"/>

+		<sshexec host="${m_linux_ppc64}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_linux_ppc64_output"

+			command="hostname"/>

+			

+		<sshexec host="${m_solaris_sparc}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_solaris_sparc_output"

+			command="hostname"/>

+		<sshexec host="${m_solaris_x86}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_solaris_x86_output"

+			command="hostname"/>

+			

+		<sshexec host="${m_aix}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_aix_output"

+			command="hostname"/>

+			

+		<sshexec host="${m_hpux}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_hpux_output"

+			command="hostname"/>

+		<sshexec host="${m_mac}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_mac_output"

+			command="hostname"/>

+		</parallel>

+		<property name="success_msg" value="Success"/>

+		<property name="fail_msg" value="*** Fail ***"/>

+		<condition property="m_linux_x86_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_linux_x86}*" string="${m_linux_x86_output}"/>

+		</condition>

+		<condition property="m_linux_x86_64_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_linux_x86_64}*" string="${m_linux_x86_64_output}"/>

+		</condition>

+		<!--condition property="m_linux_rh3_x86_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_linux_rh3_x86}*" string="${m_linux_rh3_x86_output}"/>

+		</condition>

+		<condition property="m_linux_rh3_x86_64_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_linux_rh3_x86_64}*" string="${m_linux_rh3_x86_64_output}"/>

+		</condition-->

+		

+		<condition property="m_linux_ppc_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_linux_ppc}*" string="${m_linux_ppc_output}"/>

+		</condition>

+		<condition property="m_linux_ppc64_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_linux_ppc64}*" string="${m_linux_ppc64_output}"/>

+		</condition>

+		<condition property="m_solaris_sparc_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_solaris_sparc}*" string="${m_solaris_sparc_output}"/>

+		</condition>

+		<condition property="m_solaris_x86_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_solaris_x86}*" string="${m_solaris_x86_output}"/>

+		</condition>

+		<condition property="m_aix_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_aix}*" string="${m_aix_output}"/>

+		</condition>

+		<condition property="m_hpux_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_hpux}*" string="${m_hpux_output}"/>

+		</condition>

+		<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_mac}*" string="${m_mac_output}"/>

+		</condition>

+		<echo>-------------------------</echo>

+		<echo>Status:</echo>

+		<echo></echo>

+		<echo>${m_linux_x86} - ${m_linux_x86_test}</echo>

+		<echo>${m_linux_x86_64} - ${m_linux_x86_64_test}</echo>

+		<!--echo>${m_linux_rh3_x86} ${m_linux_rh3_x86_test}</echo>

+		<echo>${m_linux_rh3_x86_64} ${m_linux_rh3_x86_64_test}</echo-->

+		<echo>${m_linux_ppc} - ${m_linux_ppc_test}</echo>

+		<echo>${m_linux_ppc64} - ${m_linux_ppc64_test}</echo>

+		<echo>${m_solaris_sparc} - ${m_solaris_sparc_test}</echo>

+		<echo>${m_solaris_x86} - ${m_solaris_x86_test}</echo>

+		<echo>${m_aix} - ${m_aix_test}</echo>

+		<echo>${m_hpux} - ${m_hpux_test}</echo>

+		<echo>${m_mac} - ${m_mac_test}</echo>

+		<echo>-------------------------</echo>

+		<condition property="m_fail">

+			<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}"/>

+		</condition>

+		<fail if="m_fail" message="Failed"/>

+	</target>

+

+	<target name="check_s390_machines">

+		<parallel>

+		<sshexec host="${m_linux_s390}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			failonerror="false"

+			trust="true"

+			outputproperty="m_linux_s390_output"

+			command="hostname"/>

+		<sshexec host="${m_linux_s390x}" 

+				username="swtbuild" 

+				keyfile="${keyfile}" 

+				failonerror="false"

+				trust="true"

+				outputproperty="m_linux_s390x_output"

+				command="hostname"/>

+		</parallel>

+		<property name="success_msg" value="Success"/>

+		<property name="fail_msg" value="*** Fail ***"/>

+		<condition property="m_linux_s390x_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_linux_s390x_output}*" string="${m_linux_s390x}"/>

+		</condition>

+		<condition property="m_linux_s390_test" value="${success_msg}" else="${fail_msg}">

+			<matches pattern="${m_linux_s390_output}*" string="${m_linux_s390}"/>

+		</condition>

+		<echo>-------------------------</echo>

+		<echo>Status:</echo>

+		<echo></echo>

+		<echo>${m_linux_s390} - ${m_linux_s390_test}</echo>

+		<echo>${m_linux_s390x} - ${m_linux_s390x_test}</echo>

+		<echo>-------------------------</echo>

+		<condition property="m_fail">

+			<matches pattern="Fail" string="${m_linux_s390_test} ${m_linux_s390x_test}"/>

+		</condition>

+		<fail if="m_fail" message="Failed"/>

+	</target>

+	

+	<target name="check_compilation">

+		<property name="tmpdir" value="${tmphome}/check.compile.${TAG}"/>

+		<property name="projectDir" value="${src.repo}/bundles/org.eclipse.swt"/>

+		<property name="buildDir" value="${tmpdir}/build"/>

+

+		<!-- 64 bit -->

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_cocoa"/>

+			<param name="is64" value="64 bit"/>

+		</antcall>

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_gtk"/>

+			<param name="is64" value="64 bit"/>

+		</antcall>

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_win32"/>

+			<param name="is64" value="64 bit"/>

+		</antcall>

+		

+		<!-- 32 bit -->

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_carbon"/>

+		</antcall>

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_cocoa"/>

+		</antcall>

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_gtk"/>

+		</antcall>

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_win32"/>

+		</antcall>

+		<!-- Not building motif

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_motif"/>

+		</antcall>

+		-->

+		<!-- Not building Photon

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_photon"/>

+		</antcall>

+		-->

+		<!-- Not building WPF

+		<antcall target="build_classes">

+			<param name="cp" value=".classpath_wpf"/>

+		</antcall>

+		-->

+		

+		<delete dir="${tmpdir}" quiet="true"/>

+	</target>

+	

+	<target name="replace64" if="is64">

+		<antcall target="replace.32.to.64">

+			<param name="replace_dir" value="${buildDir}"/>

+		</antcall>

+	</target>

+	

+	<target name="build_classes">

+		<echo>Building ${cp} ${is64}</echo>

+		<delete file="${tmpdir}/copy.xml"/>

+		<delete dir="${buildDir}"/>

+				

+		<xslt style="${projectDir}/tasks/classpath.xls" in="${projectDir}/${cp}" out="${tmpdir}/copy.xml">

+			<param name="srcDir" expression="${projectDir}"/>

+			<param name="outputDir" expression="${buildDir}"/>

+		</xslt>

+		<ant antfile="${tmpdir}/copy.xml" target="copy_files"/>

+		

+		<antcall target="replace64"></antcall>

+				

+		<javac srcdir="${buildDir}"></javac>

+	</target>

+

+	<!-- common build tasks -->

+	<target name="new_release">

+		<property name="tmpdir" value="${tmphome}/new_release"/>

+		<delete dir="${tmpdir}" quiet="true"/>

+		<mkdir dir="${tmpdir}"/>

+		<antcall target="new_release_imp"/>

+		<delete dir="${tmpdir}" quiet="true"/>

+	</target>

+	

+	<target name="new_release_imp" depends="get_new_release_version">

+		<property name="natives_changed" value="true"/>

+		<antcall target="increment_version_imp"/>

+	</target>

+	

+	<target name="increment_version">

+		<property name="tmpdir" value="${tmphome}/inc.${TAG}"/>

+		<delete dir="${tmpdir}" quiet="true"/>

+		<mkdir dir="${tmpdir}"/>

+		<antcall target="increment_version_imp"/>

+		<delete dir="${tmpdir}" quiet="true"/>

+	</target>

+	

+	<target name="increment_version_imp" depends="check_natives_changed, get_version" if="natives_changed">

+		<!-- Update the files -->

+		<replace file="${src.repo}/${library_j2se}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/>

+		<replace file="${src.repo}/${library_j2me}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/>

+		<replace file="${src.repo}/${library_j2se}" token="MINOR_VERSION = ${min_ver}" value="MINOR_VERSION = ${new_min_ver}"/>

+		<replace file="${src.repo}/${library_j2me}" token="MINOR_VERSION = ${min_ver}" value="MINOR_VERSION = ${new_min_ver}"/>

+		<replace file="${src.repo}/${version_file}" token="version ${maj_ver}.${min_ver}" value="version ${new_maj_ver}.${new_min_ver}"/>

+		<replace file="${src.repo}/${make_common}" token="min_ver=${min_ver}" value="min_ver=${new_min_ver}"/>

+		<replace file="${src.repo}/${make_common}" token="maj_ver=${maj_ver}" value="maj_ver=${new_maj_ver}"/>

+		<replace file="${src.repo}/${make_common}" token="comma_ver=${comma_ver}" value="comma_ver=${new_comma_ver}"/>

+

+		<!-- Commit the files -->

+		<exec dir="${src.repo}" executable="git" failonerror="true">

+			<arg line="add '${library_j2se}' '${library_j2me}' '${version_file}' '${make_common}'"/>

+		</exec>

+		<exec dir="${src.repo}" executable="git" failonerror="true">

+			<arg line="commit -m 'Update current version from v${swt_version} to v${new_version}'"/>

+		</exec>

+	</target>

+	

+	<target name="cvs_tag">

+		<condition property="CVS_TAG" value="" else="-r${TAG}">

+			<equals arg1="${TAG}" arg2="master"/>

+		</condition>

+		<echo>CVS_TAG=${CVS_TAG}</echo>

+	</target>

+

+	<!-- Set swt_tag to the current tag in the swt map file -->

+	<target name="get_tag" unless="swt_tag" depends="cvs_tag">

+		<property name="tmpdir" value="."/>

+		<!--property name="map" value="${releng.repo}/bundles/org.eclipse.releng/maps/swt.map"/-->

+		<property name="map" value="org.eclipse.releng/maps/swt.map"/>

+		<property name="cvsRsh" value="plink"/>

+		<property name="cvsRoot" value=":ext:fheidric@dev.eclipse.org:/cvsroot/eclipse"/>

+		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">

+			<commandline>

+				<argument value="checkout"/>

+				<argument line="${CVS_TAG}"/>

+				<argument value="${map}"/>

+			</commandline>

+		</cvs>

+		

+		<loadfile property="swt_tag" srcfile="${tmpdir}/${map}">

+			<filterchain>

+				<tokenfilter delimoutput="">

+					<containsstring contains="plugin@org.eclipse.swt=GIT,tag="/>

+					<replaceregex pattern=".*(v\d\d\d\d[a-z]?).*" replace="\1"/>

+				</tokenfilter>

+			</filterchain>

+		</loadfile>

+		<echo>Current tag=${swt_tag}.</echo>

+	</target>

+	

+	<!-- Set swt_new_tag  -->

+	<target name="get_new_tag" unless="swt_new_tag" depends="get_version">

+		<property name="tmpdir" value="."/>

+		<exec dir="${bin.repo}" executable="git" failonerror="true" outputproperty="tags">

+			<arg line="tag"/>

+		</exec>

+		<script language="javascript">

+			<![CDATA[

+				tags = project.getProperty("tags");

+				swt_version = project.getProperty("swt_version");

+				if (!tags.match(swt_version)) {

+					project.setProperty("swt_new_tag", swt_version);

+				} else {

+					for (i=97; i<123; i++) {

+						t = swt_version + String.fromCharCode(i);

+						if (!tags.match(t)) {

+							project.setProperty("swt_new_tag", t);

+							break;

+						}

+					}

+				}

+	   	 	]]>

+		</script>

+		<fail message="Unable to determine new tag">

+			<condition>

+				<not>

+					<isset property="swt_new_tag"/>

+				</not>

+			</condition>

+		</fail>

+		<echo>New tag=${swt_new_tag}.</echo>

+	</target>

+

+	<!-- Set swt_version, new_version, (and min_ver, maj_ver, new_min_ver, new_maj_ver) from the make_common.mak  -->

+	<target name="get_version" unless="swt_version">

+		<property name="tmpdir" value="."/>

+		

+		<loadproperties srcFile="${src.repo}/${make_common}"/>

+		<copy file="${src.repo}/${make_common}" tofile="${tmpdir}/tmp.txt" overwrite="true"/>

+		<propertyfile file="${tmpdir}/tmp.txt">

+			<entry key="new_min_ver" default="${min_ver}" type="int" operation="+"/>

+			<entry key="new_maj_ver" default="${maj_ver}" type="int" operation="="/>

+		</propertyfile>

+		<loadproperties srcFile="${tmpdir}/tmp.txt"/>

+		<property name="swt_version" value="${maj_ver}${min_ver}"/>

+		<property name="new_version" value="${maj_ver}${new_min_ver}"/>

+		<replace file="${tmpdir}/tmp.txt" token="comma_ver=${comma_ver}" value="new_comma_ver=${new_version}"/>

+		<replaceregexp file="${tmpdir}/tmp.txt" match="new_comma_ver=(\d)(\d)(\d)(\d)" replace="new_comma_ver=\1,\2,\3,\4" byline="true"/>

+		<loadproperties srcFile="${tmpdir}/tmp.txt"/>

+		<delete file="${tmpdir}/tmp.txt"/>

+		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>

+	</target>

+

+	<target name="get_new_release_version" unless="min_ver">

+		<property name="tmpdir" value="."/>

+		

+		<loadproperties srcFile="${src.repo}/${make_common}"/>

+		<script language="javascript">

+			<![CDATA[

+				min_ver = project.getProperty("min_ver");

+				maj_ver = project.getProperty("maj_ver");

+				new_min_ver = (Math.floor(parseInt(min_ver) / 100) + 1) * 100;

+				new_maj_ver = maj_ver;

+				if (new_min_ver >= 1000) {

+					new_min_ver = "000";

+					new_maj_ver = parseInt(new_maj_ver) + 1;

+				}

+				project.setProperty("new_min_ver", new_min_ver);

+				project.setProperty("new_maj_ver", new_maj_ver);

+	   	 	]]>

+		</script>

+		<property name="swt_version" value="${maj_ver}${min_ver}"/>

+		<property name="new_version" value="${new_maj_ver}${new_min_ver}"/>

+		<copy file="${src.repo}/${make_common}" tofile="${tmpdir}/tmp.txt" overwrite="true"/>

+		<replace file="${tmpdir}/tmp.txt" token="comma_ver=${comma_ver}" value="new_comma_ver=${new_version}"/>

+		<replaceregexp file="${tmpdir}/tmp.txt" match="new_comma_ver=(\d)(\d)(\d)(\d)" replace="new_comma_ver=\1,\2,\3,\4" byline="true"/>

+		<loadproperties srcFile="${tmpdir}/tmp.txt"/>

+		<delete file="${tmpdir}/tmp.txt"/>

+		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>

+	</target>

+	

+	<!-- Set natives_changed if there are changes in the C code -->

+	<target name="check_natives_changed" unless="natives_changed" depends="get_tag">

+		<exec dir="${src.repo}" executable="git" failonerror="true" outputproperty="diffs">

+			<arg line="diff ${TAG} ${swt_tag}"/>

+			<arg line="${cp_win32}"/>

+			<arg line="${cp_gtk}"/>

+			<arg line="${cp_cocoa}"/>

+		</exec>

+		<condition property="natives_changed">

+			<not>

+				<equals arg1="${diffs}" arg2=""/>

+			</not>

+		</condition>

+		<echo>Natives changed: ${natives_changed} since ${swt_tag}</echo>

+	</target>

+

+	<!-- Params: tmpdir, and swt_new_tag -->

+	<target name="update_buildnotes" depends="get_tag, get_new_tag">

+		<property name="MILESTONE" value=""/>

+		<tstamp>

+			<format property="header.time" pattern="EEEE MMMMM dd, yyyy" offset="1" unit="day"/>

+		</tstamp>

+		<tstamp>

+			<format property="url.to.time" pattern="yyyy-MM-dd'+'HH'%3A'mm'%3A'ss'+%2B0000'" timezone="gmt"/>

+		</tstamp>

+		<property name="build_notes" value="${src.repo}/bundles/org.eclipse.swt/buildnotes_swt.html"/>

+		

+		<exec dir="${src.repo}" executable="git" failonerror="true" output="${tmpdir}/startdate.txt">

+			<arg line="log --pretty='%ad' --date=iso -1 ${swt_tag}"/>

+		</exec>

+

+		<loadfile property="url.from.time" srcfile="${tmpdir}/startdate.txt">

+			<filterchain>

+				<tokenfilter delimoutput="">

+					<replaceregex pattern="\+" replace="%2B" flags="g"/>

+					<replaceregex pattern=":" replace="%3A" flags="g"/>

+					<replaceregex pattern="\s" replace="+" flags="g"/>

+				</tokenfilter>

+			</filterchain>

+		</loadfile>

+		<echo> Searching bugs from "${url.from.time}" to "${url.to.time}"</echo>

+		

+		<property name="match_line" value="SWT&lt;/h1&gt;"/>

+		<property name="delimiter" value="&#13;&#10;"/>

+		<property name="url" value="https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=${MILESTONE};chfieldfrom=${url.from.time};chfieldto=${url.to.time};chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on="/>

+		<property name="body" value="${delimiter}${delimiter}&lt;h2&gt;SWT Build ${swt_new_tag} - ${header.time}&lt;/h2&gt;${delimiter}${delimiter}&lt;blockquote&gt;${delimiter}&lt;a href=${url}&gt;Bugs fixed&lt;/a&gt;${delimiter}&lt;/blockquote&gt;"/>

+		<replace file="${build_notes}" token="${match_line}" value="${match_line}${body}"/>

+		

+		<exec dir="${src.repo}" executable="git" failonerror="true">

+			<arg line="add '${build_notes}'"/>

+		</exec>

+		<exec dir="${src.repo}" executable="git" failonerror="true">

+			<arg line="commit -m 'new version v${swt_new_tag}'"/>

+		</exec>

+	</target>

+

+	<!-- depends on 'get_new_tag' to define swt_new_tag, swt_version, maj_ver and min_ver -->

+	<target name="tag_projects">

+		<property name="tmpdir" value="${tmphome}/tag.${TAG}"/>

+		<delete dir="${tmpdir}" quiet="true"/>

+		<mkdir dir="${tmpdir}"/>

+		<antcall target="tag_projects_imp"/>

+		<delete dir="${tmpdir}" quiet="true"/>

+	</target>

+	

+	<target name="update_swt_map" depends="cvs_tag">

+		<property name="cvsRsh" value="plink"/>

+		<property name="cvsRoot" value=":ext:fheidric@dev.eclipse.org:/cvsroot/eclipse"/>

+		<!-- download the map file -->

+		<property name="map" value="org.eclipse.releng/maps/swt.map"/>

+		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">

+			<commandline>

+				<argument value="checkout"/>

+				<argument line="${CVS_TAG}"/>

+				<argument value="${map}"/>

+			</commandline>

+		</cvs>

+

+		<!-- update and commit map file -->

+		<replaceregexp file="${tmpdir}/${map}" match="=v\d\d\d\d[a-z]?" replace="=v${swt_new_tag}" byline="true"/>

+		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">

+			<commandline>

+				<argument value="commit"/>

+				<argument value="-m"/>

+				<argument value="'new version v${swt_new_tag}'"/>

+				<argument value="${map}"/>

+			</commandline>

+		</cvs>

+	</target>

+	

+	<target name="tag_projects_imp" depends="get_new_tag">

+		<!-- These two lines perform the same check. check_libraries is slower because it checks each fragment separetely  -->

+		<!--antcall target="check_libraries"/-->

+		<antcall target="check_fragment_libraries"/>

+

+		<!-- update and commit the buildnotes_swt.html file -->

+		<antcall target="update_buildnotes"/>

+		

+		<exec dir="${src.repo}" executable="git" failonerror="true">

+			<arg line="tag ${swt_new_tag}"/>

+		</exec>

+		<exec dir="${bin.repo}" executable="git" failonerror="true">

+			<arg line="tag ${swt_new_tag}"/>

+		</exec>

+		

+		<antcall target="update_swt_map"/>

+	</target>

+	

+	<target name="check_sha1_file" unless="natives_changed">

+		<condition property="natives_changed">

+			<not>

+				<available file="${sha1_file}" type="file"/>

+			</not>

+		</condition>

+	</target>

+	

+	<target name="check_sha1_changed" depends="check_sha1_file" unless="natives_changed">

+		<loadproperties srcfile="${sha1_file}"/>

+		

+		<!-- Check for changes -->

+		<exec dir="${src.repo}" executable="git" failonerror="true" outputproperty="diffs">

+			<arg line="diff ${TAG} ${SHA1} ${cp}"/>

+		</exec>

+		<condition property="natives_changed">

+			<not>

+				<equals arg1="${diffs}" arg2=""/>

+			</not>

+		</condition>

+		<echo>Has native changes: ${natives_changed}, compared against ${SHA1}</echo>

+	</target>

+	

+	<target name="init_fragment">

+		<condition property="m_fail">

+			<not><and>

+				<isset property="swt.ws"/>

+				<isset property="swt.os"/>

+			</and></not>

+		</condition>

+		<fail if="m_fail" message="Failed: ${swt.ws} and ${swt.os} not set"/>

+		<condition property="fragment" value="org.eclipse.swt.${swt.ws}.${swt.os}.${swt.arch}" else="org.eclipse.swt.${swt.ws}.${swt.os}">

+			<isset property="swt.arch"/>

+		</condition>

+		<property name="fragment_dir" value="${bin.repo}/bundles/${fragment}"/>

+		<property name="sha1_file" value="${fragment_dir}/build.sha1"/>

+		<script language="javascript">

+			<![CDATA[

+				project.setProperty("cp", project.getProperty("cp_" + project.getProperty("swt.ws")));

+	   	 	]]>

+		</script>

+	</target>

+	

+	<!-- Params: swt.ws, swt.os, swt.arch -->

+	<target name="build_fragment" depends="init_fragment">

+		<property name="tmpdir" value="${tmphome}/build.${fragment}.${TAG}"/>

+		<delete dir="${tmpdir}" quiet="true"/>

+		<mkdir dir="${tmpdir}"/>

+		<antcall target="build_fragment_impl"/>

+		<delete dir="${tmpdir}" quiet="true"/>

+	</target>

+	

+	<target name="build_fragment_impl" depends="check_sha1_changed" if="natives_changed">

+		<!-- build natives -->

+		<antcall target="build_libraries"/>

+		<!-- commit libraries -->

+		<antcall target="commit_fragment"/>

+	</target>

+

+	<!-- Params: fragment, swt_version -->

+	<target name="commit_fragment" depends="init_fragment,get_version" if="natives_changed">

+		<fileset id="removeid" dir="${fragment_dir}">

+			<filename regex="[0-9][0-9][0-9][0-9]."/>

+			<filename regex="${swt_version}." negate="true"/>

+		</fileset>

+		

+		<copy todir="${fragment_dir}" overwrite="false">

+			<fileset refid="removeid"/>

+			<regexpmapper from="(.*)[0-9][0-9][0-9][0-9](.*)" to="\1${swt_version}\2"/>

+		</copy>

+		

+		<property name="rfiles" refid="removeid"/>

+		<echo file="${tmpdir}/tmp.txt">removed_files=${rfiles}</echo>

+		<replace file="${tmpdir}/tmp.txt" token=";" value=" "/>

+		<loadproperties srcfile="${tmpdir}/tmp.txt"/>

+		<delete file="${tmpdir}/tmp.txt"/>

+

+		<chmod perm="755">

+			<fileset dir="${fragment_dir}" includes="*${swt_version}*"/>

+		</chmod>

+		

+		<condition property="files_removed">

+			<length string="${removed_files}" trim="true" when="greater" length="0"/>

+		</condition>

+		<antcall target="git_rm"/>

+		<exec dir="${src.repo}" executable="git" failonerror="true" outputproperty="HEAD_TAG">

+			<arg line="rev-list ${TAG} -1"/>

+		</exec>

+		<propertyfile file="${fragment_dir}/build.sha1">

+			<entry key="SHA1" value="${HEAD_TAG}"/>

+		</propertyfile>

+		<exec dir="${bin.repo}" executable="git" failonerror="true">

+			<arg line="add '${fragment}'"/>

+		</exec>

+		<exec dir="${bin.repo}" executable="git" failonerror="true">

+			<arg line="commit -a -m 'v${swt_version} ${fragment}'"/>

+		</exec>

+	</target>

+

+	<target name="git_rm" if="files_removed">

+		<echo>Removing old libs: -${removed_files}-</echo>

+		<exec dir="${bin.repo}" executable="git" failonerror="true">

+			<arg line="rm ${removed_files}"/>

+		</exec>

+	</target>

+

+	<target name="init_build" if="eclipse.running">

+		<eclipse.refreshLocal resource="org.eclipse.swt" depth="infinite"/>

+		<eclipse.incrementalBuild project="org.eclipse.swt" kind="incr"/>

+	</target>

+

+	<target name="refresh_fragment" if="eclipse.running">

+		<echo>refreshing ${fragment}</echo>

+		<eclipse.refreshLocal resource="${fragment}" depth="infinite"/>

+	</target>

+		

+	<target name="copy.library.src">

+		<script language="javascript">

+			<![CDATA[

+				importClass(java.io.File);

+				importClass(java.io.StreamTokenizer);

+				importClass(java.io.StringReader);

+				task = project.createTask("copy");

+				projectDir = project.getProperty("project_dir");

+				task.setTodir(new File(project.getProperty("build_dir")));

+				tk = new StreamTokenizer(new StringReader(project.getProperty("cp")));

+				while ((token = tk.nextToken()) != StreamTokenizer.TT_EOF) {

+					fileset = project.createDataType("fileset");

+					fileset.setDir(new File(projectDir + "/" + tk.sval + "/"));

+					task.addFileset(fileset);

+				}

+				task.execute();

+	   	 	]]>

+		</script>

+	</target>

+

+	<!-- Params: swt.ws, swt.os, swt.arch -->

+	<target name="build_libraries" depends="init_fragment">

+		<property name="swt.arch" value=""/>

+		<property name="clean" value="clean"/>

+		<property name="targets" value="install"/>

+		<property name="project_dir" value="${basedir}/${src.repo}"/>

+		<property name="output_dir" value="${basedir}${fragment_dir}"/>

+		<property name="build_dir" value="${basedir}${fragment_dir}/tmpdir"/>

+		<delete dir="${build_dir}" quiet="true"/>

+		<antcall target="copy.library.src"/>

+		<condition property="build_task" value="build_local_win">

+			<or>

+				<equals arg1="${swt.ws}" arg2="win32"/>

+				<equals arg1="${swt.ws}" arg2="wpf"/>

+			</or>

+		</condition>

+		<condition property="build_task" value="build_remote" else="build_local">

+			<isset property="machine"/>

+		</condition>

+		<antcall target="init_build"/>

+		<antcall target="${build_task}"/>

+		<delete dir="${build_dir}" quiet="true"/>

+		<antcall target="refresh_fragment"/>

+	</target>

+	

+	<!-- machine targets swt.ws swt.os swt.arch -->

+	<target name="build_remote">

+		<property name="remotebuilddir" value="~/build"/>

+		<property name="remotetmpdir" value="${remotebuilddir}/${fragment}.${TAG}"/>

+		<property name="lib_output" value="${remotetmpdir}/libs"/>

+		<property name="zip_file" value="${fragment}.${TAG}.zip"/>

+		<zip destfile="${fragment_dir}/${zip_file}" basedir="${build_dir}"/>

+		<scp file="${fragment_dir}/${zip_file}"

+			todir="swtbuild@${machine}:${remotebuilddir}" 

+			keyfile="${keyfile}"

+			trust="true"/>

+		<delete file="${fragment_dir}/${zip_file}" quiet="true"/>

+		<sshexec host="${machine}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			trust="true"

+	 		command="rm -rf ${remotetmpdir}; mkdir ${remotetmpdir}; mkdir ${lib_output}; cd ${remotetmpdir}; unzip -aa ${remotebuilddir}/${zip_file}; export MODEL=${swt.arch}; export OUTPUT_DIR=${lib_output}; if sh build.sh ${targets}; then cd; else cd; rm -rf ${remotetmpdir}; exit 1; fi"/>

+		<scp file="swtbuild@${machine}:${lib_output}/*"

+			todir="${output_dir}"

+			keyfile="${keyfile}"

+			trust="true"/>

+		<sshexec host="${machine}" 

+			username="swtbuild" 

+			keyfile="${keyfile}" 

+			trust="true"

+	 		command="rm -rf ${remotetmpdir}; rm ${remotebuilddir}/${zip_file}"/>

+	</target>

+	

+	<target name="build_local">

+		<exec dir="${build_dir}" executable="sh" failonerror="true">

+			<arg line="build.sh"/>

+			<env key="MODEL" value="${swt.arch}"/>

+			<env key="OUTPUT_DIR" value="${output_dir}"/>

+			<arg line="${targets}"/>

+			<arg line="${clean}"/>

+		</exec>

+	</target>

+

+	<target name="build_local_win">

+		<pathconvert property="win_output_dir">

+			<path location="${output_dir}"></path>

+		</pathconvert>

+		<condition property="build_file" value="build_ce.bat" else="build.bat">

+			<equals arg1="${swt.os}" arg2="wce_ppc"/>

+		</condition>

+		<exec dir="${build_dir}" executable="${build_dir}/${build_file}" failonerror="true">

+			<env key="JAVA_HOME" value=""/>

+			<env key="OUTPUT_DIR" value="${win_output_dir}"/>

+			<arg line="${targets}"/>

+			<arg line="${clean}"/>

+		</exec>

+		<condition property="should_build_xulrunner" value="true">

+			<equals arg1="${swt.arch}" arg2="x86"/>

+		</condition>

+		<antcall target="build_local_win_xulrunner"/>

+		<delete dir="${tmpdir}" quiet="true"/>

+	</target>

+

+	<target name="build_local_win_xulrunner" if="should_build_xulrunner">

+		<exec dir="${build_dir}" executable="cmd" failonerror="true">

+			<env key="JAVA_HOME" value=""/>

+			<env key="BUILD_XULRUNNER" value="true"/>

+			<env key="OUTPUT_DIR" value="${win_output_dir}"/>

+			<arg line="/c '${build_dir}/${build_file}' x86 make_xulrunner install ${clean}"/>

+		</exec>

+	</target>

+

+	<target name="check_repo">

+		 <condition property="${repo.exists}">       

+		 	<available file="${TAG}/${repo}" type="dir"/>     

+		 </condition>

+	</target>

+	

+	<target name="init_repo" depends="check_repo" unless="${repo.exists}" >

+		<delete dir="${TAG}/${repo}" quiet="true"/>

+		<mkdir dir="${TAG}"/>

+		<exec dir="${TAG}" executable="git" failonerror="true">

+			<arg line="clone ${gitroot}/${repo}"/>

+		</exec>

+		<condition property="perform.checkout">

+			<not>

+				<equals arg1="${TAG}" arg2="master"/>

+			</not>

+		</condition>

+		<antcall target="checkout_repo"/>

+	</target>

+	

+	<target name="checkout_repo" if="perform.checkout">

+		<echo>Checking out ${repo}=${TAG}</echo>

+		<exec dir="${TAG}/${repo}" executable="git" failonerror="true">

+			<arg line="checkout -b ${TAG} origin/${TAG}"/>

+		</exec>

+	</target>

+

+	<target name="pull_remote">

+		<antcall target="init_repo">

+			<param name="repo" value="${src.repo}"/>

+			<param name="repo.exists" value="src.repo.exists"/>

+		</antcall>

+		<exec dir="${TAG}/${src.repo}" executable="git"  failonerror="true">

+			<arg line="pull"/>

+		</exec>

+		<antcall target="init_repo">

+			<param name="repo" value="${bin.repo}"/>

+			<param name="repo.exists" value="bin.repo.exists"/>

+		</antcall>

+		<exec dir="${TAG}/${bin.repo}" executable="git" failonerror="true">

+			<arg line="pull"/>

+		</exec>

+		<!--antcall target="init_repo">

+			<param name="repo" value="${releng.repo}"/>

+			<param name="repo.exists" value="releng.repo.exists"/>

+		</antcall>

+		<exec dir="${TAG}/${releng.repo}" executable="git" failonerror="true">

+			<arg line="pull"/>

+		</exec-->

+	</target>

+

+	<target name="push_remote">

+		<antcall target="init_repo">

+			<param name="repo" value="${src.repo}"/>

+			<param name="repo.exists" value="src.repo.exists"/>

+		</antcall>

+		<exec dir="${TAG}/${src.repo}" executable="git" failonerror="true">

+			<arg line="push"/>

+		</exec>

+		<antcall target="init_repo">

+			<param name="repo" value="${bin.repo}"/>

+			<param name="repo.exists" value="bin.repo.exists"/>

+		</antcall>

+		<exec dir="${TAG}/${bin.repo}" executable="git" failonerror="true">

+			<arg line="push"/>

+		</exec>

+		<!--antcall target="init_repo">

+			<param name="repo" value="${releng.repo}"/>

+			<param name="repo.exists" value="releng.repo.exists"/>

+		</antcall>

+		<exec dir="${TAG}/${releng.repo}" executable="git" failonerror="true">

+			<arg line="push"/>

+		</exec-->

+	</target>

+

+	<!-- Convert SWT 32 bit java and C source to 64 bit  -->

+	<target name="replace.32.to.64" depends="init_build">

+		<property name="replace_dir" value="${src.repo}/bundles/org.eclipse.swt"/>

+		<echo>Converting java files to 64 bit in ${replace_dir} project</echo>

+		<replace dir="${replace_dir}" includes="**/*.java" token="int /*long*/" value="long /*int*/"/>

+		<replace dir="${replace_dir}" includes="**/*.java" token="int[] /*long[]*/" value="long[] /*int[]*/"/>

+		<replace dir="${replace_dir}" includes="**/*.java" token="float /*double*/" value="double /*float*/"/>

+		<replace dir="${replace_dir}" includes="**/*.java" token="float[] /*double[]*/" value="double[] /*float[]*/"/>

+		<antcall target="init_build"/>

+	</target>

+

+	<!-- Convert SWT 64 bit java and C source to 32 bit  -->

+	<target name="replace.64.to.32" depends="init_build">

+		<property name="replace_dir" value="${src.repo}/bundles/org.eclipse.swt"/>

+		<echo>Converting java files to 32 bit in ${replace_dir} project</echo>

+		<replace dir="${replace_dir}" includes="**/*.java" token="long /*int*/" value="int /*long*/"/>

+		<replace dir="${replace_dir}" includes="**/*.java" token="long[] /*int[]*/" value="int[] /*long[]*/"/>

+		<replace dir="${replace_dir}" includes="**/*.java" token="double /*float*/" value="float /*double*/"/>

+		<replace dir="${replace_dir}" includes="**/*.java" token="double[] /*float[]*/" value="float[] /*double[]*/"/>

+		<antcall target="init_build"/>

+	</target>

+</project>

diff --git a/bundles/org.eclipse.swt/tasks/build.xml b/bundles/org.eclipse.swt/tasks/build.xml
deleted file mode 100644
index 46d5bd3716..0000000000
--- a/bundles/org.eclipse.swt/tasks/build.xml
+++ /dev/null
@@ -1,1719 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Copyright (c) 2009, 2010 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
- -->
-
-<!-- 
- 
-	TAG: a tag param can be passed in to work on branch. If no tag is set HEAD is used.
-		For example: ant -f build.xml build_all -DTAG=-rR3_5_maintenance
-		
-	natives_changed: when starting a integration build the increment of the version 
-		can be forced by setting this project. If property is not defined the increment 
-		is determine automatically based on changes in the native code since the last 
-		revision in the swp.map.
-		for Example: ant -f build.xml increment_version -Dnatives_changed=true
-			
-	This script can be used from within Eclipse to build the natives for the current
-	platform. Call the task named build_[platform]. For example:
-	 	ant -f build.xml build_gtk_linux_ppc
-
-	Notes:
-	 To void clean after build define a property named "clean" to empty ("").
-	 To run only clean define a property named "targets" to empty ("").
-	 
- -->
-
-<project name="swtbuild" basedir="../..">
-	<property name="tasks" value="org.eclipse.swt/tasks"/>
-	<import file="${basedir}/${tasks}/properties.xml"/>
-
-	<!-- CVS values -->
-	<property name="cvsRoot" value=":ext:fheidric@dev.eclipse.org:/cvsroot/eclipse"/>
-	<property name="TAG" value=""/>
-	<property name="builddir" value="org.eclipse.swt/bin/library"/>
-	<property name="logdir" value="S:/swt-builddir/logs"/>
-	<property name="tmphome" value="S:/swt-builddir/tmp"/>
-	<property name="ant_home" value="~/build/apache-ant-1.8.1"/>
-
-	<property name="cp_common" value="'org.eclipse.swt/Eclipse SWT/common/library' 'org.eclipse.swt/Eclipse SWT Mozilla/common/library' 'org.eclipse.swt/Eclipse SWT PI/common/library'"/>
-	<property name="cp_win32" value="${cp_common} 'org.eclipse.swt/Eclipse SWT PI/win32/library' 'org.eclipse.swt/Eclipse SWT AWT/win32/library' 'org.eclipse.swt/Eclipse SWT OpenGL/win32/library' 'org.eclipse.swt/Eclipse SWT WebKit/win32/library'"/>
-	<!--property name="cp_wpf" value="${cp_common} 'org.eclipse.swt/Eclipse SWT PI/wpf/library' 'org.eclipse.swt/Eclipse SWT PI/wpf_win32/library'"/-->
-	<property name="cp_gtk" value="${cp_common} 'org.eclipse.swt/Eclipse SWT PI/gtk/library' 'org.eclipse.swt/Eclipse SWT AWT/gtk/library' 'org.eclipse.swt/Eclipse SWT OpenGL/glx/library' 'org.eclipse.swt/Eclipse SWT PI/cairo/library' 'org.eclipse.swt/Eclipse SWT Program/gnome/library' 'org.eclipse.swt/Eclipse SWT Program/cde/library'"/>
-	<property name="cp_motif" value="${cp_common} 'org.eclipse.swt/Eclipse SWT PI/motif/library' 'org.eclipse.swt/Eclipse SWT PI/motif_gtk/library'  'org.eclipse.swt/Eclipse SWT AWT/motif/library' 'org.eclipse.swt/Eclipse SWT OpenGL/glx/library' 'org.eclipse.swt/Eclipse SWT PI/cairo/library' 'org.eclipse.swt/Eclipse SWT Program/gnome/library' 'org.eclipse.swt/Eclipse SWT Program/cde/library'"/>
-	<property name="cp_carbon" value="${cp_common} 'org.eclipse.swt/Eclipse SWT PI/carbon/library' 'org.eclipse.swt/Eclipse SWT OpenGL/carbon/library'"/>
-	<property name="cp_cocoa" value="${cp_common} 'org.eclipse.swt/Eclipse SWT PI/cocoa/library' 'org.eclipse.swt/Eclipse SWT AWT/cocoa/library'"/>
-	<!--property name="cp_photon" value="${cp_common} 'org.eclipse.swt/Eclipse SWT PI/photon/library'"/-->
-
-	<!-- Low level build tasks -->
-	<target name="init_build" if="eclipse.running">
-		<eclipse.refreshLocal resource="org.eclipse.swt" depth="infinite"/>
-		<eclipse.incrementalBuild project="org.eclipse.swt" kind="incr"/>
-	</target>
-
-	<target name="refresh_fragment" if="eclipse.running">
-		<echo>refreshing ${fragment}</echo>
-		<eclipse.refreshLocal resource="${fragment}" depth="infinite"/>
-	</target>
-
-	<target name="build_win32_x86" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="x86 all make_webkit install"/>
-		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true">
-			<env key="JAVA_HOME" value=""/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true">
-			<env key="JAVA_HOME" value=""/>
-			<env key="BUILD_XULRUNNER" value="true"/>
-			<arg line="x86 make_xulrunner install"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.win32.win32.x86"/>
-		</antcall>
-	</target>
-
-	<target name="build_win32_x86_64" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="x86_64 all install"/>
-		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true">
-			<env key="JAVA_HOME" value=""/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/>
-		</antcall>
-	</target>
-
-	<target name="build_win32_ia64" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="ia64 all install"/>
-		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true">
-			<env key="JAVA_HOME" value=""/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.win32.win32.ia64"/>
-		</antcall>
-	</target>
-
-	<target name="build_wince" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build-ce.bat" failonerror="true">
-			<env key="JAVA_HOME" value=""/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.win32.wce_ppc.arm"/>
-		</antcall>
-	</target>
-
-	<target name="build_wpf_x86" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true">
-			<env key="JAVA_HOME" value=""/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.wpf.win32.x86"/>
-		</antcall>
-	</target>
-
-	<target name="build_gtk_linux_x86" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50"/>
-			<env key="MOZILLA_SDK" value="/bluebird/teamswt/swt-builddir/mozilla/1.4/linux_gtk2/mozilla/dist/sdk"/>
-			<env key="XULRUNNER_SDK" value="/bluebird/teamswt/swt-builddir/geckoSDK/1.8.0.4/gecko-sdk"/>
-			<env key="MOZILLA_INCLUDES" value="-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"/>
-			<env key="MOZILLA_LIBS" value="${MOZILLA_SDK}/../lib/libembedstring.a -L${MOZILLA_SDK}/../bin -L${MOZILLA_SDK}/../lib/ -lxpcom -lnspr4 -lplds4 -lplc4"/>
-			<env key="XULRUNNER_INCLUDES" value="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"/>
-			<env key="XULRUNNER_LIBS" value="-L${XULRUNNER_SDK}/lib -lxpcomglue"/>
-			<env key="PKG_CONFIG_PATH" value="/usr/lib/pkgconfig:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_x86/lib/pkgconfig"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86"/>
-		</antcall>
-	</target>
-
-
-	<target name="build_gtk_linux_x86_64" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/JDKs/x86_64/jdk1.5.0"/>
-			<env key="PKG_CONFIG_PATH" value="/usr/lib64/pkgconfig"/>
-			<env key="MOZILLA_SDK" value="/bluebird/teamswt/swt-builddir/mozilla/1.7/amd64/mozilla/dist/sdk"/>
-			<env key="XULRUNNER_SDK" value="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/amd64/mozilla/dist/sdk/"/>
-			<env key="MOZILLA_INCLUDES" value="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"/>
-			<env key="MOZILLA_LIBS" value="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"/>
-			<env key="XULRUNNER_INCLUDES" value="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"/>
-			<env key="XULRUNNER_LIBS" value="-L${XULRUNNER_SDK}/lib -lxpcomglue"/>
-			<env key="PKG_CONFIG_PATH" value="/usr/lib64/pkgconfig:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_x86_64/lib/pkgconfig"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>
-		</antcall>
-	</target>
-
-	<target name="build_gtk_linux_ppc" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50"/>
-			<env key="MOZILLA_SDK" value=" /bluebird/teamswt/swt-builddir/mozilla/1.7/ppc/mozilla/dist/sdk"/>
-			<env key="XULRUNNER_SDK" value="/bluebird/teamswt/swt-builddir/xulrunner/1.8.1.1/ppc/mozilla/dist/sdk/"/>
-			<env key="MOZILLA_INCLUDES" value="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"/>
-			<env key="MOZILLA_LIBS" value="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"/>
-			<env key="XULRUNNER_INCLUDES" value="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"/>
-			<env key="XULRUNNER_LIBS" value="-L${XULRUNNER_SDK}/lib -lxpcomglue"/>
-			<env key="PKG_CONFIG_PATH" value="/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc/lib/pkgconfig/"/>
-			<env key="MODEL" value="ppc"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc"/>
-		</antcall>
-	</target>
-	
-	<target name="build_gtk_linux_ppc64" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_xulrunner make_xpcominit make_mozilla install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"/>
-			<env key="MOZILLA_SDK" value=" /bluebird/teamswt/swt-builddir/mozilla/1.7/ppc64/mozilla/dist/sdk"/>
-			<env key="MOZILLA_LIBS" value="-m64 -L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"/>
-			<env key="MOZILLA_INCLUDES" value="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"/>
-			<env key="XULRUNNER_SDK" value="/bluebird/teamswt/swt-builddir/xulrunner/1.8.1.1/ppc64/mozilla/dist/sdk/"/>
-			<env key="XULRUNNER_INCLUDES" value="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"/>
-			<env key="XULRUNNER_LIBS" value="-m64 -L${XULRUNNER_SDK}/lib -lxpcomglue"/>
-			<env key="PKG_CONFIG_PATH" value="/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/"/>
-			<env key="MODEL" value="ppc64"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64"/>
-		</antcall>
-	</target>
-
-	<target name="build_gtk_solaris_x86" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_mozilla install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="CC" value="cc"/>
-			<env key="CXX" value="CC"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50"/>
-			<env key="MOZILLA_SDK" value="/bluebird/teamswt/bog/mozilla/solaris_x86/1.7/mozilla/dist/sdk"/>
-			<env key="XULRUNNER_SDK" value="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/solaris-x86/mozilla/dist/sdk"/>
-			<env key="MOZILLA_INCLUDES" value="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"/>
-			<env key="MOZILLA_LIBS" value="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"/>
-			<env key="XULRUNNER_INCLUDES" value="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"/>
-			<env key="XULRUNNER_LIBS" value="-L${XULRUNNER_SDK}/lib -lxpcomglue"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.solaris.x86"/>
-		</antcall>
-	</target>
-
-	<target name="build_gtk_solaris_sparc64" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="CC" value="cc"/>
-			<env key="CXX" value="CC"/>
-			<env key="CDE_HOME" value="/usr/dt"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/JDKs/SOLARIS/SPARC64/jdk1.5.0_22"/>
-			<env key="MODEL" value="sparc64"/>
-			<!--env key="PATH" value="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin"/-->
-			<!--env key="PKG_CONFIG_PATH" value="/usr/local/cairo-1.4.10/lib/pkgconfig/"/>
-			<env key="MOZILLA_SDK" value="/bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk"/>
-			<env key="MOZILLA_INCLUDES" value="-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"/>
-			<env key="MOZILLA_LIBS" value="${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4"/-->
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.solaris.sparc64"/>
-		</antcall>
-	</target>
-	
-	<target name="build_gtk_solaris_sparc" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_mozilla install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="CC" value="cc"/>
-			<env key="CXX" value="CC"/>
-			<env key="CDE_HOME" value="/usr/dt"/>
-			<env key="JAVA_HOME" value="/usr/j2se"/>
-			<!--env key="PATH" value="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin"/-->
-			<env key="PKG_CONFIG_PATH" value="/usr/local/cairo-1.4.10/lib/pkgconfig/"/>
-			<env key="MOZILLA_SDK" value="/bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk"/>
-			<env key="MOZILLA_INCLUDES" value="-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"/>
-			<env key="MOZILLA_LIBS" value="${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.solaris.sparc"/>
-		</antcall>
-	</target>
-	
-	<target name="build_gtk_linux_s390" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="JAVA_HOME" value="/home/swtbuild/java5/ibm-java2-s390-50"/>
-			<env key="MODEL" value="s390"/>
-			<env key="MOZILLA_SDK" value="/home/swtbuild/mozilla-1.7.13/mozilla/dist/sdk"/>
-			<env key="MOZILLA_INCLUDES" value="-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"/>
-			<env key="MOZILLA_LIBS" value="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"/>
-			<env key="XULRUNNER_SDK" value="/home/swtbuild/xulrunner-1.8.0.1/mozilla/dist/sdk"/>
-			<env key="XULRUNNER_INCLUDES" value="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"/>
-			<env key="XULRUNNER_LIBS" value="-L${XULRUNNER_SDK}/lib -lxpcomglue"/>
-			<env key="PKG_CONFIG_PATH" value="/usr/local/lib/pkgconfig"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.s390"/>
-		</antcall>
-	</target>
-	
-	<target name="build_gtk_linux_s390x" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="JAVA_HOME" value="/home/swtbuild/java5/ibm-java2-s390x-50"/>
-			<env key="MODEL" value="s390x"/>
-			<env key="MOZILLA_SDK" value="/home/swtbuild/mozilla1.7.13/mozilla/dist/sdk"/>
-			<env key="MOZILLA_INCLUDES" value="-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"/>
-			<env key="MOZILLA_LIBS" value="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"/>
-			<env key="XULRUNNER_SDK" value="/home/swtbuild/xulrunner-1.8.0.1/mozilla/dist/sdk"/>
-			<env key="XULRUNNER_INCLUDES" value="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"/>
-			<env key="XULRUNNER_LIBS" value="-L${XULRUNNER_SDK}/lib -lxpcomglue"/>
-			<env key="PKG_CONFIG_PATH" value="/usr/local/cairo64/lib/pkgconfig"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.s390x"/>
-		</antcall>
-	</target>
-
-	<target name="build_gtk_aix_ppc" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="MODEL" value="ppc"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/aixj9_r5"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.aix.ppc"/>
-		</antcall>
-	</target>
-
-	<target name="build_gtk_aix_ppc64" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="MODEL" value="ppc64"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.aix.ppc64"/>
-		</antcall>
-	</target>
-
-	<target name="build_gtk_hpux_ia64_32" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<property environment="env"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="MODEL" value="ia64_32"/>
-			<env key="JAVA_HOME" value="/opt/java1.5"/>
-			<env key="AWT_LIB_PATH" value="/opt/java1.5/jre/lib/IA64N/"/>
-			<env key="PATH" value="/opt/hp-gcc/bin:/opt/gtk2.6/bin:/opt/${env.PATH}"/>
-			<env key="PKG_CONFIG_PATH" value="/opt/gtk2.6/lib/pkgconfig"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.hpux.ia64_32"/>
-		</antcall>
-	</target>
-	
-	<target name="build_gtk_hpux_ia64" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<property environment="env"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="MODEL" value="ia64"/>
-			<env key="JAVA_HOME" value="/opt/java1.5"/>
-			<env key="AWT_HOME" value="/opt/java1.5/jre/lib/IA64W/"/>
-			<env key="PATH" value="/bluebird/teamswt/bog/gtk/hpux/bin:${env.PATH}"/>
-			<env key="PKG_CONFIG_PATH" value="/bluebird/teamswt/bog/gtk/hpux/lib/pkgconfig"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.gtk.hpux.ia64"/>
-		</antcall>
-	</target>
-				
-	<target name="build_motif_linux" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_mozilla make_xulrunner make_xpcominit make_cairo install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50"/>
-			<env key="MOTIF_HOME" value="/bluebird/teamswt/swt-builddir/motif21"/>
-			<env key="MOZILLA_SDK" value="/bluebird/teamswt/swt-builddir/mozilla/1.4/linux_gtk2/mozilla/dist/sdk"/>
-			<env key="XULRUNNER_SDK" value="/bluebird/teamswt/swt-builddir/geckoSDK/1.8.0.4/gecko-sdk"/>
-			<env key="MOZILLA_INCLUDES" value="-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"/>
-			<env key="MOZILLA_LIBS" value="${MOZILLA_SDK}/../lib/libembedstring.a -L${MOZILLA_SDK}/../bin -L${MOZILLA_SDK}/../lib/ -lxpcom -lnspr4 -lplds4 -lplc4"/>
-			<env key="XULRUNNER_INCLUDES" value="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"/>
-			<env key="XULRUNNER_LIBS" value="-L${XULRUNNER_SDK}/lib -lxpcomglue"/>
-			<env key="PKG_CONFIG_PATH" value="/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_x86/lib/pkgconfig"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.motif.linux.x86"/>
-		</antcall>
-	</target>
-	
-	<target name="build_motif_aix" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/aixj9_r5"/>
-			<env key="AWT_HOME" value="/bluebird/teamswt/swt-builddir/aixj9_r5/jre/bin"/>
-			<env key="MOTIF_HOME" value="/bluebird/teamswt/swt-builddir/motif21"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.motif.aix.ppc"/>
-		</antcall>
-	</target>
-
-	<target name="build_motif_solaris" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="make_cairo install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="PKG_CONFIG_PATH" value="/usr/local/cairo-1.4.10/lib/pkgconfig/"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.motif.solaris.sparc"/>
-		</antcall>
-	</target>
-
-	<target name="build_motif_hpux" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg value="build.sh"/>
-			<env key="JAVA_HOME" value="/opt/java1.5/"/>
-			<env key="AWT_HOME" value="/opt/java1.5/jre/lib/IA64N/"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.motif.hpux.ia64_32"/>
-		</antcall>
-	</target>
-
-	<target name="build_cocoa_x86_and_ppc" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg line="build32.sh"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-			<env key="XULRUNNER_SDK" value="/Users/Shared/xulrunner/1.8.0.1/mozilla/dist/i386/dist/sdk"/>
-			<env key="XULRUNNER_LIBS" value="$(XULRUNNER_SDK)/lib/libxpcomglue.a $(XULRUNNER_SDK)/../../../ppc/dist/sdk/lib/libxpcomglue.a"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.cocoa.macosx"/>
-		</antcall>
-	</target>
-
-	<target name="build_cocoa_x86_64" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install_x86_64"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg line="build64.sh"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-			<env key="XULRUNNER_SDK" value="/Users/Shared/xulrunner/64-bit/mozilla/dist"/>
-			<env key="XULRUNNER_LIBS" value="$(XULRUNNER_SDK)/lib/libxpcomglue.a"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.cocoa.macosx.x86_64"/>
-		</antcall>
-	</target>
-
-	<target name="build_carbon" depends="init_build">
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
-			<arg line="build.sh"/>
-			<arg line="${targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-		<antcall target="refresh_fragment">
-			<param name="fragment" value="org.eclipse.swt.carbon.macosx"/>
-		</antcall>
-	</target>
-
-	<target name="build_photon" depends="init_build">
-		<echo>Photon is not being built</echo>
-	</target>
-	
-	<target name="check_libraries" depends="get_version">
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="6"/>
-			<param name="fragment" value="org.eclipse.swt.win32.win32.x86"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="4"/>
-			<param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="4"/>
-			<param name="fragment" value="org.eclipse.swt.win32.win32.ia64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="1"/>
-			<param name="fragment" value="org.eclipse.swt.win32.wce_ppc.arm"/>
-		</antcall>
-		<!-- WPF is not being built
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="2"/>
-			<param name="fragment" value="org.eclipse.swt.wpf.win32.x86"/>
-		</antcall>
-		-->
-		<!-- Photon is not being built
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="1"/>
-			<param name="fragment" value="org.eclipse.swt.photon.qnx.x86"/>
-		</antcall>
-		-->
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="5"/>
-			<param name="fragment" value="org.eclipse.swt.carbon.macosx"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="4"/>
-			<param name="fragment" value="org.eclipse.swt.cocoa.macosx"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="4"/>
-			<param name="fragment" value="org.eclipse.swt.cocoa.macosx.x86_64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="11"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="10"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="12"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="12"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="9"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.solaris.sparc"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="8"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.solaris.x86"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="10"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.s390"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="10"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.s390x"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="5"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.aix.ppc"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="5"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.aix.ppc64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="4"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.hpux.ia64_32"/>
-		</antcall>
-		<!-- Motif is not being built
-		
-		antcall target="check_fragment_libraries">
-			<param name="library_count" value="9"/>
-			<param name="fragment" value="org.eclipse.swt.motif.linux.x86"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="4"/>
-			<param name="fragment" value="org.eclipse.swt.motif.aix.ppc"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="3"/>
-			<param name="fragment" value="org.eclipse.swt.motif.hpux.ia64_32"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="5"/>
-			<param name="fragment" value="org.eclipse.swt.motif.solaris.sparc"/>
-		</antcall-->
-	</target>
-	
-	<target name="check_fragment_libraries" depends="get_version">
-		<property name="checkdir" value="~/build/check_libraries"/>
-		<!-- WPF and Photon are not being built
-		
-		Motif not built
-		org.eclipse.swt.motif.linux.x86 org.eclipse.swt.motif.aix.ppc org.eclipse.swt.motif.hpux.ia64_32 org.eclipse.swt.motif.solaris.sparc
-		-->
-		<property name="library_count" value="124"/>
-		<property name="fragment" value="org.eclipse.swt.win32.win32.x86 org.eclipse.swt.win32.win32.x86_64 org.eclipse.swt.win32.win32.ia64 org.eclipse.swt.win32.wce_ppc.arm org.eclipse.swt.carbon.macosx org.eclipse.swt.cocoa.macosx org.eclipse.swt.cocoa.macosx.x86_64 org.eclipse.swt.gtk.linux.ppc org.eclipse.swt.gtk.linux.ppc64 org.eclipse.swt.gtk.linux.x86 org.eclipse.swt.gtk.linux.x86_64 org.eclipse.swt.gtk.linux.s390 org.eclipse.swt.gtk.linux.s390x org.eclipse.swt.gtk.aix.ppc org.eclipse.swt.gtk.aix.ppc64 org.eclipse.swt.gtk.solaris.sparc org.eclipse.swt.gtk.solaris.x86 org.eclipse.swt.gtk.hpux.ia64_32"/>
-		<sshexec host="${m_linux_x86}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			trust="true"
-			command="rm -rf ${checkdir}; mkdir ${checkdir}; cd ${checkdir}; export CVS_RSH=ssh; cvs -q -d ${cvsRoot} checkout ${TAG} ${fragment} | grep '[0-9][0-9][0-9][0-9].'; a=`find -name *${swt_version}* | grep -c ${swt_version}`; b=`find . -regex .*[0-9][0-9][0-9][0-9].* | grep -v -c ${swt_version}`; echo Found \&quot;$a\&quot; libraries with version \&quot;${swt_version}\&quot; and \&quot;$b\&quot; libraries with old versions; if [[ &quot;$a&quot; = &quot;${library_count}&quot; &amp;&amp; &quot;$b&quot; = '0' ]]; then cd; rm -rf ${checkdir}; echo Success; else cd; rm -rf ${checkdir}; echo Failed. Expecting ${library_count} and 0; exit 1; fi"/>
-	</target>	
-	
-	<target name="check_machines">
-		<parallel>
-		<sshexec host="${m_linux_x86}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_x86_output"
-			command="hostname"/>
-		<sshexec host="${m_linux_x86_64}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_x86_64_output"
-			command="hostname"/>
-		<!-- These machines are only used for 3.5.x builds. -->
-		<!--sshexec host="${m_linux_rh3_x86}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_rh3_x86_output"
-			command="hostname"/>
-		<sshexec host="${m_linux_rh3_x86_64}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_rh3_x86_64_output"
-			command="hostname"/-->
-			
-		<sshexec host="${m_linux_ppc}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_ppc_output"
-			command="hostname"/>
-		<sshexec host="${m_linux_ppc64}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_ppc64_output"
-			command="hostname"/>
-			
-		<sshexec host="${m_solaris_sparc}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_solaris_sparc_output"
-			command="hostname"/>
-		<sshexec host="${m_solaris_x86}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_solaris_x86_output"
-			command="hostname"/>
-			
-		<sshexec host="${m_aix}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_aix_output"
-			command="hostname"/>
-			
-		<sshexec host="${m_hpux}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_hpux_output"
-			command="hostname"/>
-		<sshexec host="${m_mac}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_mac_output"
-			command="hostname"/>
-		</parallel>
-		<property name="success_msg" value="Success"/>
-		<property name="fail_msg" value="*** Fail ***"/>
-		<condition property="m_linux_x86_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_linux_x86}*" string="${m_linux_x86_output}"/>
-		</condition>
-		<condition property="m_linux_x86_64_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_linux_x86_64}*" string="${m_linux_x86_64_output}"/>
-		</condition>
-		<!--condition property="m_linux_rh3_x86_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_linux_rh3_x86}*" string="${m_linux_rh3_x86_output}"/>
-		</condition>
-		<condition property="m_linux_rh3_x86_64_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_linux_rh3_x86_64}*" string="${m_linux_rh3_x86_64_output}"/>
-		</condition-->
-		
-		<condition property="m_linux_ppc_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_linux_ppc}*" string="${m_linux_ppc_output}"/>
-		</condition>
-		<condition property="m_linux_ppc64_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_linux_ppc64}*" string="${m_linux_ppc64_output}"/>
-		</condition>
-		<condition property="m_solaris_sparc_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_solaris_sparc}*" string="${m_solaris_sparc_output}"/>
-		</condition>
-		<condition property="m_solaris_x86_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_solaris_x86}*" string="${m_solaris_x86_output}"/>
-		</condition>
-		<condition property="m_aix_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_aix}*" string="${m_aix_output}"/>
-		</condition>
-		<condition property="m_hpux_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_hpux}*" string="${m_hpux_output}"/>
-		</condition>
-		<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_mac}*" string="${m_mac_output}"/>
-		</condition>
-		<echo>-------------------------</echo>
-		<echo>Status:</echo>
-		<echo></echo>
-		<echo>${m_linux_x86} - ${m_linux_x86_test}</echo>
-		<echo>${m_linux_x86_64} - ${m_linux_x86_64_test}</echo>
-		<!--echo>${m_linux_rh3_x86} ${m_linux_rh3_x86_test}</echo>
-		<echo>${m_linux_rh3_x86_64} ${m_linux_rh3_x86_64_test}</echo-->
-		<echo>${m_linux_ppc} - ${m_linux_ppc_test}</echo>
-		<echo>${m_linux_ppc64} - ${m_linux_ppc64_test}</echo>
-		<echo>${m_solaris_sparc} - ${m_solaris_sparc_test}</echo>
-		<echo>${m_solaris_x86} - ${m_solaris_x86_test}</echo>
-		<echo>${m_aix} - ${m_aix_test}</echo>
-		<echo>${m_hpux} - ${m_hpux_test}</echo>
-		<echo>${m_mac} - ${m_mac_test}</echo>
-		<echo>-------------------------</echo>
-		<condition property="m_fail">
-			<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}"/>
-		</condition>
-		<fail if="m_fail" message="Failed"/>
-	</target>
-
-	<target name="check_s390_machines">
-		<parallel>
-		<sshexec host="${m_linux_x86}" 
-			username="swtbuild" 
-			keyfile="${keyfile}"
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_s390_output"
-			command="echo test machine > ${m_linux_s390}.txt; if scp ${m_linux_s390}.txt ${m_linux_s390}:build/; then rm ${m_linux_s390}.txt; hostname; else rm ${m_linux_s390x}.txt; echo 'failed'; fi"/>
-		<sshexec host="${m_linux_x86}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_s390x_output"
-			command="echo test machine > ${m_linux_s390x}.txt; if scp ${m_linux_s390x}.txt ${m_linux_s390x}:build/; then rm ${m_linux_s390x}.txt; hostname; else rm ${m_linux_s390x}.txt; echo 'failed'; fi"/>
-		</parallel>
-		<property name="success_msg" value="Success"/>
-		<property name="fail_msg" value="*** Fail ***"/>
-		<condition property="m_linux_s390_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_linux_x86}*" string="${m_linux_s390_output}"/>
-		</condition>
-		<condition property="m_linux_s390x_test" value="${success_msg}" else="${fail_msg}">
-			<matches pattern="${m_linux_x86}*" string="${m_linux_s390x_output}"/>
-		</condition>
-		<echo>-------------------------</echo>
-		<echo>Status:</echo>
-		<echo></echo>
-		<echo>${m_linux_s390} - ${m_linux_s390_test}</echo>
-		<echo>${m_linux_s390x} - ${m_linux_s390x_test}</echo>
-		<echo>-------------------------</echo>
-		<condition property="m_fail">
-			<matches pattern="Fail" string="${m_linux_s390_test} ${m_linux_s390x_test}"/>
-		</condition>
-		<fail if="m_fail" message="Failed"/>
-	</target>
-	
-	<target name="check_compilation">
-		<property name="cvsRsh" value="plink"/>
-		<property name="tmpdir" value="${tmphome}/workspace-check-compile${TAG}"/>
-		<property name="project" value="org.eclipse.swt"/>
-		<property name="projectDir" value="${tmpdir}/org.eclipse.swt"/>
-		<property name="buildDir" value="${tmpdir}/build"/>
-		
-		<!-- check out swt project -->
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" quiet="true" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument value="${project}"/>
-			</commandline>
-		</cvs>
-
-		<!-- 64 bit -->
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_win32"/>
-			<param name="is64" value="64 bit"/>
-		</antcall>
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_gtk"/>
-			<param name="is64" value="64 bit"/>
-		</antcall>
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_cocoa"/>
-			<param name="is64" value="64 bit"/>
-		</antcall>
-		
-		<!-- 32 bit -->
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_win32"/>
-		</antcall>
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_gtk"/>
-		</antcall>
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_cocoa"/>
-		</antcall>
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_carbon"/>
-		</antcall>
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_motif"/>
-		</antcall>
-		<!-- Not building Photon
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_photon"/>
-		</antcall>
-		-->
-		<!-- Not building WPF
-		<antcall target="build_classes">
-			<param name="cp" value=".classpath_wpf"/>
-		</antcall>
-		-->
-	</target>
-	
-	<target name="replace64" if="is64">
-		<antcall target="replace.32.to.64">
-			<param name="replace_dir" value="${buildDir}"/>
-		</antcall>
-	</target>
-	
-	<target name="build_classes">
-		<echo>Building ${cp} ${is64}</echo>
-		<delete file="${tmpdir}/copy.xml"/>
-		<delete dir="${buildDir}"/>
-				
-		<xslt style="${projectDir}/tasks/classpath.xls" in="${projectDir}/${cp}" out="${tmpdir}/copy.xml">
-			<param name="srcDir" expression="${projectDir}"/>
-			<param name="outputDir" expression="${buildDir}"/>
-		</xslt>
-		<ant antfile="${tmpdir}/copy.xml" target="copy_files"/>
-		
-		<antcall target="replace64"></antcall>
-				
-		<javac srcdir="${buildDir}"></javac>
-	</target>
-
-	<!-- common build tasks -->
-	<target name="new_release">
-		<property name="tmpdir" value="${tmphome}/new_release"/>
-		<delete dir="${tmpdir}" quiet="true"/>
-		<mkdir dir="${tmpdir}"/>
-		<antcall target="new_release_imp"/>
-		<delete dir="${tmpdir}" quiet="true"/>
-	</target>
-	
-	<target name="new_release_imp" depends="get_new_release_version">
-		<property name="natives_changed" value="true"/>
-		<antcall target="increment_version_imp"/>
-	</target>
-	
-	<target name="increment_version">
-		<property name="tmpdir" value="${tmphome}/inc${TAG}"/>
-		<delete dir="${tmpdir}" quiet="true"/>
-		<mkdir dir="${tmpdir}"/>
-		<antcall target="increment_version_imp"/>
-		<delete dir="${tmpdir}" quiet="true"/>
-	</target>
-	
-	<target name="increment_version_imp" depends="check_natives_changed, get_version" if="natives_changed">
-		<property name="cvsRsh" value="plink"/>
-		<property name="library_j2se" value="org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java"/>
-		<property name="library_j2me" value="org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java"/>
-		<property name="make_common" value="org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/>
-		<property name="version_file" value="org.eclipse.swt/Eclipse SWT/common/version.txt"/>
-		
-		<!-- Download the files -->
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument value="${library_j2se}"/>
-				<argument value="${library_j2me}"/>
-				<!--argument value="${make_common}"/-->  <!-- downloaded by get_version, cvs doesn't allow double download in different sets -->
-				<argument value="${version_file}"/>
-			</commandline>
-		</cvs>
-
-		<!-- Update the files -->
-		<replace file="${tmpdir}/${library_j2se}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/>
-		<replace file="${tmpdir}/${library_j2me}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/>
-		<replace file="${tmpdir}/${library_j2se}" token="MINOR_VERSION = ${min_ver}" value="MINOR_VERSION = ${new_min_ver}"/>
-		<replace file="${tmpdir}/${library_j2me}" token="MINOR_VERSION = ${min_ver}" value="MINOR_VERSION = ${new_min_ver}"/>
-		<replace file="${tmpdir}/${version_file}" token="version ${maj_ver}.${min_ver}" value="version ${new_maj_ver}.${new_min_ver}"/>
-		<replace file="${tmpdir}/${make_common}" token="min_ver=${min_ver}" value="min_ver=${new_min_ver}"/>
-		<replace file="${tmpdir}/${make_common}" token="maj_ver=${maj_ver}" value="maj_ver=${new_maj_ver}"/>
-		<replace file="${tmpdir}/${make_common}" token="comma_ver=${comma_ver}" value="comma_ver=${new_comma_ver}"/>
-
-		<!-- Commit the files -->
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="commit"/>
-				<argument value="-m"/>
-				<argument line="'Update current version from v${swt_version} to v${new_version}'"/>
-				<argument value="${library_j2se}"/>
-				<argument value="${library_j2me}"/>
-				<argument value="${make_common}"/>
-				<argument value="${version_file}"/>
-			</commandline>
-		</cvs>
-	
-		<!-- See bug 201700 -->
-		<!--antcall target="update_manifest"/-->
-	</target>
-
-    <target name="update_manifest" depends="get_version">
-    	<property name="manifests" value="org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF org.eclipse.swt.gtk.solaris.sparc/META-INF/MANIFEST.MF org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF org.eclipse.swt.motif.aix.ppc/META-INF/MANIFEST.MF org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF org.eclipse.swt.motif.linux.x86/META-INF/MANIFEST.MF org.eclipse.swt.motif.solaris.sparc/META-INF/MANIFEST.MF org.eclipse.swt.photon.qnx.x86/META-INF/MANIFEST.MF org.eclipse.swt.win32.wce_ppc.arm/META-INF/MANIFEST.MF org.eclipse.swt.win32.win32.ia64/META-INF/MANIFEST.MF org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF org.eclipse.swt.wpf.win32.x86/META-INF/MANIFEST.MF"/>
-    	<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument line="${manifests}"/>
-			</commandline>
-		</cvs>
-    	
-    	<replace dir="${tmpdir}" token="${swt_version}" value="${new_version}">
-    		<include name="**/MANIFEST.MF"/> 	
-    	</replace>
-    	
-		<!--cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="commit"/>
-				<argument value="-m"/>
-				<argument value="'new version v${swt_new_tag}'"/>
-				<argument line="${manifests}"/>
-			</commandline>
-		</cvs-->
-    </target>
-
-	<!-- Set swt_tag to the current tag in the swt map file -->
-	<target name="get_tag" unless="swt_tag">
-		<property name="tmpdir" value="."/>
-		<property name="cvsRsh" value="plink"/>
-		<property name="map" value="org.eclipse.releng/maps/swt.map"/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument value="${map}"/>
-			</commandline>
-		</cvs>
-		<loadfile property="swt_tag" srcfile="${tmpdir}/${map}">
-			<filterchain>
-				<tokenfilter delimoutput="">
-					<containsstring contains="plugin@org.eclipse.swt="/>
-					<replaceregex pattern=".*(v\d\d\d\d[a-z]?).*" replace="\1"/>
-				</tokenfilter>
-			</filterchain>
-		</loadfile>
-		<echo>Current tag=${swt_tag}.</echo>
-	</target>
-	
-	<!-- Set swt_new_tag  -->
-	<target name="get_new_tag" unless="swt_new_tag" depends="get_version">
-		<property name="tmpdir" value="."/>
-		<property name="rlog_file" value="org.eclipse.swt/.project"/>
-		<property name="tags_file" value="${tmpdir}/tags.txt"/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" output="${tags_file}">
-			<commandline>
-				<argument value="rlog"/>
-				<argument value="${rlog_file}"/>
-			</commandline>
-		</cvs>
-		<loadfile property="tags" srcfile="${tags_file}"/>
-		<script language="javascript">
-			<![CDATA[
-				tags = project.getProperty("tags");
-				swt_version = project.getProperty("swt_version");
-				if (!tags.match(swt_version)) {
-					project.setProperty("swt_new_tag", swt_version);
-				} else {
-					for (i=97; i<123; i++) {
-						t = swt_version + String.fromCharCode(i);
-						if (!tags.match(t)) {
-							project.setProperty("swt_new_tag", t);
-							break;
-						}
-					}
-				}
-	   	 	]]>
-		</script>
-		<fail message="Unable to determine new tag">
-			<condition>
-				<not>
-					<isset property="swt_new_tag"/>
-				</not>
-			</condition>
-		</fail>
-		<echo>New tag=${swt_new_tag}.</echo>
-	</target>
-
-	<!-- Set swt_version, new_version, (and min_ver, maj_ver, new_min_ver, new_maj_ver) from the make_common.mak  -->
-	<target name="get_version" unless="swt_version">
-		<property name="tmpdir" value="."/>
-		<property name="cvsRsh" value="plink"/>
-		<property name="make_common" value="org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument value="${make_common}"/>
-			</commandline>
-		</cvs>
-		
-		<loadproperties srcFile="${tmpdir}/${make_common}"/>
-		<copy file="${tmpdir}/${make_common}" tofile="${tmpdir}/tmp.txt" overwrite="true"/>
-		<propertyfile file="${tmpdir}/tmp.txt">
-			<entry key="new_min_ver" default="${min_ver}" type="int" operation="+"/>
-			<entry key="new_maj_ver" default="${maj_ver}" type="int" operation="="/>
-		</propertyfile>
-		<loadproperties srcFile="${tmpdir}/tmp.txt"/>
-		<property name="swt_version" value="${maj_ver}${min_ver}"/>
-		<property name="new_version" value="${maj_ver}${new_min_ver}"/>
-		<replace file="${tmpdir}/tmp.txt" token="comma_ver=${comma_ver}" value="new_comma_ver=${new_version}"/>
-		<replaceregexp file="${tmpdir}/tmp.txt" match="new_comma_ver=(\d)(\d)(\d)(\d)" replace="new_comma_ver=\1,\2,\3,\4" byline="true"/>
-		<loadproperties srcFile="${tmpdir}/tmp.txt"/>
-		<delete file="${tmpdir}/tmp.txt"/>
-		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
-	</target>
-
-	<target name="get_new_release_version" unless="min_ver">
-		<property name="tmpdir" value="."/>
-		<property name="cvsRsh" value="plink"/>
-		<property name="make_common" value="org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument value="${make_common}"/>
-			</commandline>
-		</cvs>
-		
-		<loadproperties srcFile="${tmpdir}/${make_common}"/>
-		<script language="javascript">
-			<![CDATA[
-				min_ver = project.getProperty("min_ver");
-				maj_ver = project.getProperty("maj_ver");
-				new_min_ver = ((parseInt(min_ver) / 100) + 1) * 100;
-				new_maj_ver = maj_ver;
-				if (new_min_ver >= 1000) {
-					new_min_ver = "000";
-					new_maj_ver = parseInt(new_maj_ver) + 1;
-				}
-				project.setProperty("new_min_ver", new_min_ver);
-				project.setProperty("new_maj_ver", new_maj_ver);
-	   	 	]]>
-		</script>
-		<property name="swt_version" value="${maj_ver}${min_ver}"/>
-		<property name="new_version" value="${new_maj_ver}${new_min_ver}"/>
-		<copy file="${tmpdir}/${make_common}" tofile="${tmpdir}/tmp.txt" overwrite="true"/>
-		<replace file="${tmpdir}/tmp.txt" token="comma_ver=${comma_ver}" value="new_comma_ver=${new_version}"/>
-		<replaceregexp file="${tmpdir}/tmp.txt" match="new_comma_ver=(\d)(\d)(\d)(\d)" replace="new_comma_ver=\1,\2,\3,\4" byline="true"/>
-		<loadproperties srcFile="${tmpdir}/tmp.txt"/>
-		<delete file="${tmpdir}/tmp.txt"/>
-		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
-	</target>
-	
-	<!-- Set natives_changed if there are changes in the C code -->
-	<target name="check_natives_changed" unless="natives_changed" depends="get_tag">
-		<property name="tmpdir" value="."/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument line="${cp_win32}"/>
-				<!--argument line="${cp_wpf}"/-->
-				<argument line="${cp_gtk}"/>
-				<!--argument line="${cp_motif}"/-->
-				<argument line="${cp_carbon}"/>
-				<argument line="${cp_cocoa}"/>
-				<!--argument line="${cp_photon}"/-->
-			</commandline>
-		</cvs>
-	
-		<!-- Verify for changes in the native code -->
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" dest="${tmpdir}" output="${tmpdir}/diff.txt">
-			<commandline>
-				<argument value="diff"/>
-				<argument value="-u"/>
-				<argument value="-r"/>
-				<argument value="${swt_tag}"/>
-				<argument value="org.eclipse.swt"/>
-			</commandline>
-		</cvs>
-		<condition property="natives_changed">
-			<length file="${tmpdir}/diff.txt" when="greater" length="0"/>
-		</condition>
-		<echo>Natives changed: ${natives_changed} since ${swt_tag}</echo>
-	</target>
-
-	<target name="new_version" if="is_new_version">
-		<echo>Removing ${removed_files}</echo>
-		<cvs dest="${fragment}" command="remove -f ${removed_files}" cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true"/>
-		<echo>Commiting ${removed_files}</echo>
-		<cvs dest="${fragment}" command="commit -m 'remove old libs v${swt_version}' ${removed_files}" cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true"/>
-		<echo>Adding ${added_files}</echo>
-		<cvs dest="${fragment}" command="add -kb ${added_files}" cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true"/>
-	</target>
-
-	<!-- Params: cvsRsh, tmpdir, and swt_new_tag -->
-	<target name="update_buildnotes" depends="get_tag, get_new_tag">
-		<property name="MILESTONE" value=""/>
-		<tstamp>
-			<format property="header.time" pattern="EEEE MMMMM dd, yyyy" offset="1" unit="day"/>
-		</tstamp>
-		<tstamp>
-			<format property="url.to.time" pattern="yyyy-MM-dd'+'HH'%3A'mm'%3A'ss'+%2B0000'" timezone="gmt"/>
-		</tstamp>
-		<property name="build_notes" value="org.eclipse.swt/buildnotes_swt.html"/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" output="${tmpdir}/rlog.txt">
-			<commandline>
-				<argument value="rlog"/>
-				<argument value="-r${swt_tag}"/>
-				<argument value="${build_notes}"/>
-			</commandline>
-		</cvs>
-		<loadfile property="url.from.time" srcfile="${tmpdir}/rlog.txt">
-			<filterchain>
-				<tokenfilter delimoutput="">
-					<containsstring contains="date"/>
-					<containsstring contains="author"/>
-					<replaceregex pattern="(date: )([\d-+:\s]*)(.*)" replace="\2"/>
-					<replaceregex pattern="\+" replace="%2B" flags="g"/>
-					<replaceregex pattern=":" replace="%3A" flags="g"/>
-					<replaceregex pattern="\s" replace="+" flags="g"/>
-				</tokenfilter>
-			</filterchain>
-		</loadfile>
-		<echo> Searching bugs from "${url.from.time}" to "${url.to.time}"</echo>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument value="${build_notes}"/>
-			</commandline>
-		</cvs>
-		<property name="match_line" value="SWT&lt;/h1&gt;"/>
-		<property name="delimiter" value="&#13;&#10;"/>
-		<property name="url" value="https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=${MILESTONE};chfieldfrom=${url.from.time};chfieldto=${url.to.time};chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on="/>
-		<property name="body" value="${delimiter}${delimiter}&lt;h2&gt;SWT Build ${swt_new_tag} - ${header.time}&lt;/h2&gt;${delimiter}${delimiter}&lt;blockquote&gt;${delimiter}&lt;a href=${url}&gt;Bugs fixed&lt;/a&gt;${delimiter}&lt;/blockquote&gt;"/>
-		<replace file="${tmpdir}/${build_notes}" token="${match_line}" value="${match_line}${body}"/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="commit"/>
-				<argument value="-m"/>
-				<argument value="'new version v${swt_new_tag}'"/>
-				<argument value="${build_notes}"/>
-			</commandline>
-		</cvs>
-	</target>
-
-	<!-- Params: fragment, swt_version -->
-	<target name="commit_fragment" depends="get_version" if="natives_changed">
-		<fileset id="removeid" dir="${fragment}">
-			<filename regex="[0-9][0-9][0-9][0-9]."/>
-			<filename regex="${swt_version}." negate="true"/>
-		</fileset>
-		
-		<copy todir="${fragment}" overwrite="false">
-			<fileset refid="removeid"/>
-			<regexpmapper from="(.*)[0-9][0-9][0-9][0-9](.*)" to="\1${swt_version}\2"/>
-		</copy>
-		
-		<property name="rfiles" refid="removeid"/>
-		<echo file="tmp">removed_files=${rfiles}</echo>
-		<replace file="tmp" token=";" value=" "/>
-		<loadproperties srcfile="tmp"/>
-		<delete file="tmp"/>
-
-		<fileset id= "addid" dir="${fragment}" includes="*${swt_version}*"/>
-		<property name="afiles" refid="addid"/>
-		<echo file="tmp">added_files=${afiles}</echo>
-		<replace file="tmp" token=";" value=" "/>
-		<loadproperties srcfile="tmp"/>
-		<delete file="tmp"/>
-
-		<chmod perm="755">
-			<fileset dir="${fragment}" includes="*${swt_version}*"/>
-		</chmod>
-
-		<condition property="is_new_version">
-			<not>
-				<equals arg1="" arg2="${removed_files}"/>
-			</not>
-		</condition>
-		<antcall target="new_version"/>
-
-		<echo>"Commiting ${added_files}</echo>
-		<cvs dest="${fragment}" command="commit -m 'v${swt_version}' ${added_files}" cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true"/>
-	</target>
-
-	<!-- depends on 'get_new_tag' to define swt_new_tag, swt_version, maj_ver and min_ver -->
-	<target name="tag_projects">
-		<property name="tmpdir" value="${tmphome}/tag${TAG}"/>
-		<delete dir="${tmpdir}" quiet="true"/>
-		<mkdir dir="${tmpdir}"/>
-		<antcall target="tag_projects_imp"/>
-		<delete dir="${tmpdir}" quiet="true"/>
-	</target>
-	
-	<target name="tag_projects_imp" depends="get_new_tag">
-		<property name="cvsRsh" value="plink"/>
-
-		<!-- These two lines perform the same check. check_libraries is slower because it checks each fragment separetely  -->
-		<!--antcall target="check_libraries"/-->
-		<antcall target="check_fragment_libraries"/>
-
-		<!-- update and commit the buildnotes_swt.html file -->
-		<antcall target="update_buildnotes"/>
-
-		<!-- download the map file -->
-		<property name="map" value="org.eclipse.releng/maps/swt.map"/>
-		<property name="map_copy" value="${tmpdir}/swt_map.txt"/>
-		<property name="map_xml" value="${tmpdir}/swt_map.xml"/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument value="${map}"/>
-			</commandline>
-		</cvs>
-		<copy file="${tmpdir}/${map}" tofile="${map_copy}"/>
-
-		<!-- tag all files -->
-		<replace file="${map_copy}" token="=" value="&quot; old=&quot;"/>
-		<replace file="${map_copy}" token="fragment@" value="&lt;element project=&quot;"/>
-		<replace file="${map_copy}" token="plugin@" value="&lt;element project=&quot;"/>
-		<replace file="${map_copy}" token=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse," value="&quot;/&gt;"/>
-		<replaceregexp file="${map_copy}" match="!(.*)" replace="" byline="true"/>
-		<loadfile property="body" srcfile="${map_copy}"/>
-		<echo file="${map_xml}">&lt;project&gt;</echo>
-		<echo file="${map_xml}" append="true">${body}</echo>
-		<echo file="${map_xml}" append="true">&lt;/project&gt;</echo>
-		<xslt style="${tasks}/swtmap.xls" in="${map_xml}" out="${tmpdir}/tagCommand.xml">
-			<param name="TAG" expression="${TAG}"/>
-			<param name="cvsRoot" expression="${cvsRoot}"/>
-			<param name="cvsRsh" expression="${cvsRsh}"/>
-			<param name="swt_new_tag" expression="v${swt_new_tag}"/>
-		</xslt>
-		<ant antfile="${tmpdir}/tagCommand.xml" target="tag_files"/>
-
-		<!-- update and commit map file -->
-		<replaceregexp file="${tmpdir}/${map}" match="=v\d\d\d\d[a-z]?" replace="=v${swt_new_tag}" byline="true"/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="commit"/>
-				<argument value="-m"/>
-				<argument value="'new version v${swt_new_tag}'"/>
-				<argument value="${map}"/>
-			</commandline>
-		</cvs>
-	</target>
-
-	<!-- Params: build_target -->
-	<target name="build_natives" if="natives_changed">
-		<copy todir="${builddir}" flatten="true">
-			<fileset dir="org.eclipse.swt" includes="**/library/"/>
-		</copy>
-		<condition property="real_target" value="build_s390" else="${build_target}">
-			<or>
-				<equals arg1="${build_target}" arg2="build_gtk_linux_s390"/>
-				<equals arg1="${build_target}" arg2="build_gtk_linux_s390x"/>
-			</or>
-		</condition>
-		<antcall target="${real_target}"/>
-	</target>
-
-	<!-- Params: cp, fragment, build_target -->
-	<target name="build_fragment" depends="get_tag">
-		<!-- check out classpath, fragments, and natives -->
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument line="${cp}"/>
-				<argument value="${fragment}"/>
-			</commandline>
-		</cvs>
-		
-		<tstamp>
-			<format property="last_build.time" pattern="yyyy-MM-dd hh:mm aa" offset="-1" unit="day"/>
-		</tstamp>
-		<!-- during maintenance builds (TAG is set) there is no nightly, so don't ever use timestamps (which are no good for branch)-->
-		<condition property="diff_tag" value="-r${swt_tag}" else="-D'${last_build.time}'">
-			<length string="${TAG}" trim="true" when="greater" length="0"/>
-		</condition>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" output="diff.txt">
-			<commandline>
-				<argument value="diff"/>
-				<argument line="${diff_tag}"/>
-				<argument value="-u"/>
-				<argument value="org.eclipse.swt"/>
-			</commandline>
-		</cvs>
-		<condition property="natives_changed">
-			<length file="diff.txt" when="greater" length="0"/>
-		</condition>
-		<echo>Has native changes: ${natives_changed}, compared against ${diff_tag}</echo>
-
-		<!-- build natives -->
-		<antcall target="build_natives"/>
-
-		<!-- commint libraries -->
-		<antcall target="commit_fragment"/>
-	</target>
-
-	<!-- Params: cp, fragment, build_target -->
-	<target name="build_local">
-		<property name="cvsRsh" value="plink"/>
-		<property name="tmpdir" value="${tmphome}/${fragment}${TAG}"/>
-		<property name="build_version" value=""/>
-		<delete dir="${tmpdir}" quiet="true"/>
-		<mkdir dir="${tmpdir}"/>
-		<cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}">
-			<commandline>
-				<argument value="checkout"/>
-				<argument line="${TAG}"/>
-				<argument value="${tasks}"/>
-			</commandline>
-		</cvs>
-		<ant antfile="${tasks}/build.xml" output="${logdir}/${build_version}/${fragment}.log" dir="${tmpdir}" target="build_fragment">
-			<property name="cp" value="${cp}"/>
-			<property name="fragment" value="${fragment}"/>
-			<property name="build_target" value="${build_target}"/>
-		</ant>
-		<delete dir="${tmpdir}"/>
-	</target>
-
-	<target name="set_natives_changed" if="natives_changed">
-		<property name="extra_properties" value="-Dnatives_changed=${natives_changed}"/>
-	</target>
-	
-	<target name="build_s390">
-		<property name="zipname" value="${fragment}${TAG}"/>		
-		<property name="remotetmpdir" value="~/build/${zipname}"/>
-		<condition property="remotemachine" value="${m_linux_s390}" else="${m_linux_s390x}">
-			<or>
-				<equals arg1="${build_target}" arg2="build_gtk_linux_s390"/>
-			</or>
-		</condition>
-		<zip destfile="../${zipname}.zip" basedir=".." includes="${zipname}/**/*"/>
-		<exec executable="scp">
-		    <arg value="../${zipname}.zip"/>
-		    <arg value="swtbuild@${remotemachine}:~/build"/>
-		</exec>
-		<sshexec host="${remotemachine}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			trust="true"
- 			command="echo $PATH; cd ~/build; rm -rf ${remotetmpdir}; unzip -qq ~/build/${zipname}.zip; rm ~/build/${zipname}.zip; cd ${remotetmpdir}/${tasks}; if ant -f build.xml ${build_target}; then cd ~/build; zip -q -r ${zipname}.zip ${zipname}; rm -rf ${remotetmpdir}; else cd; rm -rf ${remotetmpdir}; exit 1; fi"/>
-		<exec executable="scp">
-		    <arg value="swtbuild@${remotemachine}:~/build/${zipname}.zip"/>
-		    <arg value=".."/>
-		</exec>
-		<unzip src="../${zipname}.zip" dest=".."/>
-	</target>
-
-	<!-- Params: machine, pre_commands, cp, fragment, build_target -->
-	<target name="build_ssh" depends="set_natives_changed">
-		<property name="tmpdir" value="~/build/${fragment}${TAG}"/>
-		<property name="pre_commands" value=""/>
-		<property name="pre_commands1" value=""/>
-		<property name="build_version" value=""/>
-		<property name="extra_properties" value=""/>
-		<property name="properties" value="-Dcp=&quot;${cp}&quot; -Dfragment=${fragment} -DcvsRsh=ssh -Dbuild_target=${build_target} -DTAG=${TAG} ${extra_properties}"/>
-		<sshexec host="${machine}" 
-			username="swtbuild" 
-			keyfile="${keyfile}" 
-			trust="true"
-			output="${logdir}/${build_version}/${fragment}.log"
-	 		command="${pre_commands} rm -rf ${tmpdir}; mkdir ${tmpdir}; cd ${tmpdir}; export CVS_RSH=ssh; cvs -d ${cvsRoot} checkout ${TAG} ${tasks}; ${pre_commands1} if ant -f ${tasks}/build.xml build_fragment ${properties}; then cd; rm -rf ${tmpdir}; else cd; rm -rf ${tmpdir}; exit 1; fi"/>
-	</target>
-
-	<!-- Convert SWT 32 bit java and C source to 64 bit  -->
-	<target name="replace.32.to.64" depends="init_build">
-		<property name="replace_dir" value="org.eclipse.swt"/>
-		<echo>Converting java files to 64 bit in ${replace_dir} project</echo>
-		<replace dir="${replace_dir}" includes="**/*.java" token="int /*long*/" value="long /*int*/"/>
-		<replace dir="${replace_dir}" includes="**/*.java" token="int[] /*long[]*/" value="long[] /*int[]*/"/>
-		<replace dir="${replace_dir}" includes="**/*.java" token="float /*double*/" value="double /*float*/"/>
-		<replace dir="${replace_dir}" includes="**/*.java" token="float[] /*double[]*/" value="double[] /*float[]*/"/>
-		<antcall target="init_build"/>
-	</target>
-
-	<!-- Convert SWT 64 bit java and C source to 32 bit  -->
-	<target name="replace.64.to.32" depends="init_build">
-		<property name="replace_dir" value="org.eclipse.swt"/>
-		<echo>Converting java files to 32 bit in ${replace_dir} project</echo>
-		<replace dir="${replace_dir}" includes="**/*.java" token="long /*int*/" value="int /*long*/"/>
-		<replace dir="${replace_dir}" includes="**/*.java" token="long[] /*int[]*/" value="int[] /*long[]*/"/>
-		<replace dir="${replace_dir}" includes="**/*.java" token="double /*float*/" value="float /*double*/"/>
-		<replace dir="${replace_dir}" includes="**/*.java" token="double[] /*float[]*/" value="float[] /*double[]*/"/>
-		<antcall target="init_build"/>
-	</target>
-
-	<!-- all platforms -->
-	<target name="win32_x86">
-		<antcall target="build_local">
-			<param name="cp" value="${cp_win32}"/>
-			<param name="fragment" value="org.eclipse.swt.win32.win32.x86"/>
-			<param name="build_target" value="build_win32_x86"/>
-		</antcall>
-	</target>
-
-	<target name="win32_x86_64">
-		<antcall target="build_local">
-			<param name="cp" value="${cp_win32}"/>
-			<param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/>
-			<param name="build_target" value="build_win32_x86_64"/>
-		</antcall>
-	</target>
-
-	<target name="win32_ia64">
-		<antcall target="build_local">
-			<param name="cp" value="${cp_win32}"/>
-			<param name="fragment" value="org.eclipse.swt.win32.win32.ia64"/>
-			<param name="build_target" value="build_win32_ia64"/>
-		</antcall>
-	</target>
-
-	<target name="wince">
-		<antcall target="build_local">
-			<param name="cp" value="${cp_win32}"/>
-			<param name="fragment" value="org.eclipse.swt.win32.wce_ppc.arm"/>
-			<param name="build_target" value="build_wince"/>
-		</antcall>
-	</target>
-
-	<target name="wpf_x86">
-		<antcall target="build_local">
-			<param name="cp" value="${cp_wpf}"/>
-			<param name="fragment" value="org.eclipse.swt.wpf.win32.x86"/>
-			<param name="build_target" value="build_wpf_x86"/>
-		</antcall>
-	</target>
-	
-	<target name="gtk_linux_x86">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_linux_x86}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86"/>
-			<param name="build_target" value="build_gtk_linux_x86"/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/x32/jdk1.6.0_14; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-		
-	<target name="gtk_linux_x86_64">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_linux_x86_64}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>
-			<param name="build_target" value="build_gtk_linux_x86_64"/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/x64/jdk1.6.0_14; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="gtk_linux_ppc">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_linux_ppc}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc"/>
-			<param name="build_target" value="build_gtk_linux_ppc"/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/PPC/ibm-java-ppc-60/; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-	
-	<target name="gtk_linux_ppc64">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_linux_ppc64}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64"/>
-			<param name="build_target" value="build_gtk_linux_ppc64"/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/PPC/ibm-java-ppc-60/; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-	
-	<target name="gtk_linux_s390">
-		<property name="thefragment" value="org.eclipse.swt.gtk.linux.s390"/>
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_linux_x86}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="${thefragment}"/>
-			<param name="build_target" value="build_gtk_linux_s390"/>
-			<param name="pre_commands1" value="cp ~/build/fixed_tasks/* ~/build/${thefragment}${TAG}/${tasks}; "/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/x32/jdk1.6.0_14; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="gtk_linux_s390x">
-		<property name="thefragment" value="org.eclipse.swt.gtk.linux.s390x"/>
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_linux_x86}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="${thefragment}"/>
-			<param name="build_target" value="build_gtk_linux_s390x"/>
-			<param name="pre_commands1" value="cp ~/build/fixed_tasks/* ~/build/${thefragment}${TAG}/${tasks}; "/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/x32/jdk1.6.0_14; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="gtk_aix_ppc">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_aix}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.aix.ppc"/>
-			<param name="build_target" value="build_gtk_aix_ppc"/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/AIX/sdk; export PATH=${ant_home}/bin:~/build/cvs_bin/AIX:$PATH;"/>
-		</antcall>
-	</target>
-
-	<target name="gtk_aix_ppc64">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_aix}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.aix.ppc64"/>
-			<param name="build_target" value="build_gtk_aix_ppc64"/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/AIX/sdk; export PATH=${ant_home}/bin:~/build/cvs_bin/AIX:$PATH;"/>
-		</antcall>
-	</target>
-	
-	<target name="gtk_hpux_ia64_32">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_hpux}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.hpux.ia64_32"/>
-			<param name="build_target" value="build_gtk_hpux_ia64_32"/>
-			<param name="pre_commands" value="export JAVA_HOME=/opt/java1.5; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="gtk_solaris_x86">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_solaris_x86}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.solaris.x86"/>
-			<param name="build_target" value="build_gtk_solaris_x86"/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/Solaris_x86/jdk1.6.0_14/; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="gtk_solaris_sparc">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_solaris_sparc}"/>
-			<param name="cp" value="${cp_gtk}"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.solaris.sparc"/>
-			<param name="build_target" value="build_gtk_solaris_sparc"/>
-			<param name="pre_commands" value="export JAVA_HOME=/usr/j2se; export PATH=/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/local/bin:${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="motif_linux">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_linux_x86}"/>
-			<param name="cp" value="${cp_motif}"/>
-			<param name="fragment" value="org.eclipse.swt.motif.linux.x86"/>
-			<param name="build_target" value="build_motif_linux"/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/x32/jdk1.6.0_14; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="motif_aix">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_aix}"/>
-			<param name="cp" value="${cp_motif}"/>
-			<param name="fragment" value="org.eclipse.swt.motif.aix.ppc"/>
-			<param name="build_target" value="build_motif_aix"/>
-			<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/AIX/sdk; export PATH=${ant_home}/bin:~/build/cvs_bin/AIX:$PATH;"/>
-		</antcall>
-	</target>
-
-	<target name="motif_solaris">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_solaris_sparc}"/>
-			<param name="cp" value="${cp_motif}"/>
-			<param name="fragment" value="org.eclipse.swt.motif.solaris.sparc"/>
-			<param name="build_target" value="build_motif_solaris"/>
-			<param name="pre_commands" value="export JAVA_HOME=/usr/j2se; export PATH=/export/home/SUNWspro/bin:/usr/ccs/bin:${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="motif_hpux">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_hpux}"/>
-			<param name="cp" value="${cp_motif}"/>
-			<param name="fragment" value="org.eclipse.swt.motif.hpux.ia64_32"/>
-			<param name="build_target" value="build_motif_hpux"/>
-			<param name="pre_commands" value="export JAVA_HOME=/opt/java1.5; export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="cocoa_x86_and_ppc">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_mac}"/>
-			<param name="cp" value="${cp_cocoa}"/>
-			<param name="fragment" value="org.eclipse.swt.cocoa.macosx"/>
-			<param name="build_target" value="build_cocoa_x86_and_ppc"/>
-			<param name="pre_commands" value="export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="cocoa_x86_64">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_mac}"/>
-			<param name="cp" value="${cp_cocoa}"/>
-			<param name="fragment" value="org.eclipse.swt.cocoa.macosx.x86_64"/>
-			<param name="build_target" value="build_cocoa_x86_64"/>
-			<param name="pre_commands" value="export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="carbon">
-		<antcall target="build_ssh">
-			<param name="machine" value="${m_mac}"/>
-			<param name="cp" value="${cp_carbon}"/>
-			<param name="fragment" value="org.eclipse.swt.carbon.macosx"/>
-			<param name="build_target" value="build_carbon"/>
-			<param name="pre_commands" value="export PATH=${ant_home}/bin:$PATH; "/>
-		</antcall>
-	</target>
-
-	<target name="photon">
-		<antcall target="build_local">
-			<param name="cp" value="${cp_photon}"/>
-			<param name="fragment" value="org.eclipse.swt.photon.qnx.x86"/>
-			<param name="build_target" value="build_photon"/>
-		</antcall>
-	</target>
-
-	<target name="build_all">
-		<tstamp>
-			<format property="build_version" pattern="yyyyMMddkkmmss"/>
-		</tstamp>
-		<mkdir dir="${logdir}/${build_version}"/>
-		<antcall target="carbon"/>
-		<antcall target="cocoa_x86_64"/>
-		<antcall target="cocoa_x86_and_ppc"/>
-		<antcall target="gtk_linux_ppc"/>
-		<antcall target="gtk_linux_ppc64"/>
-		<antcall target="gtk_linux_s390"/>
-		<antcall target="gtk_linux_s390x"/>
-		<antcall target="gtk_linux_x86"/>
-		<antcall target="gtk_linux_x86_64"/>
-		<antcall target="gtk_aix_ppc"/>
-		<antcall target="gtk_aix_ppc64"/>
-		<antcall target="gtk_solaris_x86"/>
-		<antcall target="gtk_solaris_sparc"/>
-		<antcall target="gtk_hpux_ia64_32"/>
-		<!--antcall target="motif_aix"/>
-		<antcall target="motif_hpux"/>
-		<antcall target="motif_linux"/>
-		<antcall target="motif_solaris"/-->
-		<antcall target="win32_ia64"/>
-		<antcall target="win32_x86"/>
-		<antcall target="win32_x86_64"/>
-		<antcall target="wince"/>
-	</target>
-
-</project>
diff --git a/bundles/org.eclipse.swt/tasks/properties.xml b/bundles/org.eclipse.swt/tasks/properties.xml
deleted file mode 100644
index d0c74de7dc..0000000000
--- a/bundles/org.eclipse.swt/tasks/properties.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-    Copyright (c) 2009, 2010 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
- -->
-<project name="org.eclipse.swt.build.properties" basedir=".">
-	<!-- Machine names -->
-	<property name="m_linux_x86" value="na"/>
-	<property name="m_linux_rh3_x86" value="na"/>
-	<property name="m_linux_x86_64"  value="na"/>
-	<property name="m_linux_rh3_x86_64"  value="na"/>
-	<property name="m_linux_ppc"  value="na"/>
-	<property name="m_linux_ppc64"  value="na"/>
-	<property name="m_linux_s390"  value="na"/>
-	<property name="m_linux_s390x"  value="na"/>
-	<property name="m_solaris_sparc"  value="na"/>
-	<property name="m_solaris_x86"  value="na"/>
-	<property name="m_aix"  value="na"/>
-	<property name="m_hpux"  value="na"/>
-	<property name="m_mac"  value="na"/>
-		
-	<property name="keyfile"  value="na"/>
-</project>
\ No newline at end of file