babeldoc-devel

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc
In directory sc8-pr-cvs1:/tmp/cvs-serv19206

Modified Files:
	build.xml 
Log Message:
Updated the build system using an explicit modular ant task.  This is better than the method previously employed which added "hidden" tasks to the build and clean etc targets.  Additionally using a more robust module sorting algorithm.

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** build.xml	11 Jun 2003 03:24:01 -0000	1.12
--- build.xml	27 Jun 2003 00:14:55 -0000	1.13
***************
*** 75,84 ****
      name="declare"
      description="Declare the babeldoc tasks">
-     <taskdef name="babeldocdep"
-       classname="com.babeldoc.bootstrap.ant.DependencyBuilder"/>
      <taskdef name="modulefinder"
        classname="com.babeldoc.bootstrap.ant.ModuleFinder"/>
      <taskdef name="pathtrimmer"
        classname="com.babeldoc.bootstrap.ant.PathTrimmer"/>
      <taskdef name="jalopy"
        classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"/>
--- 75,84 ----
      name="declare"
      description="Declare the babeldoc tasks">
      <taskdef name="modulefinder"
        classname="com.babeldoc.bootstrap.ant.ModuleFinder"/>
      <taskdef name="pathtrimmer"
        classname="com.babeldoc.bootstrap.ant.PathTrimmer"/>
+     <taskdef name="moduleRunner"
+       classname="com.babeldoc.bootstrap.ant.ModuleRunnerTask"/>
      <taskdef name="jalopy"
        classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"/>
***************
*** 97,106 ****
        subdirectories="src build config"
      />
!     <babeldocdep
!       modulePropFiles="${babeldoc_modules}"
!       modulesProperty="babeldoc_modules_sorted"
!       targets="clean build deploy test format"
!     />
!     <echo message="Build order: ${babeldoc_modules_sorted}"/>
    </target>
  
--- 97,105 ----
        subdirectories="src build config"
      />
! 
!     <!--
!     <echo message="${babeldoc_modules}"/>
!     <echo message="${babeldoc_modules_src}"/>
!     -->
    </target>
  
***************
*** 110,114 ****
  
    <!--
!   javadocumention
    -->
    <target
--- 109,113 ----
  
    <!--
!   generate javadoc-umention
    -->
    <target
***************
*** 134,139 ****
  
    <!--
!   Dummy target - this has tasks added to it programmatically by
!   setup_dependencies
    -->
    <target
--- 133,137 ----
  
    <!--
!   Clean target - call clean on all the modules
    -->
    <target
***************
*** 141,182 ****
      depends="depends">
      <delete dir="${build}"/>
    </target>
  
-   <!--
-   Dummy target - this has tasks added to it programmatically by depends
-   -->
    <target
!     name="build"
      depends="depends">
-     <echo message="Building Babeldoc in: ${base_dir}"/>
      <mkdir dir="./build"/>
      <mkdir dir="./build/lib"/>
      <mkdir dir="./build/examples"/>
      <mkdir dir="./build/readme"/>
    </target>
  
    <!--
!   Dummy target - this has tasks added to it programmatically by depends
    -->
    <target
      name="deploy"
!     depends="depends"/>
  
    <!--
!   Dummy target - this has tasks added to it programmatically by depends
    -->
    <target
      name="test"
      depends="depends">
!     <echo message="Testing Babeldoc in: ${base_dir}"/>
    </target>
  
    <!--
!   Dummy target - this has tasks added to it programmatically by depends
    -->
    <target
      name="format"
      depends="depends">
!     <echo message="Formatting Babeldoc in: ${base_dir}"/>
    </target>
  </project>
--- 139,196 ----
      depends="depends">
      <delete dir="${build}"/>
+     <moduleRunner target="clean" modules="${babeldoc_modules}"/>
    </target>
  
    <target
!     name="setup"
      depends="depends">
      <mkdir dir="./build"/>
      <mkdir dir="./build/lib"/>
      <mkdir dir="./build/examples"/>
      <mkdir dir="./build/readme"/>
+     <mkdir dir="./build/support"/>
+     <moduleRunner target="setup" modules="${babeldoc_modules}"/>
+   </target>
+   <!--
+   Build target - call build on all the modules
+   -->
+   <target
+     name="build"
+     depends="depends">
+     <available file="./build" type="dir" property="setup.done"/>
+     <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/>
+ 
+     <moduleRunner target="build" modules="${babeldoc_modules}"/>
    </target>
  
    <!--
!   deploy target - call deploy on all the modules
    -->
    <target
      name="deploy"
!     depends="depends">
!     <available file="./build" type="dir" property="setup.done"/>
!     <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/>
!     <moduleRunner target="deploy" modules="${babeldoc_modules}"/>
!   </target>
  
    <!--
!   test target - call test on all the modules
    -->
    <target
      name="test"
      depends="depends">
!     <available file="./build" type="dir" property="setup.done"/>
!     <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/>
!     <moduleRunner target="test" modules="${babeldoc_modules}"/>
    </target>
  
    <!--
!   format target - call format on all the modules
    -->
    <target
      name="format"
      depends="depends">
!     <moduleRunner target="format" modules="${babeldoc_modules}"/>
    </target>
  </project>