diff --git a/releng.control/ant.sh b/releng.control/ant.sh index d3baca6540e3456e84c7bc79bca06bca1c57e3f9..a9331b08ab3685c0a7c647c60426f4b029b0ef27 100644 --- a/releng.control/ant.sh +++ b/releng.control/ant.sh @@ -7,14 +7,15 @@ then source commonVariations.sh fi -LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64 -export LD_LIBRARY_PATH +export LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64 + +export CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5 -CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5 -export CCDIR - -export JAVA_HOME=${JAVA_4_HOME} +# for now, swithed to use Java 5 for EMF pre-req EE, +# but long term, each test should run according to +# what it needs. +export JAVA_HOME=${JAVA_5_HOME} ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5