Changeset 10678

Timestamp:

2005-10-03T16:45:10+13:00 (18 years ago)

Author:

kjdon

Message:

a few fixes for windows

File:

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

trunk/gsdl3/build.xml

@@ -284 +284 @@
 mysql.installed.path=${mysql.installed.path} (this is the location of mysql if it is already installed)
 mysql.port=${mysql.port}
-If these are not acceptable, please change them and rerun this target. Continue [y/n]?" />
+If these are not acceptable, please change them and rerun this target. Continue [y/n]? />
     </input>
-    <condition property="do.abort">
+    <condition property="do.abort"> 
       <equals arg1="n" arg2="${properties.ok}"/>
     </condition>
@@ -614 +614 @@
       </and>
     </condition>
-    <condition property="mysql.islocal.nopassword">
+     <condition property="mysql.islocal.usepassword.unix">
+      <and>
+    <isset property="mysql.islocal.usepassword"/>
+    <isset property="current.os.isunix"/>
+      </and>
+    </condition>
+   <condition property="mysql.islocal.nopassword">
       <and>
     <isset property="mysql.islocal"/>
@@ -809 +815 @@
   </target>
   
-  <target name="stop-mysql-use-password-linux" depends="init" if="mysql.islocal.usepassword">
+  <target name="stop-mysql-use-password-linux" depends="init" if="mysql.islocal.usepassword.unix">
     <echo>At the password prompt, enter the mysql root password.</echo>
     <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
@@ -821 +827 @@
   
   <target name="stop-mysql-use-password-windows" depends="init" if="mysql.islocal.usepassword.windows">
-    <andcall target="get-mysql-root-password"/>
+    <!--<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 specify the password for the root mysql user: this is to secure your database." if="ask.root.password" username="root" pwordproperty="mysql.root.password"/>
     <!-- on windows it doesn't work unless the password is specified here -->
     <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"