ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant build.xml
Date Fri, 18 Jan 2002 16:22:52 GMT
bodewig     02/01/18 08:22:52

  Modified:    .        build.xml
  Log:
  Use org.apache.env.Which utility to dump system info if present.
  
  Revision  Changes    Path
  1.228     +14 -2     jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.227
  retrieving revision 1.228
  diff -u -r1.227 -r1.228
  --- build.xml	10 Jan 2002 14:18:42 -0000	1.227
  +++ build.xml	18 Jan 2002 16:22:52 -0000	1.228
  @@ -174,6 +174,9 @@
       <available property="xalan.envcheck"
                  classname="org.apache.xalan.xslt.EnvironmentCheck"
                  classpathref="classpath" />
  +    <available property="which.present"
  +               classname="org.apache.env.Which"
  +               classpathref="classpath" />
   
       <available property="servlet.present"
                  classname="javax.servlet.Servlet"
  @@ -823,7 +826,10 @@
       </javac>
     </target>
   
  -  <target name="dump-info" depends="xml-check">
  +  <target name="dump-info" depends="dump-sys-properties,run-which" />
  +
  +  <target name="dump-sys-properties" unless="which.present" 
  +          depends="xml-check">
       <echo message="java.vm.info=${java.vm.info}" />
       <echo message="java.vm.name=${java.vm.name}" />
       <echo message="java.vm.vendor=${java.vm.vendor}" />
  @@ -836,8 +842,14 @@
     </target>
   
     <!-- helper class from Xalan2 to check for jar versioning of xml/xsl processors -->
  -  <target name="xml-check" depends="check_for_optional_packages" if="xalan.envcheck">
  +  <target name="xml-check" depends="check_for_optional_packages" 
  +          if="xalan.envcheck" unless="which.present">
         <java classname="org.apache.xalan.xslt.EnvironmentCheck"/>
  +  </target>
  +
  +  <target name="run-which" depends="check_for_optional_packages"
  +          if="which.present">
  +      <java classname="org.apache.env.Which" taskname="which"/>
     </target>
   
     <!--
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message