From bb91cc00f5d46b1dbb17f1198d5c74e72c40670b Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Thu, 16 Nov 2006 20:42:34 +0000
Subject: [PATCH] use Java 5 for tests. All tests for now ... will refine later
to pick appropriate one.
---
releng.control/ant.sh | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index d3baca654..a9331b08a 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
--
GitLab