Changeset 15187 for greenstone3


Ignore:
Timestamp:
2008-04-14T12:53:50+12:00 (16 years ago)
Author:
kjdon
Message:

removed os.mac from os attribute for gdbm targets as os.unix includes macs. moved version number stuff for tomcat, axis, gdbm into a property so its easy to change if we change versions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/build.xml

    r15185 r15187  
    5050  -->
    5151
     52 
    5253  <!--the first two properties have to be put on the top to be used by build.properties-->
    5354  <property name="src.packages.home" value="${basedir}/src/packages"/>
    … …  
    5859  <!-- get properties from the environment -->
    5960  <property environment="env"/>
     61
     62   
     63  <!-- version properties for external packages -->
     64  <property name="tomcat.version" value="apache-tomcat-5.5.25"/>
     65  <property name="axis.zip.version" value="axis-bin-1_2_1.zip"/>
     66  <property name="axis.dir.version" value="axis-1_2_1"/>
     67  <property name="gdbm.version" value="gdbm-1.8.3"/>
     68
    6069  <property name="build.home" value="${basedir}/build"/>
    6170  <property name="src.home" value="${basedir}/src/java"/>
    … …  
    567576    <!-- check that packages dir is there -->
    568577    <mkdir dir="${packages.home}"/>
    569     <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25.zip"
    570       dest="${packages.home}/apache-tomcat-5.5.25.zip"
     578    <get src="http://www.greenstone.org/gs3files/${tomcat.version}.zip"
     579      dest="${packages.home}/${tomcat.version}.zip"
    571580      usetimestamp="true"/>
    572     <unzip src="${packages.home}/apache-tomcat-5.5.25.zip"
     581    <unzip src="${packages.home}/${tomcat.version}.zip"
    573582      dest="${packages.home}"/>
    574     <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25-compat.zip"
    575       dest="${packages.home}/apache-tomcat-5.5.25-compat.zip"
     583    <get src="http://www.greenstone.org/gs3files/${tomcat.version}-compat.zip"
     584      dest="${packages.home}/${tomcat.version}-compat.zip"
    576585      usetimestamp="true"/>
    577     <unzip src="${packages.home}/apache-tomcat-5.5.25-compat.zip"
     586    <unzip src="${packages.home}/${tomcat.version}-compat.zip"
    578587      dest="${packages.home}"/>
    579588    <!-- delete any existing tomcat -->
    580589    <delete dir="${packages.home}/tomcat"/>
    581590    <move todir="${packages.home}/tomcat">
    582       <fileset dir="${packages.home}/apache-tomcat-5.5.25"/>
     591      <fileset dir="${packages.home}/${tomcat.version}"/>
    583592    </move>
    584593    <copy file="${basedir}/resources/tomcat/setclasspath.bat"
    … …  
    699708
    700709  <target name="prepare-axis" depends="init">
    701     <get src="http://www.greenstone.org/gs3files/axis-bin-1_2_1.zip"
    702       dest="${packages.home}/axis-bin-1_2_1.zip"
     710    <get src="http://www.greenstone.org/gs3files/${axis.zip.version}"
     711      dest="${packages.home}/${axis.zip.version}"
    703712      usetimestamp="true"/>
    704     <unzip src="${packages.home}/axis-bin-1_2_1.zip"
     713    <unzip src="${packages.home}/${axis.zip.version}"
    705714      dest="${packages.home}"/>
    706715    <move todir="${packages.home}/axis">
    707       <fileset dir="${packages.home}/axis-1_2_1"/>
     716      <fileset dir="${packages.home}/${axis.dir.version}"/>
    708717    </move>
    709718    <!-- install axis into greenstone web app -->
    … …  
    16181627
    16191628  <target name="prepare-gdbm" depends="init" if="install.gdbm">
    1620     <get src="http://www.greenstone.org/gs3files/gdbm-1.8.3.tar.gz"
    1621       dest="${src.packages.home}/gdbm-1.8.3.tar.gz"  usetimestamp="true"/>
    1622     <untar compression= "gzip" src="${src.packages.home}/gdbm-1.8.3.tar.gz" dest="${src.packages.home}" /> 
    1623     <chmod dir="${src.packages.home}/gdbm-1.8.3" perm="ugo+wrx" includes="**" />
     1629    <get src="http://www.greenstone.org/gs3files/${gdbm.version}.tar.gz"
     1630      dest="${src.packages.home}/${gdbm.version}.tar.gz"  usetimestamp="true"/>
     1631    <untar compression= "gzip" src="${src.packages.home}/${gdbm.version}.tar.gz" dest="${src.packages.home}" /> 
     1632    <chmod dir="${src.packages.home}/${gdbm.version}" perm="ugo+wrx" includes="**" />
    16241633    <antcall target="configure-gdbm" />
    16251634    <antcall target="compile-gdbm" />
    … …  
    16381647  <target name="clean-gdbm" depends="init"  if="install.gdbm">   
    16391648    <echo>clean GDBM</echo>
    1640     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}" >
     1649    <exec executable="make" os="${os.unix}" dir="${gdbm.home}" >
    16411650      <arg value="clean"/>
    16421651    </exec>
    … …  
    16451654  <target name="distclean-gdbm" depends="init"  if="install.gdbm">   
    16461655    <echo>distclean GDBM</echo>
    1647     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}" >
     1656    <exec executable="make" os="${os.unix}" dir="${gdbm.home}" >
    16481657      <arg value="distclean"/>
    16491658    </exec>
    … …  
    16521661  <target name="compile-gdbm" depends="init"  if="install.gdbm">   
    16531662    <echo>compile GDBM</echo>
    1654     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}"/>
    1655     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}">
     1663    <exec executable="make" os="${os.unix}" dir="${gdbm.home}"/>
     1664    <exec executable="make" os="${os.unix}" dir="${gdbm.home}">
    16561665      <arg value="install"/>
    16571666    </exec>
Note: See TracChangeset for help on using the changeset viewer.