Changeset 15042 for greenstone3


Ignore:
Timestamp:
03/05/08 13:16:31 (13 years ago)
Author:
shaoqun
Message:

reorganise gdbm-related targets

File:
1 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r15038 r15042  
    5050-->
    5151
     52  <!--the first two properties have to be put on the top to be used by build.properties-->
     53  <property name="src.packages.home" value="${basedir}/src/packages"/>
     54  <property name="gdbm.home" value="${src.packages.home}/gdbm-1.8.3"/>
    5255  <property file="build.properties"/>
    5356  <property file="${user.home}/build.properties"/>
     
    5760  <property name="build.home" value="${basedir}/build"/>
    5861  <property name="src.home" value="${basedir}/src/java"/>
    59   <property name="src.packages.home" value="${basedir}/src/packages"/>
    6062  <property name="packages.home" value="${basedir}/packages"/>
    6163  <!-- this may be set in build.properties, eg if you move the web dir to
     
    167169  <property name="gli.home" value="${basedir}/gli"/>
    168170  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
    169   <property name="gdbm.home" value="${src.packages.home}/gdbm-1.8.3"/>
    170 
     171 
    171172  <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">-->
    172173  <condition property="indexers.home" value="${basedir}/src/packages/indexers">
     
    462463
    463464  <target name="copy-xalan-for-mac" if="current.os.ismac">
    464        <copy file="${web.lib}/xalan.jar.tmp" tofile="${tomcat.installed.path}/common/endorsed/xalan.jar"/>
     465       <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/>
    465466  </target>
    466467
     
    924925  </target>
    925926 
    926   <target name="configure-packages" depends="init,configure-gdbm,configure-javagdbm,configure-indexers"
     927  <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers"
    927928    description="Configure only the packages."/>
    928929 
     
    980981    <target name="compile-packages" description="Compile only the source packages">
    981982         
    982                 <!-- gdbm -->
    983                 <antcall target="compile-gdbm" />
    984 
    985983        <!-- javagdbm -->
    986984        <echo>compile javagdbm</echo>
     
    14311429    <mkdir dir="${basedir}/web/interfaces/flax"/>
    14321430    <mkdir dir="${basedir}/web/sites/flax"/>
     1431     <mkdir dir="${basedir}/flax-resources"/>
    14331432    <svn>
    14341433      <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/flax/" 
     
    14431442                destPath="${basedir}/web/sites/flax"/>
    14441443      <checkout url="${flax.svn.root}/flax1.0/trunk/flax-resources"
    1445                 destPath="${basedir}"/>
     1444                destPath="${basedir}/flax-resources"/>
    14461445    </svn>
    14471446    <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/>
    1448     <svncall target="flax-copy-files" />
     1447    <antcall target="flax-copy-files" />
    14491448
    14501449    <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/>
     
    14691468      </svn>
    14701469    </target>
    1471     <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
     1470
     1471   <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
    14721472      <echo>copying flax files ...</echo>
    14731473      <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" overwrite="true" />
    14741474      <!-- A configuration file containing web service binding information for the axis engine -->
    1475       <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" />
    1476     </target>
     1475           <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" />
     1476           <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" />
     1477   
     1478   </target>
    14771479      <!--install gdbm stuff -->
    14781480
     
    14831485      <untar compression= "gzip" src="${src.packages.home}/gdbm-1.8.3.tar.gz" dest="${src.packages.home}" /> 
    14841486      <chmod dir="${src.packages.home}/gdbm-1.8.3" perm="ugo+wrx" includes="**" />
     1487      <antcall target="configure-gdbm" />
     1488      <antcall target="compile-gdbm" />
    14851489  </target> 
    14861490
Note: See TracChangeset for help on using the changeset viewer.