db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mka...@apache.org
Subject cvs commit: db-ojb build.xml
Date Sat, 30 Apr 2005 17:35:37 GMT
mkalen      2005/04/30 10:35:36

  Modified:    .        Tag: OJB_1_0_RELEASE build.xml
  Log:
  Split API+Forrest doc target (run sitedoc-generate för no-fuzz forrest run). Fix ancient
TODO, new default target="jar" per requests from users.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.144.2.25 +23 -49    db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.144.2.24
  retrieving revision 1.144.2.25
  diff -u -r1.144.2.24 -r1.144.2.25
  --- build.xml	26 Apr 2005 22:03:18 -0000	1.144.2.24
  +++ build.xml	30 Apr 2005 17:35:36 -0000	1.144.2.25
  @@ -22,7 +22,7 @@
        initial author: Thomas Mahler
   -->
   
  -<project name="ObJectRelationalBridge" default="all" basedir=".">
  +<project name="ObJectRelationalBridge" default="jar" basedir=".">
   
       <description>
           ObJectRelationalBridge ANT build configuration
  @@ -67,11 +67,6 @@
   
       <property name="runtime.classpath" refid="runtime-classpath"/>
   
  -    <target name="splash" description="show splash screen">
  -		<property name="splash.dir" location="${src.forrest}/src/documentation/resources/images"/>
  -		<splash imageurl="file://${splash.dir}/splash.png" showduration="0"/>
  -	</target>
  -
       <!-- ================================================================== -->
       <!-- I N I T                                                            -->
       <!-- ================================================================== -->
  @@ -771,15 +766,14 @@
       <!-- ================================================================== -->
       <!-- Build the documentation                                            -->
       <!-- ================================================================== -->
  -    <target name="doc" depends="prepare,javadoc"
  -            description="Builds the complete documentation using Forrest">
  -		<fail message="Please set the ANT_HOME environment variable to the root of your Ant
installation.">
  -			<condition>
  -				<not>
  -					<isset property="env.ANT_HOME"/>
  -				</not>
  -			</condition>
  -		</fail>
  +    <target name="sitedoc-prepare" depends="prepare">
  +        <fail message="Please set the ANT_HOME environment variable to the root of your
Ant installation.">
  +            <condition>
  +                <not>
  +                    <isset property="env.ANT_HOME"/>
  +                </not>
  +            </condition>
  +        </fail>
           <fail message="Please set the FORREST_HOME environment variable to the 'src/core'
subdirectory of your Forrest installation. If you don't have yet installed Forrest, you can
get it from http://forrest.apache.org.">
               <condition>
                   <not>
  @@ -800,16 +794,14 @@
           <delete dir="${build.doc}" failonerror="false"/>
           <mkdir dir="${build.doc}"/>
   
  -        <!-- Copy all forrest src stuff to a temporary directoy -->
  -        <copy todir="${build.doc}">
  -            <fileset dir="${src.forrest}"/>
  -        </copy>
  -
           <!-- Copy generated javadoc into the forrest structure in the temporary directoy
-->
           <copy todir="${forrest.javadoc.destdir}">
               <fileset dir="${build.javadoc}"/>
           </copy>
  +    </target>
   
  +    <target name="sitedoc-generate"
  +        description="Generates the complete site documentation using Forrest">
           <!-- Copy auxiliary documentation src files to the temporary directory -->
           <copy file="${forrest.staticfiles.srcdir}/repository.dtd"
                 tofile="${forrest.staticfiles.destdir}/repository.dtd.txt" />
  @@ -830,40 +822,22 @@
   	    <copy file="release-notes.txt"
   	          tofile="${forrest.staticfiles.destdir}/release-notes.txt" />
   
  -        <!-- Currently we have to run the forrest command because there is no ant
  -             target to use. This means that we have to deal with batch files/scripts
  -             which is not exactly fun in ant: we have to check what type of OS we
  -             have and use the appropriate exec call -->
  -        <condition property="windows.with.cmd">
  -            <or>
  -                <equals arg1="${os.name}" arg2="Windows NT"/>
  -                <equals arg1="${os.name}" arg2="Windows 2000"/>
  -                <equals arg1="${os.name}" arg2="Windows XP"/>
  -            </or>
  -        </condition>
  -        <condition property="windows.with.command">
  -            <or>
  -                <equals arg1="${os.name}" arg2="Windows 95"/>
  -                <equals arg1="${os.name}" arg2="Windows 98"/>
  -            </or>
  -        </condition>
  -        <condition property="not.windows">
  -            <and>
  -                <not>
  -                    <isset property="windows.with.cmd"/>
  -                </not>
  -                <not>
  -                    <isset property="windows.with.command"/>
  -                </not>
  -            </and>
  -        </condition>
  -    	<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>
  +        <!-- Copy all forrest src stuff to a temporary directoy -->
  +        <copy todir="${build.doc}">
  +            <fileset dir="${src.forrest}"/>
  +        </copy>
  +
  +        <!-- Run, Forrest! Run! :-) -->
       	<ant antfile="${env.FORREST_HOME}/forrest.build.xml"
       		 dir="${build.doc}"
       		 inheritall="false"
       		 target="site">
       		<property name="forrest.home" value="${env.FORREST_HOME}"/>
       	</ant>
  +    </target>
  +
  +    <target name="doc" depends="javadoc,sitedoc-prepare,sitedoc-generate"
  +            description="Generates complete API- and site documentation">
           <!-- Finally we can copy the generated documentation to its designated place
-->
           <mkdir dir="${doc}"/>
           <copy todir="${doc}">
  
  
  

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