Changeset 10197

Timestamp:

2005-06-30T17:12:37+12:00 (19 years ago)

Author:

kjdon

Message:

a bit of mac stuff for mysql

File:

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

trunk/gsdl3/build.xml

@@ -89 +89 @@
     <os family="unix"/>
   </condition>
+
+  <condition property="current.os.isunixnotmac">
+    <and>
+      <os family="unix"/>
+      <not>
+      <os family="mac"/>
+      </not>
+    </and>
+  </condition>
+  <condition property="current.os.ismac">
+    <os family="mac"/>
+  </condition>
+
   <condition property="current.os.iswindows">
     <os family="windows"/>
   </condition>
+
   <!-- ============= Base dirs for each package and component ============ -->
   <property name="applet.home" value="${src.home}/org/greenstone/applet"/>
@@ -191 +205 @@
   <target name="test-setup">
     <echo>ant java version=${ant.java.version}</echo>
-    <echo>is linux : ${current.os.isunixx}</echo>
+    <echo>is linux : ${current.os.isunix}</echo>
+    <echo>is mac : ${current.os.ismac}</echo>
+    <echo>is unixnotmac : ${current.os.isunixnotmac}</echo>
     <echo>is windows : ${current.os.iswindows}</echo>
   </target>
@@ -555 +571 @@
       <and>
     <isset property="mysql.islocal"/>
-    <isset property="current.os.isunixx"/>
+    <isset property="current.os.isunixnotmac"/>
       </and>
     </condition>
-
+    <condition property="mysql.islocal.mac">
+    <and>
+    <isset property="mysql.islocal"/>
+    <isset property="current.os.ismac"/>
+    </and>
+    </condition>       
     <condition property="mysql.islocal.windows">
       <and>
@@ -567 +588 @@
    </target>
  
- <target name="install-mysql" depends="init,init-mysql-vars,install-mysql-linux,install-mysql-windows"/>
+ <target name="install-mysql" depends="init,init-mysql-vars,install-mysql-linux,install-mysql-windows,install-mysql-mac"/>
   
   <!-- install and set up the database -->
@@ -598 +619 @@
   </target>
 
+
+  <!-- install and set up the database -->
+  <target name="install-mysql-mac" depends="init,init-mysql-vars" if="mysql.islocal.mac" unless="mysql.present">
+    <get src="http://www.greenstone.org/gs3files/mysql-standard-4.1.12-apple-darwin7.9.0-powerpc.tar.gz"
+      dest="${packages.home}/mysql-standard-4.1.12-apple-darwin7.9.0-powerpc.tar.gz"
+      usetimestamp="true"/>
+    <untar src="${packages.home}/mysql-standard-4.1.12-apple-darwin7.9.0-powerpc.tar.gz"
+      dest="${packages.home}"
+      compression="gzip"/>
+    <move todir="${packages.home}/mysql">
+      <fileset dir="${packages.home}/mysql-standard-4.1.12-apple-darwin7.9.0-powerpc"/>
+    </move>    
+    <!-- file permissions are screwed up, so make executables executable -->
+    <chmod file="${mysql.home}/scripts/mysql_install_db" perm="a+x"/>
+    <chmod perm="a+x">
+      <fileset dir="${mysql.home}/bin" />
+    </chmod>
+    <mkdir dir="${mysql.home}/var/"/> 
+    <mkdir dir="${mysql.home}/var/log/"/>
+    <chmod file="${mysql.home}/var/" perm="777" type="dir"/>
+    <chmod file="${mysql.home}/var/log/" perm="777" type="dir"/>
+    <exec executable="${mysql.home}/scripts/mysql_install_db" dir="${mysql.home}">
+      <arg value="--datadir=./data"/>
+      <arg value="--basedir=."/>
+      <!--<arg value="- -user=root"/>
+      <arg value="- -force"/>-->
+    </exec>
+  </target>
+
   <target name="install-mysql-windows" depends="init,init-mysql-vars" if="mysql.islocal.windows" unless="mysql.present">
     <get src="http://www.greenstone.org/gs3files/mysql-noinstall-4.1.11-win32.zip"
@@ -639 +689 @@
     description="Startup only mysql">
     <exec executable="${mysql.home}/bin/mysqld_safe" dir="${mysql.home}"
-      spawn="true" os="${os.linux}">
+      spawn="true" os="${os.linux},${os.mac}">
       <arg value="--user=root"/>
       <arg value="--datadir=./data"/>
@@ -663 +713 @@
     description="Shutdown only mysql">
     <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
-      failonerror="true" os="${os.linux}">
+      failonerror="true" os="${os.linux},{os.mac}">
       <arg value="--user=root"/>
       <arg value="--socket=/tmp/mysql.sock"/>