[Babeldoc-devel] babeldoc build.xml,1.20,1.21

[Web H. <web...@us...>]

Update of /cvsroot/babeldoc/babeldoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29172

Modified Files:
	build.xml 
Log Message:
All generated files now go in build directory, including bootstrap classes.
"ant clean" will now revert the workspace to exactly it's state after cvs checkout.

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** build.xml	5 Aug 2004 08:14:17 -0000	1.20
--- build.xml	9 Aug 2004 09:51:28 -0000	1.21
***************
*** 16,20 ****
  	<property name="base_dir" value="${basedir}"/>
  
! 	<property name="babeldoc.bootstrap.jar" value="${basedir}/support/ant/lib/babeldoc_bootstrap.jar" />
  	<property name="jalopy.jar"             value="${basedir}/support/jalopy/lib/jalopy-ant-0.6.1.jar" />
  
--- 16,24 ----
  	<property name="base_dir" value="${basedir}"/>
  
! 	<property name="build.dir"              value="${basedir}/build" />
! 	<property name="support.build.dir"      value="${basedir}/build/support" />
! 	<property name="support.classes.dir"    value="${support.build.dir}/classes" />
! 	<property name="support.lib.dir"        value="${support.build.dir}/lib" />
! 	<property name="babeldoc.bootstrap.jar" value="${support.lib.dir}/babeldoc_bootstrap.jar" />
  	<property name="jalopy.jar"             value="${basedir}/support/jalopy/lib/jalopy-ant-0.6.1.jar" />
  
***************
*** 81,87 ****
      name="bootstrap"
      description="Compile the bootstrap babeldoc classes">
!     <mkdir dir="support/build"/>
      <javac
!       destdir="support/build"
        srcdir="support/src"
        deprecation="${compile.deprecation}"
--- 85,93 ----
      name="bootstrap"
      description="Compile the bootstrap babeldoc classes">
!     <mkdir dir="${support.build.dir}"/>
!     <mkdir dir="${support.lib.dir}"/>
!     <mkdir dir="${support.classes.dir}"/>
      <javac
!       destdir="${support.classes.dir}"
        srcdir="support/src"
        deprecation="${compile.deprecation}"
***************
*** 93,97 ****
      <jar
        jarfile="${babeldoc.bootstrap.jar}"
!       basedir="support/build"/>
    </target>
  
--- 99,103 ----
      <jar
        jarfile="${babeldoc.bootstrap.jar}"
!       basedir="${support.classes.dir}"/>
    </target>
  
***************
*** 142,146 ****
  
      <modulefinder
! 			moduleSearchPath="${modules} ${extra.modules}"
        modulesProperty="babeldoc_modules"
        subdirectories="src build config"
--- 148,152 ----
  
      <modulefinder
!       moduleSearchPath="${modules} ${extra.modules}"
        modulesProperty="babeldoc_modules"
        subdirectories="src build config"
***************
*** 179,192 ****
    </target>
  
!   <!--
!   Clean target - call clean on all the modules
!   -->
    <target
!     name="clean"
      depends="depends">
-     <delete dir="${build}"/>
      <moduleRunner target="clean" modules="${babeldoc_modules}"/>
    </target>
  
    <!--
    Setup the project
--- 185,201 ----
    </target>
  
!   <!-- Clean target - call clean on all the modules -->
    <target
!     name="module_clean"
      depends="depends">
      <moduleRunner target="clean" modules="${babeldoc_modules}"/>
    </target>
  
+   <!-- Clean target - clean all generated directories -->
+   <target
+     name="clean">
+     <delete dir="${build}"/>
+   </target>
+ 
    <!--
    Setup the project