Changeset 9516

Timestamp:

2005-03-30T15:55:58+12:00 (19 years ago)

Author:

kjdon

Message:

soem changes

File:

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

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

@@ -83 +83 @@
   <property name="applet.home" value="${src.home}/org/greenstone/applet"/>
   <property name="gsdl3.home" value="${src.home}/org/greenstone/gsdl3"/>
-  <property name="gs2extra.home" value="${basedir}/gs2extra"/>
+  <property name="gs2build.home" value="${basedir}/gs2building"/>
   <property name="vishnu.home" value="${packages.home}/vishnu"/>
   <property name="mg.home" value="${packages.home}/mg"/>
@@ -359 +359 @@
   <target name="install" depends="install-packages, install-gsdl3"
     description="install all binaries"/>
+  
   <target name="install-packages" depends="compile-packages"
     description="">
@@ -400 +401 @@
 <!-- ===================== setup target ===================== -->
   <target name="accept-properties">
-    <input addproperty="properties.ok" validargs="y,n">The following properties are being used from a build.properties file found in this directory:
-tomcat.servername=${tomcat.servername}, tomcat.port=${tomcat.port}, gsdl.path=${gsdl.path} (this is the location of Greenstone 2 if you have it).
+    <input addproperty="properties.ok" validargs="y,n">The following properties (among others) are being used from a build.properties file found in this directory:
+tomcat.server=${tomcat.server}
+tomcat.port=${tomcat.port} 
+gsdl.path=${gsdl.path} (this is the location of Greenstone 2 if you have it)
+proxy.host=${proxy.host}
+proxy.port=${proxy.port}
 If these are not acceptable, please change them and rerun this target. Continue [y/n]?" />
     </input>
@@ -425 +430 @@
     <available file="${basedir}/comms/jakarta/tomcat" property="tomcat.present"/>
     <available file="${basedir}/gli" property="gli.present"/>
-    <available file="${basedir}/gs2build" property="gs2build.present"/>
+    <available file="${basedir}/gs2building" property="gs2build.present"/>
     <available file="${basedir}/comms/soap/axis" property="axis.present"/>
     <available file="${basedir}/comms/jakarta/tomcat/webapps/axis" property="axis.installed"/>
@@ -437 +442 @@
     </condition>
     
-    <echo>tomcat.port:${tomcat.port}, gli.present:${gli.present} gsdlislocal=${gsdl2.islocal} gs2build.present=${gs2build.present} gsdl.path = ${gsdl.path}</echo>
+      <echo>tomcat.port:${tomcat.port}, gli.present:${gli.present} gsdlislocal=${gsdl2.islocal} gs2build.present=${gs2build.present} gsdl.path = ${gsdl.path}</echo>
     <condition property="proxy.present">
       <not>
@@ -457 +462 @@
   
   <!-- this is all the do-once things -->
-  <target name="preparation" depends="init,update-gsdl3,prepare-mgpp,prepare-gs2building,prepare-tomcat,prepare-axis,unpack-collections">
+  <target name="prepare" depends="init,update-gsdl3,prepare-mgpp,prepare-gs2building,prepare-tomcat,prepare-axis,unpack-collections">
   </target>
   
   <target name="update-gsdl3">
     <cvs command="update -dP"/>
-  </target>
+    </target>
 
   <!-- this is config stuff, that can be done more than once - should be rerun is the build.properties file changes -->
-  <target name="configuration" depends="init,configure-tomcat,configure-files"/>
+    <target name="configure" depends="init,configure-tomcat,configure-files,configure-packages,configure-gs2building"/>
   
   <target name="configure-files" depends="init">
@@ -478 +483 @@
   </target>
 
-  <target name="gsdl3-install" depends="accept-properties,init,preparation,configuration,all" description="setup the gsdl3 stuff to start with">
+  <target name="gsdl3-install" depends="accept-properties,init,prepare,configure,compile" description="setup the gsdl3 stuff to start with">
   </target>
 
@@ -498 +503 @@
   </target>
 
+    
   <target name="update-cvs" description="update all the sources">
     <cvs command="update -dP"/>
@@ -507 +513 @@
   <!-- ================== targets to handle gs2 building stuff ===============-->
 
-  <!-- used on install -->
-  <target name="get-gs2build" if="getgsdl2" >
-    <echo>getting gs2 stuff</echo>
-    <!---->
-    <antcall target="compile-gs2build"/> 
-    </target>
-
-
-  <target name="update-gs2build" description="Use this to update your Greenstone 2 building stuff - only use if you specified that you didn't have greenstone 2 installed. Will do a cvs update on the gli and gs2build subdirectories, and thenmake clean and make.">
+
+  <target name="update-gs2building" description="Use this to update your Greenstone 2 building stuff - only use if you specified that you didn't have greenstone 2 installed. Will do a cvs update on the gli and gs2build subdirectories, and thenmake clean and make.">
     <!-- gli -->
     <cvs command="update -dP" dest="${basedir}/gli"/>
     <!-- gs2build -->
     <!-- Note: can't do a -d update here cos it will get all of gsdl-->
-    <cvs command="update -P" dest="${basedir}/gs2build"/>
+    <cvs command="update -P" dest="${gs2build.home}"/>
     <antcall target="compile-gs2build"/> 
+  </target>
+    
+  <target name="configure-gs2building">
+    <exec executable="${gs2build.home}/configure" os="${os.linux}"
+      dir="${gs2build.home}">
+      <arg value="--prefix=${gs2build.home}"/>
+    </exec>
   </target>
   
@@ -538 +544 @@
       resolveExecutable="true"/>
     <!-- gs2build -->
-    <!--linux: configure, make clean, make, make install-->
-    <property name="gs2build.home" value="${basedir}/gs2build"/>
-    <exec executable="${gs2build.home}/configure" os="${os.linux}"
-      dir="${gs2build.home}">
-      <arg value="--prefix=${gs2build.home}"/>
-    </exec>
+    <!--linux: make clean, make, make install -->
     <exec executable="make" os="${os.linux}" dir="${gs2build.home}">
       <arg value="clean"/>
@@ -606 +607 @@
     </move>
     <!-- install the webapp into tomcat -->
-    <copy todir="${tomcat.home}/webapps/axis">
+    <copy todir="${basedir}/comms/jakarta/tomcat/webapps/axis">
       <fileset dir="${basedir}/comms/soap/axis/webapps/axis"/>
     </copy>
@@ -618 +619 @@
   <target name="prepare-gs2build" depends="init" if="gsdl2.islocal" unless="gs2build.present">
     <echo>checking out gs2build</echo>
-    <cvs command="co -P" package="gs2build"/>
-    <property name="gs2build.home" value="${basedir}/gs2build"/>
+    <cvs command="co -P -d gs2building" package="gs2build"/>
 
     <!-- rename the .gs2build files -->