Ignore:
Timestamp:
2005-04-07T16:15:07+12:00 (19 years ago)
Author:
kjdon
Message:

now only copy the gs2build files, don't move. added in some mysql targets

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/ant-install-branch/gsdl3/build.xml

    r9572 r9589  
    214214   
    215215    <available file="${basedir}/packages/mgpp/text" property="mgpp.present"/>
     216    <available file="${basedir}/packages/mysql/bin" property="mysql.present"/>
    216217    <available file="${basedir}/comms/jakarta/tomcat" property="tomcat.present"/>
    217218    <available file="${basedir}/gli" property="gli.present"/>
    … …  
    333334  </target>
    334335 
    335   <target name="prepare-mysql" depends="init,install-mysql-linux,install-mysql-windows">
    336 
    337   </target>
    338 
    339   <target name="install-mysql-linux" depends="init" if="current.os.islinux">
    340     <echo>linux mysql</echo>
    341     <!-- get teh file -->
     336  <!-- this is one target that we only want to run once. -->
     337  <target name="prepare-mysql" depends="init,install-mysql-linux,install-mysql-windows,startup-mysql" unless="mysql.present">
     338    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
     339      <arg value="--user=root"/>
     340      <arg value="--execute=GRANT SELECT,INSERT,DELETE,UPDATE,DROP,CREATE ON *.* TO gsdl3admin@localhost;"/>
     341    </exec>
     342    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
     343      <arg value="--user=root"/>
     344      <arg value="--execute=GRANT SELECT,INSERT,DELETE,UPDATE,DROP,CREATE ON *.* TO gsdl3admin@'%'"/>
     345    </exec>
     346    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
     347      <arg value="--user=root"/>
     348      <arg value="--execute=GRANT SELECT ON *.* TO gsdl3reader@localhost;"/>
     349    </exec>
     350    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
     351      <arg value="--user=root"/>
     352      <arg value="--execute=create database localsite_gs3mgdemo;"/>
     353    </exec>
     354    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}"
     355      input="${basedir}/web/sites/localsite/collect/gs3mgdemo/mysqldatadump.sql">
     356      <arg value="--user=root"/>
     357      <arg value="localsite_gs3mgdemo"/>
     358    </exec>
     359  </target>
     360
     361  <!-- install and set up the database -->
     362  <target name="install-mysql-linux" depends="init" if="current.os.islinux" unless="mysql.present4">
     363    <get src="http://www.greenstone.org/gs3files/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
     364      dest="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
     365      usetimestamp="true"/>
    342366    <untar src="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
    343367      dest="${packages.home}"
    344368      compression="gzip"/>
    345     <move todir="${packages.dir}/mysql">
    346       <fileset dir="${packages.dir}/mysql-standard-4.1.11"/>
     369    <move todir="${packages.home}/mysql">
     370      <fileset dir="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686"/>
    347371    </move>
     372    <!-- file permissions are screwed up, so make executables executable -->
     373    <chmod file="${mysql.home}/scripts/mysql_install_db" perm="a+x"/>
     374    <chmod perm="a+x">
     375      <fileset dir="${mysql.home}/bin" />
     376    </chmod>
     377    <mkdir dir="${mysql.home}/var/"/>
     378    <mkdir dir="${mysql.home}/var/log/"/>
     379    <chmod file="${mysql.home}/var/" perm="777"/>
     380    <chmod file="${mysql.home}/var/log/" perm="777"/>
     381   
     382    <exec executable="${mysql.home}/scripts/mysql_install_db" dir="${mysql.home}">
     383      <arg value="--datadir=./data"/>
     384      <arg value="--basedir=."/>
     385      <arg value="--user=root"/>
     386      <arg value="--force"/>
     387    </exec>
    348388  </target>
    349389
    350390  <target name="install-mysql-windows" depends="init" if="current.os.iswindows">
    351     <echo>windows is true</echo>
     391    <get src="http://www.greenstone.org/gs3files/mysql-essential-4.1.11-win32.msi"
     392      dest="${packages.home}/mysql-essential-4.1.11-win32.msi"
     393      usetimestamp="true"/>
     394   <!-- can we run the installer?? -->
    352395  </target>
    353396
    … …  
    386429  <target name="clean-core"
    387430    description="Clean only the Greenstone core">
    388     <delete dir="${applet.home}/phind/classes"/>
    389     <delete file="${applet.home}/phind/phind.jar"/>
    390     <delete dir="${gsdl3.home}/classes"/>
    391     <delete file="${gsdl3.home}/gsdl3.jar"/>
     431    <delete dir="${build.home}"/>
    392432  </target>
    393433
    … …  
    639679
    640680  <target name="rename-gs2build-files">
    641     <move file="${gs2build.home}/configure.gs2build" tofile="${gs2build.home}/configure"/>   
    642     <move file="${gs2build.home}/configure.in.gs2build" tofile="${gs2build.home}/configure.in"/>
    643     <move file="${gs2build.home}/Makefile.in.gs2build" tofile="${gs2build.home}/Makefile.in"/> 
    644     <move file="${gs2build.home}/packages/configure.gs2build" tofile="${gs2build.home}/packages/configure"/>
    645     <move file="${gs2build.home}/packages/Makefile.gs2build" tofile="${gs2build.home}/packages/Makefile"/>
    646     <move file="${gs2build.home}/lib/Makefile.in.gs2build" tofile="${gs2build.home}/lib/Makefile.in"/> 
     681    <copy file="${gs2build.home}/configure.gs2build" tofile="${gs2build.home}/configure"/>   
     682    <copy file="${gs2build.home}/configure.in.gs2build" tofile="${gs2build.home}/configure.in"/>
     683    <copy file="${gs2build.home}/Makefile.in.gs2build" tofile="${gs2build.home}/Makefile.in"/> 
     684    <copy file="${gs2build.home}/packages/configure.gs2build" tofile="${gs2build.home}/packages/configure"/>
     685    <copy file="${gs2build.home}/packages/Makefile.gs2build" tofile="${gs2build.home}/packages/Makefile"/>
     686    <copy file="${gs2build.home}/lib/Makefile.in.gs2build" tofile="${gs2build.home}/lib/Makefile.in"/> 
    647687  </target>
    648688  <target name="prepare-gli" depends="init" if="gsdl2.islocal" unless="gli.present">
    … …  
    885925
    886926  <!-- mysql targets -->
    887  
     927  <target name="startup-mysql" depends="init">
     928    <exec executable="${mysql.home}/bin/mysqld_safe" dir="${mysql.home}"
     929      spawn="true">
     930      <arg value="--user=root"/>
     931      <arg value="--datadir=./data"/>
     932      <arg value="--basedir=."/>
     933      <arg value="--pid_file=gsdl3.pid"/>
     934      <arg value="--socket=/tmp/mysql.sock"/>
     935      <arg value="--err-log=./var/log/mysql.log"/>
     936    </exec>
     937    <sleep seconds="2"/>
     938  </target>
     939
     940  <target name="shutdown-mysql" depends="init">
     941    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}">
     942      <arg value="--user=root"/>
     943      <arg value="--socket=/tmp/mysql.sock"/>
     944      <arg value="shutdown"/>
     945    </exec>
     946  </target>
     947
    888948</project>
    889949
Note: See TracChangeset for help on using the changeset viewer.