Changeset 10116

Timestamp:

2005-06-15T16:13:30+12:00 (19 years ago)

Author:

kjdon

Message:

made a few changes to the main targets: separated online and offline bits, install no longer does a cvs update or prepare - prepare needs to be run first, added some more descriptions

File:

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

trunk/gsdl3/build.xml

@@ -82 +82 @@
 
   <property name="os.linux" value="Linux"/> <!-- mac??-->
-  <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows XP, Windows NT,Windows ME"/> <!-- check this!!!-->
+  <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows XP,Windows NT,Windows ME"/> <!-- check this!!!-->
 
   <condition property="current.os.islinux">
@@ -187 +187 @@
   </path>
 
-  <target name="test-java">
-    <echo>${ant.java.version}</echo>
+  <target name="test-setup">
+    <echo>ant java version=${ant.java.version}</echo>
+    <echo>is linux : ${current.os.islinux}</echo>
+    <echo>is windows : ${current.os.iswindows}</echo>
   </target>
 <!-- ==================== Primary and Global Targets ============================= -->
@@ -194 +196 @@
   <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
 
-  <target name="install" depends="accept-properties,init,prepare,cvsupdate,configure,clean,compile,deploy-localsite" 
-    description="Install Greenstone 3. Use this when you first checkout the code. Also running this target later on will reinstall Greenstone. Most things will be reset back to their defaults, except for code changes."/>
-
-  <target name="prepare" depends="init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-web"/>
-
+  <target name="install" depends="init,configure,configure-c++,compile,deploy-localsite" 
+    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
+
+  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-web"
+    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this."/>
+  
   <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
-    description="Do a cvs update for all sources. Doesn't recompile the code."/>
-
-    <target name="configure" depends="init,configure-tomcat,configure-web,configure-packages,configure-core,configure-gs2building"
-    description="Configure the installation. Includes setting up config files and configuring the C/C++ packages. This is called from install and update. Should be re-run if you change the build.properties file."/>
+    description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>
+
+  <target name="configure-c++" depends="init,configure-packages,configure-core,configure-gs2building"
+    description="Configure any C/C++ package code and gs2building code if necessary"/>
+  
+  <target name="configure" depends="init,configure-tomcat,configure-web"
+    description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/>
 
   <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building"
@@ -209 +215 @@
   <target name="clean-windows-c++" depends="init,clean-windows-c++-gs2building,clean-windows-c++-packages"
     description="Remove C++ compiled code for Windows. Requires Microsoft Visual Studio"/>
+  
   <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building"
     description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
+  
   <target name="compile-windows-c++" depends="init,compile-windows-c++-gs2building,compile-windows-c++-packages"
     description="Compile the C/C++ code for Windows. Requires Microsoft Visual Studio"/>
-  <target name="update" depends="init,update-packages,update-core,update-gs2building,update-web" 
-    description="Update (thru CVS) all the source (including core, packages and gs2building) and recompile. Similar to install but doesn't reinstall components such as Tomcat and axis."/>
+  
+  <target name="update" depends="init,cvsupdate,clean,configure,configure-c++,compile" 
+    description="Update (thru CVS) all the source (including core, packages and gs2building), then clean, configure and recompile."/>
 
   <target name="start" depends="init,start-mysql,start-tomcat"
@@ -222 +231 @@
     description="Shutdown the (local) Greenstone servers."/>
   
-  <target name="restart" description="Shutdown and restart the Greenstone servers" depends="init,stop,start"/>
+  <target name="restart" description="Shutdown and restart the (local) Greenstone servers" depends="init,stop,start"/>
 
 
@@ -230 +239 @@
     <echo message="  Execute 'ant -projecthelp' for a list of targets."/>
     <echo message="  Execute 'ant -help' for Ant help."/>
-    <echo>To install Greenstone, run 'ant [options] install'. 
+    <echo>To install Greenstone3, run 'ant [options] prepare install'. 
 There are properties defined in build.properties. The install process will ask you if these properties are set correctly. To avoid this prompt, use the '-Dproperties.accepted=yes' option.
 To log the output, use the '-logfile build.log' option.
+The README.txt file has more information about the ant targets and install process.
     </echo>
   </target>
@@ -274 +284 @@
     <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/>
   </target>
+
   <!-- this sets up some initial properties -->
   <target name="init">
@@ -370 +381 @@
   </target>
 
-  <target name="configure-web" depends="configure-web-gsdl3,configure-web-server"/>
+  <target name="configure-web" depends="configure-web-gsdl3,configure-web-server"
+    description="Configure only the web app config files"/>
   
   <target name="configure-web-gsdl3" depends="init">
@@ -397 +409 @@
   </target>
 
-  <target name="cvsupdate-web">
+  <target name="cvsupdate-web" unless="offline.mode">
     <cvs command="update -dP" dest="${web.home}"/>
   </target>
 
-  <target name="update-web" depends="init,cvsupdate-web,configure-web"/>
+  <target name="update-web" depends="init,cvsupdate-web,configure-web"
+    description="update only the web stuff (config files)"/>
+
 
 <!-- ======================= Tomcat Targets ========================== -->
@@ -632 +646 @@
     <sleep seconds="2"/>
     <!-- need to test that the server has started up -->    
+    <echo>testing mysql server</echo>
     <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}"
       failonerror="true" outputproperty="throw.away">
@@ -771 +786 @@
   
   <target name="configure-core"/>
+
   <target name="update-core" depends="init,cvsupdate-core,clean-core,compile-core"
     description="Update only the Greenstone core" />
   
-  <target name="cvsupdate-core">
+  <target name="cvsupdate-core" unless="offline.mode">
     <cvs command="update -l"/>
     <cvs command="update -dP bin comms dist-resources docs lib resources src winutil"/>
@@ -850 +866 @@
     description="Update only the packages"/>
 
-  <target name="cvsupdate-packages"> 
+  <target name="cvsupdate-packages" unless="offline.mode"> 
     <cvs command="update -dP" dest="${packages.home}"/>
   </target>
@@ -980 +996 @@
     description="Update only the Greenstone 2 building components"/>
 
-  <target name="cvsupdate-gs2building" if="gsdl2.islocal" depends="init">
+  <target name="cvsupdate-gs2building" if="gsdl2.islocal" depends="init" unless="offline.mode">
     <cvs command="update -dP" dest="${gli.home}"/>
     <!-- Note: can't do a -d update here cos it will get all of gsdl 
@@ -1180 +1196 @@
 
 
-  <target name="reconfigure-server-settings" depends="init,configure-tomcat,configure-web-server"
-    description="If you have changed any of the Tomcat properties in the build.properties file, run this target to update the Tomcat configuration, and any Greenstone configuration files that specify the server address">
-  </target>