tomdz       2005/02/09 03:14:28

  Modified:    .        Tag: OJB_1_0_RELEASE build.xml
  Log:
  Moved checks for Forrest and commons-resolver into the doc target
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.144.2.18 +16 -15    db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.144.2.17
  retrieving revision 1.144.2.18
  diff -u -r1.144.2.17 -r1.144.2.18
  --- build.xml 26 Jan 2005 21:20:28 -0000      1.144.2.17
  +++ build.xml 9 Feb 2005 11:14:28 -0000       1.144.2.18
  @@ -105,13 +105,6 @@
                                </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>
  -                                     <isset property="env.FORREST_HOME"/>
  -                             </not>
  -                     </condition>
  -             </fail>
                <fail message="Please make JUnit available in the classpath, 
e.g. by copying the junit.jar from OJB's lib subdirectory into the lib 
subdirectory of your Ant installation (${env.ANT_HOME}/lib).">
                        <condition>
                                <not>
  @@ -119,13 +112,6 @@
                                </not>
                        </condition>
                </fail>
  -             <fail message="Please make the Apache XML Commons Resolver 
library available in the classpath, e.g. by copying the xml-commons-resolver 
jar file from the 'tools/ant/lib' subdirectory of your Forrest installation 
(${env.FORREST_HOME}/tools/ant/lib) into the lib subdirectory of your Ant 
installation (${env.ANT_HOME}/lib).">
  -                     <condition>
  -                             <not>
  -                         <available 
classname="org.apache.xml.resolver.Resolver"/>
  -                             </not>
  -                     </condition>
  -             </fail>
                <fail message="Please download the JDO 1.0.1 reference 
implementation from 
http://jcp.org/aboutJava/communityprocess/final/jsr012/index2.html and copy the 
jdo.jar, jdori.jar and jdori-enhancer.jar contained in the reference 
implementation binary archive, into OJB's lib directory.">
                <condition>
                        <not>
  @@ -785,6 +771,21 @@
       <!-- ================================================================== 
-->
       <target name="doc" depends="prepare,javadoc"
               description="Builds the complete documentation using Forrest">
  +        <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>
  +                    <isset property="env.FORREST_HOME"/>
  +                </not>
  +            </condition>
  +        </fail>
  +        <fail message="Please make the Apache XML Commons Resolver library 
available in the classpath, e.g. by copying the xml-commons-resolver jar file 
from the 'tools/ant/lib' subdirectory of your Forrest installation 
(${env.FORREST_HOME}/tools/ant/lib) into the lib subdirectory of your Ant 
installation (${env.ANT_HOME}/lib).">
  +            <condition>
  +                <not>
  +                    <available classname="org.apache.xml.resolver.Resolver"/>
  +                </not>
  +            </condition>
  +        </fail>
  +
           <echo message="*** Preparing generation of documentation ..."/>
   
           <delete dir="${build.doc}" failonerror="false"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to