[Lunar-commits] r23216 - moonbase/trunk/devel/apache-ant

[Moritz Heiber]

Author: moe
Date: 2007-02-10 15:28:49 +0100 (Sat, 10 Feb 2007)
New Revision: 23216

Modified:
   moonbase/trunk/devel/apache-ant/BUILD
   moonbase/trunk/devel/apache-ant/DEPENDS
Log:
apache-ant can use %JAVA_SDK. Tested.



Modified: moonbase/trunk/devel/apache-ant/BUILD
===================================================================
--- moonbase/trunk/devel/apache-ant/BUILD	2007-02-10 14:10:06 UTC (rev 23215)
+++ moonbase/trunk/devel/apache-ant/BUILD	2007-02-10 14:28:49 UTC (rev 23216)
@@ -1,7 +1,14 @@
 (
+  if module_installed sun-jdk; then
+    JAVA_VERSION=`installed_version sun-jdk`;
+    export JAVA_HOME="/usr/lib/jdk${JAVA_VERSION}";
+  else
+    JAVA_VERSION=`installed_version j2sdk`;
+    export JAVA_HOME="/usr/lib/j2sdk${JAVA_VERSION}";
+  fi
 
-  export JAVA_HOME=${JAVA_HOME:-/usr/lib/j2sdk1.4.2}
   prepare_install &&
+  
   ./build.sh -Ddist.dir=/usr/share/ant &&
   gather_docs TODO WHATSNEW welcome.html &&
   for each in ant antRun runant.pl runant.py complete-ant-cmd.pl ; do

Modified: moonbase/trunk/devel/apache-ant/DEPENDS
===================================================================
--- moonbase/trunk/devel/apache-ant/DEPENDS	2007-02-10 14:10:06 UTC (rev 23215)
+++ moonbase/trunk/devel/apache-ant/DEPENDS	2007-02-10 14:28:49 UTC (rev 23216)
@@ -1 +1 @@
-depends j2sdk
+depends %JAVA_SDK