You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@harmony.apache.org by ar...@apache.org on 2006/06/11 00:47:00 UTC

svn commit: r413374 - /incubator/harmony/enhanced/classlibadapter/trunk/build.xml

Author: archie
Date: Sat Jun 10 15:47:00 2006
New Revision: 413374

URL: http://svn.apache.org/viewvc?rev=413374&view=rev
Log:
Make build.xml compatible with ant 1.6.2, in which <condition> doesn't
support the "else" attribute.

Modified:
    incubator/harmony/enhanced/classlibadapter/trunk/build.xml

Modified: incubator/harmony/enhanced/classlibadapter/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlibadapter/trunk/build.xml?rev=413374&r1=413373&r2=413374&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlibadapter/trunk/build.xml (original)
+++ incubator/harmony/enhanced/classlibadapter/trunk/build.xml Sat Jun 10 15:47:00 2006
@@ -28,12 +28,17 @@
     <property name="build.classes" location="${build.output}/classes" />
     <property environment="env" />
     <property name="classlib.home.default" location="../classlib" />
-    <condition property="classlib.home" value="${env.CLASSLIB_HOME}"
-               else="${classlib.home.default}">
+    <condition property="classlib.home" value="${env.CLASSLIB_HOME}">
         <isset property="env.CLASSLIB_HOME" />
     </condition>
-    <condition property="make" value="nmake" else="make">
+    <condition property="classlib.home" value="${classlib.home.default}">
+        <not><isset property="env.CLASSLIB_HOME" /></not>
+    </condition>
+    <condition property="make" value="nmake">
         <os family="Windows" />
+    </condition>
+    <condition property="make" value="make">
+        <not><os family="Windows" /></not>
     </condition>
 
     <available file="${classlib.home}/deploy/jdk/include/jni.h" type="file"