Changeset 9730

Timestamp:

2005-04-22T13:30:46+12:00 (19 years ago)

Author:

kjdon

Message:

some mods for windows

File:

• branches/ant-install-branch/gsdl3/build.xml (modified) (9 diffs)

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

@@ -149 +149 @@
   </path>
 
-  <!-- do we need this? copied from gs3-setup.sh -->
   <path id="running.path">
     <pathelement location="${mysql.home}/bin"/>
@@ -156 +155 @@
     <pathelement location="${basedir}/lib"/>
     <pathelement path="${env.PATH}"/>
+    <pathelement path="${env.Path}"/>
   </path>
 
@@ -424 +424 @@
   <target name="startup-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal">
     <property name="tomcat.classpath" refid="compile.classpath"/>
-    <property name="tomcat.path" value="${basedir}/packages/mysql/bin:${basedir}/bin/script:${basedir}/bin:${env.PATH}"/>
+    <property name="tomcat.path" refid="running.path"/>
     <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
     <exec executable="${catalina.home}/bin/startup.sh" os="${os.linux}" dir="${catalina.home}/bin" spawn="false">
@@ -434 +434 @@
       <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${basedir}/lib:${mysql.home}/lib/mysql"/>
     </exec>
-    <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false">
+    <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true">
       <env key="GSDLOS" value="windows"/>
       <env key="GSDL3HOME" value="${basedir}"/>
-      <env key="PATH" path="${tomcat.path}:${basedir}/lib"/>
+      <env key="Path" path="${tomcat.path}"/>
+      <env key="PATH" path="${tomcat.path}"/>
       <env key="CATALINA_OPTS" value="${catalina.opts}"/>
       <env key="CLASSPATH" path="${tomcat.classpath}"/>
@@ -509 +510 @@
   </target>
  
- <target name="install-mysql" depends="init,install-mysql-linux,install-mysql-windows"/>
+ <target name="install-mysql" depends="init,init-mysql-vars,install-mysql-linux,install-mysql-windows"/>
   
   <!-- install and set up the database -->
-  <target name="install-mysql-linux" depends="init" if="mysql.islocal.linux" unless="mysql.present">
+  <target name="install-mysql-linux" depends="init,init-mysql-vars" if="mysql.islocal.linux" unless="mysql.present">
     <get src="http://www.greenstone.org/gs3files/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
       dest="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
@@ -540 +541 @@
   </target>
 
-  <target name="install-mysql-windows" depends="init" if="mysql.islocal.windows" unless="mysql.present">
-    <get src="http://www.greenstone.org/gs3files/mysql-essential-4.1.11-win32.msi"
-      dest="${packages.home}/mysql-essential-4.1.11-win32.msi"
+  <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"
+      dest="${packages.home}/mysql-noinstall-4.1.11-win32.zip"
       usetimestamp="true"/>
-   <!-- can we run the installer?? -->
+    <!-- can we run the installer?? -->
+    <unzip src="${packages.home}/mysql-noinstall-4.1.11-win32.zip"
+      dest="${packages.home}"/>
+    <move todir="${packages.home}/mysql">
+      <fileset dir="${packages.home}/mysql-noinstall-4.1.11-win32"/>
+    </move>
   </target>
 
   <!-- is this just linux or both??. also we probably need to do this for external mysql -->
-  <target name="setup-mysql" if="mysql.islocal" unless="mysql.present">
+  <!-- had unless mysql.present -->
+  <target name="setup-mysql" depends="init,init-mysql-vars" if="mysql.islocal">
     <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
       <arg value="--user=root"/>
@@ -571 +578 @@
     </exec>
   </target>
-
-
-  <!-- mysql targets -->
-  <!-- windows:
-    cd %GSDL3HOME%\packages\mysql
-    start bin\mysqld
-    cd %GSDL3HOME%
--->
-  <target name="startup-mysql" depends="init" if="mysql.islocal"
+ 
+  <target name="startup-mysql" depends="init,init-mysql-vars" if="mysql.islocal"
     description="Startup only mysql">
     <exec executable="${mysql.home}/bin/mysqld_safe" dir="${mysql.home}"
@@ -590 +590 @@
       <arg value="--err-log=./var/log/mysql.log"/>
     </exec>
+   <exec executable="${mysql.home}/bin/mysqld" dir="${mysql.home}" spawn="true" os="${os.windows}">
+    </exec>
     <sleep seconds="2"/>
     <!-- need to test that the server has started up -->    
@@ -600 +602 @@
   </target>
 
-  <target name="shutdown-mysql" depends="init" if="mysql.islocal"
+    <target name="shutdown-mysql" depends="init" if="mysql.islocal"
     description="Shutdown only mysql">
     <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"