cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From step...@apache.org
Subject cvs commit: cocoon-2.1/tools/src blocks-build.xsl
Date Fri, 11 Apr 2003 09:00:20 GMT
stephan     2003/04/11 02:00:19

  Modified:    src/targets test-build.xml
               tools/src blocks-build.xsl
  Log:
  Add missing path element to tools.lib for xmlunit and excalibur-testcase.
  Remove another dependency to scratchpad.
  
  Revision  Changes    Path
  1.8       +7 -5      cocoon-2.1/src/targets/test-build.xml
  
  Index: test-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/test-build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- test-build.xml	10 Apr 2003 09:52:52 -0000	1.7
  +++ test-build.xml	11 Apr 2003 09:00:18 -0000	1.8
  @@ -23,10 +23,11 @@
         <classpath refid="classpath"/>
         <classpath refid="scratchpad.classpath"/>
         <classpath>
  -        <pathelement path="${build.dest}" />
  -        <pathelement path="${build.scratchpad.dest}" />
  +        <pathelement location="${build.dest}" />
  +        <pathelement location="${build.scratchpad.dest}" />
           <!-- FIXME Resolver tests depend on deprecated stuff -->
  -        <pathelement path="${build.deprecated}" />
  +        <pathelement location="${build.deprecated}" />
  +        <pathelement location="${tools.lib}" />
         </classpath>
       </javac>
   
  @@ -36,8 +37,9 @@
           <pathelement location="${build.dest}" />
           <pathelement location="${build.scratchpad.dest}" />
           <!-- FIXME Resolver tests depend on deprecated stuff -->
  -        <pathelement path="${build.deprecated}" />
  +        <pathelement location="${build.deprecated}" />
           <pathelement path="${java.class.path}" />
  +        <pathelement location="${tools.lib}" />
         </classpath>
         <classpath refid="classpath"/>
         <classpath refid="scratchpad.classpath"/>
  @@ -71,7 +73,7 @@
     </target>
   
     <!-- Block tests -->
  -  <target name="block-tests" depends="compile,prepare-blocks">
  +  <target name="block-tests" depends="compile-core,prepare-blocks">
       <ant antfile="${build.temp}/blocks-build.xml"
            inheritAll="true"
            inheritRefs="false"
  
  
  
  1.9       +2 -0      cocoon-2.1/tools/src/blocks-build.xsl
  
  Index: blocks-build.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- blocks-build.xsl	8 Apr 2003 18:56:24 -0000	1.8
  +++ blocks-build.xsl	11 Apr 2003 09:00:19 -0000	1.9
  @@ -306,6 +306,7 @@
               <classpath refid="{$block-name}.classpath"/>
               <classpath>
                  <pathelement location="{string('${build.test}')}"/>
  +               <pathelement location="${tools.lib}" />
               </classpath>
            </javac>
   
  @@ -315,6 +316,7 @@
                  <pathelement path="{string('${java.class.path}')}"/>
                  <pathelement location="{string('${build.test}')}"/>
                  <pathelement location="{string('${build.blocks}')}/{$block-name}/test"/>
  +               <pathelement location="${tools.lib}" />
               </classpath>
               <formatter type="plain" usefile="no"/>
               <batchtest>
  
  
  

Mime
View raw message