Changeset 9717

Timestamp:

2005-04-19T11:31:23+12:00 (19 years ago)

Author:

kjdon

Message:

made the configure-tomcat if property tomcat.islocal instead of tomcat.present - this will be false when you first run install, and configure files wont get run.

File:

• branches/ant-install-branch/gsdl3/build.xml (modified) (2 diffs)

branches/ant-install-branch/gsdl3/build.xml

@@ -369 +369 @@
 
   <!-- this target sets up tomcat for the first time, or resets it any subsequent times -->
-  <target name="prepare-tomcat" depends="init,setup-proxy">
+  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal">
     <get src="http://www.greenstone.org/gs3files/jakarta-tomcat-5.5.7.zip"
       dest="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7.zip"
@@ -400 +400 @@
   </target>
   
-  <target name="configure-tomcat" depends="init" if="tomcat.present">
+  <target name="configure-tomcat" depends="init" if="tomcat.islocal">
     <!-- re-setup the server.xml file -->
     <copy file="${basedir}/comms/jakarta/server.xml.in" tofile="${basedir}/comms/jakarta/tomcat/conf/server.xml" overwrite="true">