### Eclipse Workspace Patch 1.0
#P eclipse-build
Index: generatebuild.xml
===================================================================
--- generatebuild.xml (revision 23733)
+++ generatebuild.xml (working copy)
@@ -5,7 +5,7 @@
+
@@ -264,7 +265,10 @@
-
+
+
+
+
@@ -350,6 +354,7 @@
@@ -404,9 +409,9 @@
-
-
-
+
+
+
@@ -418,16 +423,16 @@
-
+
-
+
-
+
@@ -435,13 +440,13 @@
-
-
+
+
-
+
@@ -544,7 +549,7 @@
-
+
@@ -570,6 +575,7 @@
+
@@ -587,7 +593,7 @@
-
+
@@ -647,6 +653,8 @@
+
+
@@ -772,7 +780,7 @@
-
+
Index: pdebuild.xml
===================================================================
--- pdebuild.xml (revision 23733)
+++ pdebuild.xml (working copy)
@@ -78,7 +78,7 @@
-
+
@@ -164,12 +164,14 @@
+
+
@@ -195,6 +197,7 @@
+
Index: publishProduct.xml
===================================================================
--- publishProduct.xml (revision 23733)
+++ publishProduct.xml (working copy)
@@ -2,7 +2,7 @@
-
+
Index: runtests.sh
===================================================================
--- runtests.sh (revision 23733)
+++ runtests.sh (working copy)
@@ -14,6 +14,8 @@
-g Don't run the tests headless
-d Allow remote connection to test runs' JVM
-t Timestamp string with which to tag the results
+ -a Architecture to run the tests on
+ -o OS to run the tests on
_EOF_
}
@@ -72,6 +74,7 @@
# Defaults
debugTests=0
headless=1
+ buildOs=linux
testFramework=org.eclipse.test_3.2.0
if [ -z ${timestamp} ]; then
timestamp=$(date "+%Y%m%d%H%M%S")
@@ -116,21 +119,16 @@
if [ ${headless} == 1 ]; then
# Try to find Xvnc
xvnc=
- if [ -a /usr/bin/Xvnc ]
- then
- xvnc=/usr/bin/Xvnc
- setupXvnc
- else
- if [ -a /usr/X11/bin/Xvnc ]
- then
- xvnc=/usr/X11/bin/Xvnc
+ for _xvnc in /usr/bin/Xvnc /usr/X11/bin/Xvnc /usr/local/bin/Xvnc; do
+ if [ -a $_xvnc ]; then
+ xvnc=$_xvnc
setupXvnc
- else
- echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc). Using DISPLAY=0:0"
- DISPLAY=`$HOST`:0.0
+ break
fi
+ done
+ if [ "x$xvnc" = "x" ]; then
+ echo "Couldn't find Xvnc. Using default DISPLAY from environment"
fi
- export DISPLAY
fi
}
@@ -139,9 +137,11 @@
port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58`
echo localhost > Xvnc.cfg
echo "Setting up Xvnc on port ${port} with password VNCpassword1"
- $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log &
+ $xvnc :$port -geometry 1024x768 -depth 24 -auth Xvnc.cfg -localhost -rfbauth eclipse-tests-vncpwd &> Xvnc.log &
Xvncpid=$!
- DISPLAY=`$HOST`:$port
+ DISPLAY=$HOST:$port
+ export DISPLAY
+
}
function setArch() {
@@ -160,13 +160,15 @@
arch=ia64 ;;
ppc)
arch=ppc ;;
- x86_64)
+ x86_64|amd64)
arch=x86_64 ;;
*)
echo "Unrecognized architecture: $arch" 1>&2
exit 1 ;;
esac
echo >&2 "Architecture not specified. Assuming host architecture: $arch"
+ else
+ arch=$buildArch
fi
}
@@ -177,7 +179,7 @@
-application org.eclipse.ant.core.antRunner \
-file $testDriver \
-Declipse-home=${eclipseHome} \
- -Dos=linux \
+ -Dos=${buildOs} \
-Dws=gtk \
-Darch=${arch} \
-Dlibrary-file=$libraryXml \
@@ -185,7 +187,7 @@
-logger org.apache.tools.ant.DefaultLogger \
-vmargs \
-Duser.home=${homedir} \
- -Dosgi.os=linux \
+ -Dosgi.os=${buildOs} \
-Dosgi.ws=gtk \
-Dosgi.arch=${arch}
}
@@ -288,7 +290,7 @@
}
# Command-line arguments
-while getopts "de:gt:h" OPTION
+while getopts "de:gt:a:o:h" OPTION
do
case $OPTION in
d)
@@ -300,6 +302,12 @@
t)
timestamp=$OPTARG
;;
+ a)
+ buildArch=$OPTARG
+ ;;
+ o)
+ buildOs=$OPTARG
+ ;;
h)
usage
exit 1
Index: build.sh
===================================================================
--- build.sh (revision 23733)
+++ build.sh (working copy)
@@ -38,5 +38,5 @@
esac
DATE=`date +%Y%m%d%H%M%S`
-ant -DbuildArch=${arch} 2>&1 | tee build_${DATE}.log
+ant -DbuildArch=${arch} -DbuildOs=linux 2>&1 | tee build_${DATE}.log
echo "Build log is available in build_${DATE}.log"