Changeset 10801

Timestamp:

2005-11-01T11:24:43+13:00 (18 years ago)

Author:

kjdon

Message:

mysql datadir is now a property and can be set in build.properties. if you are installing on an NFS drive in linux, then it seems to have problems with removing locks after the program has shut down. you need to put the data directory in a local drive

Location:

trunk/gsdl3

Files:

• build.properties (modified) (1 diff)
• build.xml (modified) (5 diffs)

trunk/gsdl3/build.properties

@@ -37 +37 @@
 #Should passwords be set for the root and greenstone mysql users?
 mysql.use.passwords=yes
-
+## If you are installing greenstone (including mysql) in an nfs directory, mysql may not work. The data directory needs to be on a local drive - set the location here
+#mysql.datadir=
 ## Mysql user passwords: uncomment and set the following if you don't want to be prompted for them during installation
 #The root password for a local mysql installation

trunk/gsdl3/build.xml

@@ -120 +120 @@
   <property name="gsdl-as.home" value="${packages.home}/gsdl-as"/>
 
+  <property name="mysql.datadir" value="./data"/>
 <!--  ==================== Compilation Control Options ==================== -->
 
@@ -692 +693 @@
     
     <exec executable="${mysql.home}/scripts/mysql_install_db" dir="${mysql.home}">
-      <arg value="--datadir=./data"/>
+      <arg value="--datadir=${mysql.datadir}"/>
       <arg value="--basedir=."/>
       <arg value="--user=root"/>
@@ -721 +722 @@
     <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="--datadir=${mysql.datadir}"/>
       <arg value="--basedir=."/>
       <!--<arg value="- -user=root"/>
@@ -785 +786 @@
     <exec executable="${mysql.home}/bin/mysqld_safe" dir="${mysql.home}"
       spawn="true" os="${os.linux},${os.mac}">
-      <arg value="--datadir=./data"/>
+      <arg value="--datadir=${mysql.datadir}"/>
       <arg value="--basedir=."/>
       <arg value="--pid_file=gsdl3.pid"/>
@@ -1486 +1487 @@
     <antcall target="prepare-mysql"/>
     <delete file="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"/>
+    <delete file="${packages.home}/mysql-standard-4.1.12-apple-darwin7.9.0-powerpc.tar.gz"/>
+    <delete file="${packages.home}/mysql-noinstall-4.1.11-win32.zip"/>
     <delete dir="${packages.home}/mysql/sql-bench"/>
     <delete dir="${packages.home}/mysql/tests"/>
     <delete dir="${packages.home}/mysql/mysql-test"/>
+    <delete file="${packages.home}/mysql/var/log/mysql.log"/>
     <antcall target="prepare-tomcat"/>
     <delete file="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7.zip"/>