Changeset 10699

Timestamp:

2005-10-06T15:19:18+13:00 (18 years ago)

Author:

kjdon

Message:

some fixes for Mac OS X

File:

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

trunk/gsdl3/build.xml

@@ -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,stop-mysql-no-password"/>
+  <target name="prepare-mysql" depends="init,init-mysql-vars,install-mysql,start-mysql,setup-mysql,stop-mysql-no-password-force"/>
 
   <target name="init-mysql-vars">
@@ -798 +798 @@
   </target>
 
-  <target name="stop-mysql" depends="init,init-mysql-vars,stop-mysql-use-password-linux,stop-mysql-use-password-windows,stop-mysql-no-password" if="mysql.islocal"
+  <target name="stop-mysql" depends="init,init-mysql-vars,stop-mysql-use-password-unix,stop-mysql-use-password-windows,stop-mysql-no-password" if="mysql.islocal"
     description="Shutdown only mysql">
     <echo>MYSQL database server shutdown successfully</echo>
@@ -805 +805 @@
   <target name="stop-mysql-no-password" depends="init" if="mysql.islocal.nopassword">
     <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
-      failonerror="true" os="${os.linux},{os.mac}">
+      failonerror="true" os="${os.linux},${os.mac}">
       <arg value="--user=root"/>
       <arg value="--socket=/tmp/mysql.sock"/>
@@ -817 +817 @@
   </target>
   
-  <target name="stop-mysql-use-password-linux" depends="init" if="mysql.islocal.usepassword.unix">
+  <target name="stop-mysql-no-password-force" depends="init">
+    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
+      failonerror="true" os="${os.linux},${os.mac}">
+      <arg value="--user=root"/>
+      <arg value="--socket=/tmp/mysql.sock"/>
+      <arg value="shutdown"/>
+    </exec>
+    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
+      failonerror="true" os="${os.windows}">
+      <arg value="--user=root"/>
+      <arg value="shutdown"/>
+    </exec>
+  </target>
+  
+  <target name="stop-mysql-use-password-unix" 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}"
-      failonerror="true" os="${os.linux},{os.mac}">
+      failonerror="true" os="${os.linux},${os.mac}">
       <arg value="--user=root"/>
       <arg value="-p"/>
@@ -1208 +1222 @@
     <antcall target="unzip-windows-packages"/>
     <antcall target="get-windows-binaries"/>
+    <antcall target="get-macos-extra"/>
   </target>
 
@@ -1233 +1248 @@
     dest="${gs2build.home}/packages/windows/expat"/>
    </target>
-
+   <target name="get-macos-extra" depends="init" if="current.os.ismac"> 
+      <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
+      dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
+      usetimestamp="true"/>
+      <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
+         dest="${gs2build.home}/perllib/cpan/"
+     compression="gzip"/>
+   </target>  
   <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows"/>
 
@@ -1341 +1363 @@
 
   <target name="gli-local" depends="init" if="gsdl2.islocal">
-    <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux},${os.mac}" dir="${basedir}/gli" spawn="true">
+    <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux}" dir="${basedir}/gli" spawn="true">
       <env key="gsdl3path" path="${basedir}"/>
       <env key="gsdlpath" path="${basedir}/gs2build"/>
+    </exec>
+    <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.mac}" dir="${basedir}/gli" spawn="true">
+      <env key="gsdl3path" path="${basedir}"/>
+      <env key="gsdlpath" path="${basedir}/gs2build"/>
+      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.installed.path}/lib"/>
     </exec>
     <exec executable="${basedir}/gli/gli4gs3.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true">