harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r476040 - /incubator/harmony/enhanced/classlib/trunk/make/depends.xml
Date Fri, 17 Nov 2006 03:46:02 GMT
Author: ndbeyer
Date: Thu Nov 16 19:46:01 2006
New Revision: 476040

URL: http://svn.apache.org/viewvc?view=rev&rev=476040
Log:
Prevent Linux dependency tests from running on windows.

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/depends.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=476040&r1=476039&r2=476040
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Thu Nov 16 19:46:01 2006
@@ -88,7 +88,7 @@
        *  reason, we can't link with libjpg.a et al on at least to kinds of 64-bit linux
       -->
 
-    <target name="-check-unix-common">
+    <target name="-check-unix-common" if="is.unix">
         
         <property name="lcms.msg"
                   value="liblcms development package not installed
@@ -136,7 +136,7 @@
                         message="${jpeg.msg}" />
     </target>
 
-    <target name="-check-unix-x86" if="is.x86" depends="-check-unix-common">
+    <target name="-check-unix-x86" if="is.x86" unless="is.windows" depends="-check-unix-common">
         <check-one-link src="${lcms.home}/lib/liblcms.a"
                         dest="depends/libs/build/lcms/liblcms.${hy.platform}"
                         message="${lcms.msg}" />
@@ -150,7 +150,7 @@
                         message="${jpeg.msg}" />
     </target>
 
-    <target name="-check-unix-x86_64" if="is.x86_64" depends="-check-unix-common">
+    <target name="-check-unix-x86_64" if="is.x86_64" unless="is.windows" depends="-check-unix-common">
         <check-one-link src="${lcms.home}/lib/liblcms.so"
                         dest="depends/libs/build/lcms/liblcms.${hy.platform}"
                         message="${lcms.msg}" />



Mime
View raw message