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, 22 Feb 2002 10:51:34 GMT
bodewig     02/02/22 02:51:34

  Modified:    .        build.xml
  Log:
  Start factoring out the exclude patterns from <javac> and <junit> into
  a single place - realized that the sitraka stuff requires TraX to
  compile.
  
  Revision  Changes    Path
  1.251     +17 -6     jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.250
  retrieving revision 1.251
  diff -u -r1.250 -r1.251
  --- build.xml	20 Feb 2002 17:54:59 -0000	1.250
  +++ build.xml	22 Feb 2002 10:51:34 -0000	1.251
  @@ -107,6 +107,17 @@
   
     <!--
          ===================================================================
  +         Set up patternsets to be used by javac and junit to exclude
  +         files that have dependencies that are not available
  +       ===================================================================
  +  -->
  +  <patternset id="needs.jakarta.regexp">
  +    <exclude name="${regexp.package}/JakartaRegexp*.java"
  +             unless="jakarta.regexp.present" />
  +  </patternset>
  +
  +  <!--
  +       ===================================================================
            Check to see what optional dependencies are available
          ===================================================================
     -->
  @@ -289,8 +300,7 @@
              deprecation="${deprecation}"
              optimize="${optimize}" >
         <classpath refid="classpath" />
  -      <exclude name="${regexp.package}/JakartaRegexp*.java"
  -               unless="jakarta.regexp.present" />
  +      <patternset refid="needs.jakarta.regexp" />
         <exclude name="${regexp.package}/JakartaOro*.java"
                  unless="jakarta.oro.present" />
         <exclude name="${regexp.package}/Jdk14Regexp*.java"
  @@ -346,6 +356,7 @@
                  unless="xalan.present" />
         <exclude name="${optional.package}/jdepend/*" unless="jdepend.present" />
         <exclude name="${optional.package}/sitraka/**" unless="some.regexp.support"/>
  +      <exclude name="${optional.package}/sitraka/**" unless="trax.present"/>
         <exclude name="${optional.package}/metamata/MAudit*" unless="jakarta.oro.present"/>
         <exclude name="${optional.package}/metamata/MMetrics*"
                  unless="trax.present"/>
  @@ -904,8 +915,7 @@
   
         <exclude name="${optional.package}/ANTLRTest.java"
                  unless="antlr.present" />
  -      <exclude name="${regexp.package}/JakartaRegexp*Test.java"
  -               unless="jakarta.regexp.present" />
  +      <patternset refid="needs.jakarta.regexp" />
         <exclude name="${regexp.package}/JakartaOro*Test.java"
                  unless="jakarta.oro.present" />
         <exclude name="${regexp.package}/Jdk14Regexp*Test.java"
  @@ -916,6 +926,8 @@
   
         <exclude name="${optional.package}/sitraka/*.java"
                  unless="some.regexp.support" />
  +      <exclude name="${optional.package}/sitraka/*.java"
  +               unless="trax.present" />
         <exclude name="${optional.package}/sitraka/XMLReportTest.java"
                  unless="trax.present" />
   
  @@ -1006,8 +1018,7 @@
             <!-- only run these tests if their required libraries are installed -->
             <exclude name="${optional.package}/ANTLRTest.java"
                      unless="antlr.present" />
  -          <exclude name="${regexp.package}/JakartaRegexp*Test.java"
  -                   unless="jakarta.regexp.present" />
  +          <patternset refid="needs.jakarta.regexp" />
             <exclude name="${regexp.package}/JakartaOro*Test.java"
                      unless="jakarta.oro.present" />
             <exclude name="${regexp.package}/Jdk14Regexp*Test.java"
  
  
  

--
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