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 Tue, 18 May 2004 18:23:09 GMT
tomdz       2004/05/18 11:23:09

  Modified:    .        build.xml
  Log:
  Added os-dependent execution of forrest
  
  Revision  Changes    Path
  1.127     +45 -4     db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- build.xml	18 May 2004 15:51:03 -0000	1.126
  +++ build.xml	18 May 2004 18:23:09 -0000	1.127
  @@ -642,11 +642,52 @@
   	    <copy file="${src.static.files}/OJB.properties" tofile="${temp.forrest.dir}/OJB.properties.txt"
/>
   	    <copy file="release-notes.txt" tofile="${temp.forrest.dir}/release-notes.txt" />
   
  -        <exec executable="forrest"
  -              dir="forrest">
  -        </exec>
  +        <!-- 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>
  +        <antcall target="forrest-on-win-with-cmd"/>
  +        <antcall target="forrest-on-win-with-command"/>
  +        <antcall target="forrest-on-unix"/>
       </target>
   
  +    <target name="forrest-on-win-with-cmd" if="windows.with.cmd">
  +        <exec dir="forrest" executable="cmd">
  +            <arg line="/c forrest.bat"/>
  +        </exec>
  +    </target>
  +    <target name="forrest-on-win-with-command" if="windows.with.command">
  +        <exec dir="forrest" executable="command">
  +            <arg line="/c forrest.bat"/>
  +        </exec>
  +    </target>
  +    <target name="forrest-on-unix" if="not.windows">
  +        <exec dir="forrest" executable="forrest"/>
  +    </target>
  +            
       <!-- ================================================================== -->
       <!-- Build the html-documentation                                       -->
       <!-- ================================================================== -->
  
  
  

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