db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: db-ojb build-xdoclet-module.xml
Date Tue, 30 Dec 2003 16:46:56 GMT
thma        2003/12/30 08:46:56

  Modified:    .        Tag: OJB_BRANCH_1_0 build-xdoclet-module.xml
  Log:
  merge from head
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.5.2.2   +28 -7     db-ojb/build-xdoclet-module.xml
  
  Index: build-xdoclet-module.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build-xdoclet-module.xml,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- build-xdoclet-module.xml	29 Dec 2003 17:58:05 -0000	1.5.2.1
  +++ build-xdoclet-module.xml	30 Dec 2003 16:46:55 -0000	1.5.2.2
  @@ -68,22 +68,40 @@
           <copy file="${src.xdoclet}/pretty.settings" todir="${xdoclet.src.dir}/config/.Refactory"/>
       </target>
   
  -    <!-- Creates XDoclet (including its modules) -->
  -    <target name="build-xdoclet" depends="copy-to-xdoclet,setup-prettyprinting">
  -        <!-- First we build xjavadoc -->
  +    <!-- Checks whether xjavadoc needs to be build -->
  +    <target name="check-xjavadoc">
  +        <available property="xdoclet.xjavadoc.present"
  +                   file="${xdoclet.src.dir}/lib/xjavadoc*.jar"
  +                   type="file"/>
  +    </target>
  +
  +    <!-- Creates XJavaDoc if necessary -->
  +    <target name="build-xjavadoc" depends="check-xjavadoc" unless="xdoclet.xjavadoc.present">
           <ant dir="${xdoclet.src.dir}"
                target="xjavadoc"
                inheritall="false">
           </ant>
  -        <!-- Next we build the modules (this includes the OJB module) -->
  +    </target>
  +
  +    <!-- Creates XDoclet (including XJavaDoc and its modules) -->
  +    <target name="build-xdoclet" depends="copy-to-xdoclet,setup-prettyprinting,build-xjavadoc">
  +        <!-- this includes the OJB module -->
           <ant dir="${xdoclet.src.dir}"
                target="modules"
                inheritall="false">
           </ant>
       </target>
   
  +    <!-- Only creates the XDoclet OJB module -->
  +    <target name="build-ojb-module-only" depends="copy-to-xdoclet,setup-prettyprinting,build-xjavadoc">
  +        <!-- this uses the build script in the OJB module directory directly -->
  +        <ant dir="${xdoclet.src.dir}/modules/ojb"
  +             inheritall="false">
  +        </ant>
  +    </target>
  +
       <!-- Copies the generated jars (xjavadoc, xdoclet, ojb module) into the OJB lib
folder -->
  -    <target name="copy-xdoclet-jars" depends="build-xdoclet">
  +    <target name="copy-xdoclet-jars">
           <!-- XJavaDoc core jar -->
           <copy todir="${lib}">
               <fileset dir="${xdoclet.src.dir}/lib">
  @@ -106,8 +124,10 @@
       </target>
   
       <!-- Main creation target -->
  -    <target name="build" depends="copy-xdoclet-jars"/>
  +    <target name="build" depends="build-xdoclet,copy-xdoclet-jars"/>
   
  +    <!-- Faster creation target that only rebuilds the XDoclet OJB module -->
  +    <target name="rebuild" depends="build-ojb-module-only,copy-xdoclet-jars"/>
   
       <!-- Prepares the folder for the XDoclet OJB module tests -->
       <target name="prepare-test">
  @@ -132,6 +152,7 @@
   
       <!-- Runs the tests without preparing or compiling them -->
       <target name="junit-no-compile">
  +        <echo message="Currently this target does not properly work as there are some
issues with the ant-junit task (gives different results than junit within Eclipse)"/>
           <!-- Run the tests -->
           <junit printsummary="yes" fork="yes" dir="${build.xdoclettest}">
               <classpath refid="test-classpath"/>
  @@ -140,7 +161,7 @@
               <!-- Running all tests from a single vm will lead to an out-of-memory error,
so we rather perform a batch test -->
               <batchtest fork="yes" todir="${build.xdoclettest}">
                   <fileset dir="${build.xdoclettest.src}">
  -                    <include name="xdoclet/**/*Tests.java"/>
  +                    <include name="xdoclet/**/CollectionTagAttributesAttributeTests.java"/>
                       <!-- We don't use the runner class as this would lead to the situation
explained above -->
                       <exclude name="xdoclet/**/Run*Tests.java"/>
                   </fileset>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message