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 10:15:01 GMT
stephan     2003/04/11 03:15:01

  Modified:    src/targets test-build.xml
               tools/src blocks-build.xsl
  Log:
  Fixing some classpath issues.
  
  Revision  Changes    Path
  1.10      +10 -8     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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- test-build.xml	11 Apr 2003 09:14:17 -0000	1.9
  +++ test-build.xml	11 Apr 2003 10:15:00 -0000	1.10
  @@ -12,6 +12,12 @@
         <fileset dir="${test}" excludes="**/*.java"/>
       </copy>
   
  +    <path id="test.classpath">
  +      <fileset dir="${tools.lib}">
  +        <include name="*.jar"/>
  +      </fileset>
  +    </path>
  +
       <!-- Compile tests -->
       <javac srcdir="${test}"
              destdir="${build.test}"
  @@ -21,28 +27,23 @@
              target="${target.vm}"
              fork="true">
         <classpath refid="classpath"/>
  -      <classpath refid="scratchpad.classpath"/>
  +      <classpath refid="test.classpath"/>
         <classpath>
           <pathelement location="${build.dest}" />
  -        <pathelement location="${build.scratchpad.dest}" />
           <!-- FIXME Resolver tests depend on deprecated stuff -->
           <pathelement location="${build.deprecated}" />
  -        <pathelement location="${tools.lib}" />
         </classpath>
       </javac>
   
       <junit printsummary="yes" haltonfailure="yes" fork="yes">
  +      <classpath refid="classpath"/>
  +      <classpath refid="test.classpath"/>
         <classpath>
           <pathelement location="${build.test}" />
           <pathelement location="${build.dest}" />
  -        <pathelement location="${build.scratchpad.dest}" />
           <!-- FIXME Resolver tests depend on deprecated stuff -->
           <pathelement location="${build.deprecated}" />
  -        <pathelement path="${java.class.path}" />
  -        <pathelement location="${tools.lib}" />
         </classpath>
  -      <classpath refid="classpath"/>
  -      <classpath refid="scratchpad.classpath"/>
         <formatter type="plain" usefile="no" />
         <batchtest>
           <fileset dir="${build.test}">
  @@ -74,6 +75,7 @@
   
     <!-- Block tests -->
     <target name="block-tests" depends="compile-core, compile-deprecated, prepare-blocks">
  +
       <ant antfile="${build.temp}/blocks-build.xml"
            inheritAll="true"
            inheritRefs="false"
  
  
  
  1.11      +16 -13    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- blocks-build.xsl	11 Apr 2003 09:14:17 -0000	1.10
  +++ blocks-build.xsl	11 Apr 2003 10:15:01 -0000	1.11
  @@ -144,6 +144,10 @@
         </target>
   
         <target name="{$block-name}-prepare">
  +
  +         <!-- Test if this block has mocks -->
  +         <available property="{$block-name}.has.mocks" type="dir" file="{string('${blocks}')}/{$block-name}/mocks/"/>
  +
            <mkdir dir="{string('${build.blocks}')}/{$block-name}/dest"/>
   
            <mkdir dir="{string('${build.blocks}')}/{$block-name}/conf"/>
  @@ -158,11 +162,11 @@
               <fileset dir="{string('${blocks}')}/{$block-name}/lib">
                  <include name="*.jar"/>
               </fileset>
  -            <pathelement path="{string('${build.blocks}')}/{$block-name}/mocks"/>
  +            <pathelement location="{string('${build.blocks}')}/{$block-name}/mocks"/>
            </path>
         </target>
   
  -      <target name="{$block-name}-compile" depends="{$block-name}-build,{$block-name}-mocks,{$block-name}-prepare">
  +      <target name="{$block-name}-compile" depends="{$block-name}-build,{$block-name}-prepare,{$block-name}-mocks">
   
            <copy filtering="on" todir="{string('${build.blocks}')}/{$block-name}/dest">
               <fileset dir="{string('${blocks}')}/{$block-name}/java">
  @@ -224,13 +228,7 @@
            </ant>
         </target>
   
  -      <target name="{$block-name}-mocks" if="{$block-name}.has.mocks">
  -         <path id="{$block-name}.classpath">
  -            <path refid="classpath"/>
  -            <fileset dir="{string('${build}')}">
  -               <include name="*.jar"/>
  -            </fileset>
  -         </path>
  +      <target name="{$block-name}-mocks" depends="{$block-name}-prepare" if="{$block-name}.has.mocks">
   
            <mkdir dir="{string('${build.blocks}')}/{$block-name}/mocks"/>
   
  @@ -300,23 +298,28 @@
               <fileset dir="{string('${blocks}')}/{$block-name}/test" excludes="**/*.java"/>
            </copy>
   
  +         <path id="test.classpath">
  +            <fileset dir="{string('${tools.lib}')}">
  +               <include name="*.jar"/>
  +            </fileset>
  +         </path>
  +
            <javac srcdir="{string('${blocks}')}/{$block-name}/test"
                   destdir="{string('${build.blocks}')}/{$block-name}/test"
                   fork="true">
  +            <classpath refid="test.classpath"/>
               <classpath refid="{$block-name}.classpath"/>
               <classpath>
                  <pathelement location="{string('${build.test}')}"/>
  -               <pathelement location="{string('${tools.lib}')}"/>
               </classpath>
            </javac>
   
            <junit printsummary="yes" haltonfailure="yes" fork="yes">
  -            <classpath refid="{$block-name}.classpath" />
  +            <classpath refid="test.classpath"/>
  +            <classpath refid="{$block-name}.classpath"/>
               <classpath>
  -               <pathelement path="{string('${java.class.path}')}"/>
                  <pathelement location="{string('${build.test}')}"/>
                  <pathelement location="{string('${build.blocks}')}/{$block-name}/test"/>
  -               <pathelement location="{string('${tools.lib}')}"/>
               </classpath>
               <formatter type="plain" usefile="no"/>
               <batchtest>
  
  
  

Mime
View raw message