db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject cvs commit: db-ojb build.xml
Date Sat, 15 Jan 2005 13:51:12 GMT
tomdz       2005/01/15 05:51:12

  Modified:    .        Tag: OJB_1_0_RELEASE build.xml
  Log:
  Changed Forrest invocation to use Forrest 0.6's ant build file instead of forrest.bat/forrest.sh
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.144.2.13 +11 -21    db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.144.2.12
  retrieving revision 1.144.2.13
  diff -u -r1.144.2.12 -r1.144.2.13
  --- build.xml	13 Jan 2005 15:08:40 -0000	1.144.2.12
  +++ build.xml	15 Jan 2005 13:51:12 -0000	1.144.2.13
  @@ -30,7 +30,8 @@
       </description>
   
       <!-- Allow any user specific values to override the defaults -->
  -    <property file="${user.home}/build.properties" />
  +	<property environment="env"/>
  +	<property file="${user.home}/build.properties" />
       <property file="build.properties"/>
   
       <!-- load the profile set in build.properties -->
  @@ -44,7 +45,7 @@
       <property name="testOnBorrow" value="true"/>
       <property name="testOnReturn" value="false"/>
   
  -    <!-- clover initialization-->
  +    <!-- Clover initialization-->
       <property name="clover.initstring" location="${build.dir}/coverage.db"/>
   
       <path id="compilation-classpath">
  @@ -818,29 +819,18 @@
                   </not>
               </and>
           </condition>
  -        <antcall target="forrest-on-win-with-cmd"/>
  -        <antcall target="forrest-on-win-with-command"/>
  -        <antcall target="forrest-on-unix"/>
  -
  +    	<echo>Note that you need to use Ant version 1.6+ and have commons-resolver (can
be found in ${env.FORREST_HOME}/tools/ant/lib) in your Ant's lib folder</echo>
  +    	<ant antfile="${env.FORREST_HOME}/forrest.build.xml"
  +    		 dir="${build.doc}"
  +    		 inheritall="false"
  +    		 target="site">
  +    		<property name="forrest.home" value="${env.FORREST_HOME}"/>
  +    	</ant>
           <!-- Finally we can copy the generated documentation to its designated place
-->
           <mkdir dir="${doc}"/>
           <copy todir="${doc}">
               <fileset dir="${forrest.output.dir}"/>
           </copy>
  -    </target>
  -
  -    <target name="forrest-on-win-with-cmd" if="windows.with.cmd">
  -        <exec dir="${build.doc}" executable="cmd">
  -            <arg line="/c forrest.bat"/>
  -        </exec>
  -    </target>
  -    <target name="forrest-on-win-with-command" if="windows.with.command">
  -        <exec dir="${build.doc}" executable="command">
  -            <arg line="/c forrest.bat"/>
  -        </exec>
  -    </target>
  -    <target name="forrest-on-unix" if="not.windows">
  -        <exec dir="${build.doc}" executable="forrest"/>
       </target>
   
       <!-- ================================================================== -->
  
  
  

---------------------------------------------------------------------
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