Changeset 9622

Timestamp:

2005-04-11T14:31:31+12:00 (19 years ago)

Author:

kjdon

Message:

rearranged the startup targets, added mysql into the prepare target, added a few properties to the build.properties

Location:

branches/ant-install-branch/gsdl3

Files:

• build.properties (modified) (1 diff)
• build.xml (modified) (10 diffs)

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

@@ -14 +14 @@
 # The port number that tomcat is/will be run on
 tomcat.port=7070
+# If tomcat is already running, enter the path to the base directory here
+tomcat.installed.path=
 
 ## Greenstone 2 collection building options
 #The path to Greenstone 2 if it is already installed
-gsdl.path=
+gsdl.installed.path=
+
+## Relational database 
+mysql.installed.path=
 
 ## Proxy setup - if Greenstone 3 is running behind a firewall

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

@@ -190 +190 @@
 tomcat.server=${tomcat.server}
 tomcat.port=${tomcat.port} 
-gsdl.path=${gsdl.path} (this is the location of Greenstone 2 if you have it)
+tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed)
+gsdl.installed.path=${gsdl.installed.path} (this is the location of Greenstone 2 if you have it)
 proxy.host=${proxy.host}
 proxy.port=${proxy.port}
@@ -223 +224 @@
       <or>
     <not>
-      <isset property="gsdl.path"/>
+      <isset property="gsdl.installed.path"/>
     </not>
-    <equals arg1="" arg2="${gsdl.path}"/>
+    <equals arg1="" arg2="${gsdl.installed.path}"/>
+      </or>
+    </condition>
+    <condition property="mysql.islocal">
+      <or>
+    <not>
+      <isset property="mysql.installed.path"/>
+    </not>
+    <equals arg1="" arg2="${mysql.installed.path}"/>
+      </or>
+    </condition>
+    <condition property="tomcat.islocal">
+      <or>
+    <not>
+      <isset property="tomcat.installed.path"/>
+    </not>
+    <equals arg1="" arg2="${tomcat.installed.path}"/>
       </or>
     </condition>
@@ -249 +266 @@
 
  <!-- this is all the do-once things -->
-  <target name="prepare" depends="init,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-collections">
+  <target name="prepare" depends="init,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-collections">
   </target>
   
@@ -335 +352 @@
   
   <!-- this is one target that we only want to run once. -->
-  <target name="prepare-mysql" depends="init,install-mysql-linux,install-mysql-windows,startup-mysql" unless="mysql.present">
+  <target name="prepare-mysql" depends="init,install-mysql,startup-mysql" if="mysql.islocal" unless="mysql.present">
     <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
       <arg value="--user=root"/>
@@ -359 +376 @@
   </target>
 
+  <target name="install-mysql" depends="init,install-mysql-linux,install-mysql-windows" if="mysql.islocal"/>
+  
   <!-- install and set up the database -->
-  <target name="install-mysql-linux" depends="init" if="current.os.islinux" unless="mysql.present4">
+  <target name="install-mysql-linux" depends="init" if="current.os.islinux" unless="mysql.present">
     <get src="http://www.greenstone.org/gs3files/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
       dest="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
@@ -680 +699 @@
   <target name="rename-gs2build-files">
     <copy file="${gs2build.home}/configure.gs2build" tofile="${gs2build.home}/configure"/>    
+    <chmod file="${gs2build.home}/configure" perm="a+x"/>
     <copy file="${gs2build.home}/configure.in.gs2build" tofile="${gs2build.home}/configure.in"/>
     <copy file="${gs2build.home}/Makefile.in.gs2build" tofile="${gs2build.home}/Makefile.in"/>  
     <copy file="${gs2build.home}/packages/configure.gs2build" tofile="${gs2build.home}/packages/configure"/>
+    <chmod file="${gs2build.home}/packages/configure" perm="a+x"/>
     <copy file="${gs2build.home}/packages/Makefile.gs2build" tofile="${gs2build.home}/packages/Makefile"/>
     <copy file="${gs2build.home}/lib/Makefile.in.gs2build" tofile="${gs2build.home}/lib/Makefile.in"/>  
+    
   </target>
   <target name="prepare-gli" depends="init" if="gsdl2.islocal" unless="gli.present">
@@ -789 +811 @@
   </target>
 
-  <target name="startup" description="Launch Greenstone (Tomcat and Mysql)" depends="init">
+  <target name="startup" description="Launch the Greenstone servers (tomcat,mysql...)" depends="init,startup-mysql,startup-tomcat"/>
+
+  <target name="startup-tomcat" description="Launch Tomcat" depends="init" if="tomcat.islocal">
     <property name="tomcat.classpath" refid="compile.classpath"/>
     <property name="tomcat.path" value="${basedir}/packages/mysql/bin:${basedir}/bin/script:${basedir}/bin:${env.PATH}"/>
@@ -817 +841 @@
   </target>
 
-  <target name="shutdown" description="Shutdown Greenstone (Tomcat and Mysql)" depends="init">
+  <target name="shutdown" depends="init,shutdown-tomcat,shutdown-mysql" description="Shutdown all the local servers"/>
+  
+  <target name="shutdown-tomcat" description="Shutdown Greenstone (Tomcat and Mysql)" depends="init" if="tomcat.islocal">
     <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.linux}" dir="${catalina.home}/bin" spawn="false"/>
   </target>
@@ -925 +951 @@
 
   <!-- mysql targets -->
-  <target name="startup-mysql" depends="init">
+  <target name="startup-mysql" depends="init" if="mysql.islocal">
     <exec executable="${mysql.home}/bin/mysqld_safe" dir="${mysql.home}"
       spawn="true">
@@ -936 +962 @@
     </exec>
     <sleep seconds="2"/>
-  </target>
-
-  <target name="shutdown-mysql" depends="init">
-    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}">
+    <!-- need to test that the server has started up -->    
+    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}"
+      failonerror="true" outputproperty="throw.away">
+      <arg value="--user=root"/>
+      <arg value="--execute=show databases;"/>
+    </exec>
+    <echo>MYSQL database server started successfully</echo>
+  </target>
+
+  <target name="shutdown-mysql" depends="init" if="mysql.islocal">
+    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
+      failonerror="true">
       <arg value="--user=root"/>
       <arg value="--socket=/tmp/mysql.sock"/>
       <arg value="shutdown"/>
     </exec>
+    <echo>MYSQL database server shutdown successfully</echo>
   </target>