Changeset 10235 for trunk/gsdl3

Timestamp:

2005-07-08T16:09:48+12:00 (19 years ago)

Author:

kjdon

Message:

a few changes to make nocvs.mode work better, also a couple of changes for Java 1.5

File:

• trunk/gsdl3/build.xml (modified) (5 diffs)

trunk/gsdl3/build.xml

@@ -89 +89 @@
     <os family="unix"/>
   </condition>
-
+  
   <condition property="current.os.isunixnotmac">
     <and>
       <os family="unix"/>
       <not>
-      <os family="mac"/>
+    <os family="mac"/>
       </not>
     </and>
@@ -101 +101 @@
     <os family="mac"/>
   </condition>
-
+  
   <condition property="current.os.iswindows">
     <os family="windows"/>
@@ -396 +396 @@
       dest="${collect.dir}/gberg/index"/>
     <mkdir dir="${web.home}/applet"/>
-  </target>
-
+
+    <condition property="need.xml.jars">
+      <equals arg1="1.5" arg2="${ant.java.version}"/>
+    </condition>
+    <antcall target="rename-xml-jars"/>
+  </target>
+  
+  <target name="rename-xml-jars" if="need.xml.jars">
+    <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
+    <copy file="${web.lib}/xercesImpl.jar.tmp" tofile="${web.lib}/xercesImpl.jar"/>
+  </target>
   <target name="configure-web" depends="configure-web-gsdl3,configure-web-server"
     description="Configure only the web app config files"/>
@@ -923 +932 @@
   </target>
 
-  <target name="prepare-mgpp" depends="check-cvsroot,init" unless="mgpp.present">
+  <target name="checkout-mgpp" depends="check-cvsroot,init" unless="nocvs.mode">
     <cvs command="checkout -P" package="mgpp" dest="${basedir}/packages/"/>
+  </target>
+  
+  <target name="prepare-mgpp" depends="init" unless="mgpp.present">
+    <antcall target="checkout-mgpp"/>
   </target>
 
@@ -1131 +1144 @@
     
   </target>
-  <target name="prepare-gli" depends="check-cvsroot,init" if="gsdl2.islocal" unless="gli.present">
+  <target name="prepare-gli" depends="init" if="gsdl2.islocal" unless="gli.present">
+    <antcall target="checkout-gli"/>
+  </target>
+  
+  <target name="checkout-gli" depends="check-cvsroot,init" if="gsdl2.islocal" unless="nocvs.mode">
     <echo>checking out gli</echo>
     <cvs command="checkout -P" package="gli"/>