[Bprocessor-commit] model build.xml,1.6,1.7

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14594

Modified Files:
	build.xml 
Log Message:
small refactoring of the build.xml file into test/build.xml

Index: build.xml
===================================================================
RCS file: /cvsroot/bprocessor/model/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.xml	28 Sep 2005 12:28:45 -0000	1.6
--- build.xml	28 Sep 2005 14:07:55 -0000	1.7
***************
*** 8,11 ****
--- 8,13 ----
  
      <property name="build.dir" value="${basedir}/build"/>
+     <property name="build.test.dir" value="${basedir}/build/test"/>
+     <property name="build.code.dir" value="${basedir}/build/code"/>
      <property name="src.dir" value="${basedir}/src"/>
      <property name="conf.dir" value="${src.dir}/etc"/>
***************
*** 15,18 ****
--- 17,21 ----
      <property name="dist.dir" value="${basedir}/dist"/>
      <property name="test.dir" value="${basedir}/test"/>
+     <property name="test.doc.api.dir" value="${doc.dir}/testapi"/>
  
      <property name="checkstyle-results" value="${build.dir}/checkstyle-results.txt" />
***************
*** 25,28 ****
--- 28,32 ----
      <delete dir="${dist.dir}"/>
      <delete dir="${doc.api.dir}"/>
+     <delete dir="${test.doc.api.dir}"/>
      <delete>
        <fileset dir="${lib.dir}">
***************
*** 44,48 ****
      <echo message=""/>
      <mkdir dir="${build.dir}"/>
!     <mkdir dir="${build.dir}/code"/>
    </target>
  
--- 48,52 ----
      <echo message=""/>
      <mkdir dir="${build.dir}"/>
!     <mkdir dir="${build.code.dir}"/>
    </target>
  
***************
*** 79,87 ****
      </taskdef>
      <xjc schema="${conf.dir}/bprocessor.xsd"
!          target="${build.dir}/code"
           package="net.sourceforge.bprocessor.model.xml">
        <arg value="-nv"/>
      </xjc>
!     <javac srcdir="${build.dir}/code" destdir="${build.dir}/code" deprecation="yes"
             debug="yes"     
             includes="net/**">
--- 83,91 ----
      </taskdef>
      <xjc schema="${conf.dir}/bprocessor.xsd"
!          target="${build.code.dir}"
           package="net.sourceforge.bprocessor.model.xml">
        <arg value="-nv"/>
      </xjc>
!     <javac srcdir="${build.code.dir}" destdir="${build.code.dir}" deprecation="yes"
             debug="yes"     
             includes="net/**">
***************
*** 91,95 ****
      </javac>
      <delete>
!       <fileset dir="${build.dir}/code">
          <include name="**/*.java"/>
        </fileset>
--- 95,99 ----
      </javac>
      <delete>
!       <fileset dir="${build.code.dir}">
          <include name="**/*.java"/>
        </fileset>
***************
*** 141,145 ****
    </target>
  
!   <target name="doc" depends="copylib">
      <delete dir="${doc.api.dir}"/>
      <ant dir="src" target="doc"/>
--- 145,149 ----
    </target>
  
!   <target name="doc" depends="copylib, compile-xml">
      <delete dir="${doc.api.dir}"/>
      <ant dir="src" target="doc"/>
***************
*** 148,152 ****
    <target name="jar" depends="compile"> 
      <mkdir dir="${dist.dir}"/>
!     <copy todir="${build.dir}/code">
        <fileset dir="${conf.dir}">
          <include name="**/*.properties"/>
--- 152,156 ----
    <target name="jar" depends="compile"> 
      <mkdir dir="${dist.dir}"/>
!     <copy todir="${build.code.dir}">
        <fileset dir="${conf.dir}">
          <include name="**/*.properties"/>
***************
*** 154,158 ****
      </copy>
      <jar jarfile="${dist.dir}/${name}.jar"
!          basedir="${build.dir}/code"
           compress="true"
           includes="**/*"
--- 158,162 ----
      </copy>
      <jar jarfile="${dist.dir}/${name}.jar"
!          basedir="${build.code.dir}"
           compress="true"
           includes="**/*"
***************
*** 192,209 ****
    </target>
  
    <target name="test" depends="dist">
!     <mkdir dir="${build.dir}/test"/>
!     <javac srcdir="${test.dir}" destdir="${build.dir}/test" deprecation="yes"
!            debug="yes"     
!            includes="net/**">
!       <classpath>
!         <fileset dir="${lib.dir}">
!           <include name="**/*.jar"/>
!         </fileset>
!         <fileset dir="${dist.dir}">
!           <include name="**/*.jar"/>
!         </fileset>
!       </classpath>
!     </javac>
  
      <junit>
--- 196,210 ----
    </target>
  
+   <target name="test-doc" depends="init">
+     <copy todir="${lib.dir}">
+       <fileset dir="${tools.dir}/junit">
+         <include name="**/*.jar"/>
+       </fileset>
+     </copy>
+     <ant dir="test" target="doc"/>
+   </target>
+ 
    <target name="test" depends="dist">
!     <ant dir="test" target="compile"/>
  
      <junit>
***************
*** 215,219 ****
            <include name="**/*.jar"/>
          </fileset>
!         <pathelement location="${build.dir}/test"/>
        </classpath>
  
--- 216,220 ----
            <include name="**/*.jar"/>
          </fileset>
!         <pathelement location="${build.test.dir}"/>
        </classpath>