Changeset 10685

Timestamp:

2005-10-04T17:12:09+13:00 (18 years ago)

Author:

kjdon

Message:

moved the mysql set password bit into the install target (instead of prepare target, so only get prompted for password once. prepare-for-dist and install-for-dist can now use the modified prepare-mysql and configure-mysql

File:

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

trunk/gsdl3/build.xml

@@ -217 +217 @@
     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="install" depends="init,configure,configure-c++,compile,deploy-localsite" 
+  <target name="install" depends="init,configure-mysql,configure,configure-c++,compile,deploy-localsite" 
     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
   
@@ -580 +580 @@
 
   <!-- this is one target that we only want to run once. -->
-  <target name="prepare-mysql" depends="init,init-mysql-vars,install-mysql,start-mysql,setup-mysql,set-mysql-account-passwords,stop-mysql"/>
+  <target name="prepare-mysql" depends="init,init-mysql-vars,install-mysql,start-mysql,setup-mysql,stop-mysql-no-password"/>
 
   <target name="init-mysql-vars">
@@ -633 +633 @@
    </target>
  
+  <target name="configure-mysql" depends="init,init-mysql-vars,start-mysql,set-mysql-account-passwords,stop-mysql" description="sets up the mysql account passwords"/>
+  
   <target name="get-mysql-root-password" depends="init,init-mysql-vars" if="mysql.islocal.usepassword">
      <condition property="ask.root.password">
@@ -1411 +1413 @@
     <antcall target="unzip-windows-packages"/>
     <antcall target="get-windows-binaries"/>
-    <antcall target="install-mysql"/>
-    <antcall target="start-mysql"/>
-    <antcall target="setup-mysql"/>
-    <antcall target="stop-mysql-no-password"/>
+    <antcall target="prepare-mysql"/>
     <antcall target="prepare-tomcat"/>
     <antcall target="configure-tomcat"/>
@@ -1436 +1435 @@
   </target>
 
-  <target name="install-for-dist" depends="accept-properties,init,start-mysql,set-mysql-account-passwords,stop-mysql,configure,configure-tomcat">
+  <target name="install-for-dist" depends="accept-properties,init,configure-mysql,configure,configure-tomcat">
     
   </target>