Ignore:
Timestamp:
2005-10-06T15:19:18+13:00 (18 years ago)
Author:
kjdon
Message:

some fixes for Mac OS X

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/build.xml

    r10685 r10699  
    580580
    581581  <!-- this is one target that we only want to run once. -->
    582   <target name="prepare-mysql" depends="init,init-mysql-vars,install-mysql,start-mysql,setup-mysql,stop-mysql-no-password"/>
     582  <target name="prepare-mysql" depends="init,init-mysql-vars,install-mysql,start-mysql,setup-mysql,stop-mysql-no-password-force"/>
    583583
    584584  <target name="init-mysql-vars">
     
    798798  </target>
    799799
    800   <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"
     800  <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"
    801801    description="Shutdown only mysql">
    802802    <echo>MYSQL database server shutdown successfully</echo>
     
    805805  <target name="stop-mysql-no-password" depends="init" if="mysql.islocal.nopassword">
    806806    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
    807       failonerror="true" os="${os.linux},{os.mac}">
     807      failonerror="true" os="${os.linux},${os.mac}">
    808808      <arg value="--user=root"/>
    809809      <arg value="--socket=/tmp/mysql.sock"/>
     
    817817  </target>
    818818 
    819   <target name="stop-mysql-use-password-linux" depends="init" if="mysql.islocal.usepassword.unix">
     819  <target name="stop-mysql-no-password-force" depends="init">
     820    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
     821      failonerror="true" os="${os.linux},${os.mac}">
     822      <arg value="--user=root"/>
     823      <arg value="--socket=/tmp/mysql.sock"/>
     824      <arg value="shutdown"/>
     825    </exec>
     826    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
     827      failonerror="true" os="${os.windows}">
     828      <arg value="--user=root"/>
     829      <arg value="shutdown"/>
     830    </exec>
     831  </target>
     832 
     833  <target name="stop-mysql-use-password-unix" depends="init" if="mysql.islocal.usepassword.unix">
    820834    <echo>At the password prompt, enter the mysql root password.</echo>
    821835    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
    822       failonerror="true" os="${os.linux},{os.mac}">
     836      failonerror="true" os="${os.linux},${os.mac}">
    823837      <arg value="--user=root"/>
    824838      <arg value="-p"/>
     
    12081222    <antcall target="unzip-windows-packages"/>
    12091223    <antcall target="get-windows-binaries"/>
     1224    <antcall target="get-macos-extra"/>
    12101225  </target>
    12111226
     
    12331248    dest="${gs2build.home}/packages/windows/expat"/>
    12341249   </target>
    1235 
     1250   <target name="get-macos-extra" depends="init" if="current.os.ismac">
     1251      <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
     1252      dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
     1253      usetimestamp="true"/>
     1254      <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
     1255         dest="${gs2build.home}/perllib/cpan/"
     1256     compression="gzip"/>
     1257   </target> 
    12361258  <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows"/>
    12371259
     
    13411363
    13421364  <target name="gli-local" depends="init" if="gsdl2.islocal">
    1343     <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux},${os.mac}" dir="${basedir}/gli" spawn="true">
     1365    <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux}" dir="${basedir}/gli" spawn="true">
    13441366      <env key="gsdl3path" path="${basedir}"/>
    13451367      <env key="gsdlpath" path="${basedir}/gs2build"/>
     1368    </exec>
     1369    <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.mac}" dir="${basedir}/gli" spawn="true">
     1370      <env key="gsdl3path" path="${basedir}"/>
     1371      <env key="gsdlpath" path="${basedir}/gs2build"/>
     1372      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.installed.path}/lib"/>
    13461373    </exec>
    13471374    <exec executable="${basedir}/gli/gli4gs3.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true">
Note: See TracChangeset for help on using the changeset viewer.