Changeset 9724 for branches/ant-install-branch/gsdl3

Timestamp:

2005-04-21T09:55:06+12:00 (19 years ago)

Author:

kjdon

Message:

more changes

File:

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

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

@@ -171 +171 @@
     description="Install Greenstone 3. Use this when you first checkout the code. Also running this target later on will reinstall Greenstone. Most things will be reset back to their defaults, except for code changes."/>
 
-  <target name="prepare" depends="init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-collections"/>
+  <target name="prepare" depends="init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-collections,prepare-extra"/>
 
   <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building"
@@ -260 +260 @@
     <available file="${basedir}/packages/mgpp/text" property="mgpp.present"/>
     <available file="${basedir}/packages/mysql/bin" property="mysql.present"/>
-    <available file="${basedir}/comms/jakarta/tomcat" property="tomcat.present"/>
     <available file="${basedir}/gli" property="gli.present"/>
     <available file="${basedir}/gs2build" property="gs2build.present"/>
@@ -339 +338 @@
   </target>
 
-  
+  <target name="prepare-extra" depends="init">
+    <!--  copy some jar files to web/lib for the phind applet -->
+    <copy file="${catalina.home}/common/endorsed/xml-apis.jar"
+      tofile="${basedir}/web/lib/xml-apis.jar"/>
+    <copy file="${catalina.home}/common/endorsed/xercesImpl.jar"
+      tofile="${basedir}/web/lib/xercesImpl.jar"/>
+  </target>
   <target name="configure-files" depends="init">
     <filter token="port" value="${tomcat.port}"/>
@@ -787 +792 @@
   <!-- these targets refer to the greenstone packages - these need updating 
   less often, so are in  separate targets to the core -->
-  <target name="prepare-packages" depends="init,prepare-mgpp"/>
-  
+  <target name="prepare-packages" depends="init,prepare-mgpp,prepare-windows"/>
+  
+  <target name="prepare-windows" depends="init" if="current.os.iswindows">
+    <!-- need to download precompiled binaries for mg and mgpp -->
+  </target>
   <target name="prepare-mgpp" depends="check-cvsroot,init" unless="mgpp.present">
     <cvs command="checkout -P" package="mgpp" dest="${basedir}/packages/"/>
@@ -840 +848 @@
   <target name="compile-packages"
     description="Compile only the packages">
-    <!-- mg -->
     <echo>Compiling MG</echo>
-    <!-- make the c code -->
     <exec executable="make" os="${os.linux}"
        dir="${mg.home}">
@@ -850 +856 @@
       <arg value="install"/>
     </exec>
-
+    <!-- windows: just the java stuff. -->
+    <exec executable="${mg.home}/winMake.bat" os="${os.windows}"
+      dir="${mg.home}">
+      <arg value="compile"/>
+      <arg value="javaonly"/>
+    </exec>
+    <exec executable="${mg.home}/winMake.bat" os="${os.windows}"
+      dir="${mg.home}">
+      <arg value="install"/>
+      <arg value="javaonly"/>
+    </exec>
+    
     <!-- mgpp -->
     <echo>Compiling MGPP</echo>
@@ -859 +876 @@
       dir="${mgpp.home}">
       <arg value="install"/>
+    </exec>
+    <!-- windows: just the java stuff. -->
+    <exec executable="${mgpp.home}/winMake.bat" os="${os.windows}"
+      dir="${mgpp.home}">
+      <arg value="compile"/>
+      <arg value="javaonly"/>
+    </exec>
+    <exec executable="${mgpp.home}/winMake.bat" os="${os.windows}"
+      dir="${mgpp.home}">
+      <arg value="install"/>
+      <arg value="javaonly"/>
     </exec>