Changeset 10773 for trunk/gsdl3/build.xml

Timestamp:

2005-10-26T13:40:16+13:00 (18 years ago)

Author:

kjdon

Message:

added a help message for the get password targets, also shifted the password prompt for windows stopping mysql into a new target - get-mysql-root-password-windows

File:

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

trunk/gsdl3/build.xml

@@ -651 +651 @@
   
   <target name="get-mysql-root-password" depends="init,init-mysql-vars" if="mysql.islocal.usepassword" unless="mysql.root.password">
+    <echo>(Enter password in the Java popup)</echo>
     <getuserandpassword message="Please specify a password for the root mysql user: this is to secure your database."  username="root" pwordproperty="mysql.root.password"/>
   </target>
   
+  <target name="get-mysql-root-password-windows" depends="init,init-mysql-vars" if="mysql.islocal.usepassword.windows" unless="mysql.root.password">
+    <echo>(Enter password in the Java popup)</echo>
+    <getuserandpassword message="Please enter the mysql root password"  username="root" pwordproperty="mysql.root.password"/>
+  </target>
+  
   <target name="get-mysql-reader-password" depends="init,init-mysql-vars" if="mysql.islocal.usepassword" unless="mysql.reader.password" >
+    <echo>(Enter password in the Java popup)</echo>
     <getuserandpassword message="Please specify the password for the gsdl3reader mysql user: this is used by greenstone" username="gsdl3reader" pwordproperty="mysql.reader.password"/>
   </target>
   
   <target name="get-mysql-admin-password" depends="init,init-mysql-vars" if="mysql.islocal.usepassword" unless="mysql.admin.password" >
+    <echo>(Enter password in the Java popup)</echo>
     <getuserandpassword message="Please specify the password for the gsdl3admin mysql user: this is used by greenstone" username="gsdl3admin" pwordproperty="mysql.admin.password"/>
   </target>
@@ -836 +844 @@
   </target>
   
-  <target name="stop-mysql-use-password-windows" depends="init" if="mysql.islocal.usepassword.windows">
-    <!--<antcall target="get-mysql-root-password"/>
-    antcall doesn't set the property in teh callign project. if put this in the depends list, it will always be called, even if not windows. so copy it in here.-->
-     <condition property="ask.root.password">
-      <or>
-    <not>
-      <isset property="mysql.root.password"/>
-    </not>
-    <equals arg1="" arg2="${mysql.root.password}"/>
-      </or>
-    </condition>
-    <getuserandpassword message="Please enter the mysql root password:" if="ask.root.password" username="root" pwordproperty="mysql.root.password"/>
+  <target name="stop-mysql-use-password-windows" depends="init,get-mysql-root-password-windows" if="mysql.islocal.usepassword.windows">
     <!-- on windows it doesn't work unless the password is specified here -->
     <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"