Changeset 20089

Show
Ignore:
Timestamp:
27.07.2009 16:00:54 (10 years ago)
Author:
kjdon
Message:

several changes. added fix-executable-permissions targets. configure-java-version is now called from prepare-tomcat not at startup. Don't need to copy xercesImpl.jar or xml-apis.jar into tomcats lib folder.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r20085 r20089  
    498498  <!-- ========== Web app Targets ================================ --> 
    499499   
    500   <target name="prepare-web" depends="init,configure-java-version"> 
     500  <target name="prepare-web" depends="init"> 
    501501    <mkdir dir="${web.home}/applet"/> 
    502502    <mkdir dir="${web.home}/logs"/> 
     
    556556    <echo>deactivating xalan.jar</echo> 
    557557    <delete file="${web.lib}/xalan.jar"/> 
     558    <!-- should we be deleting common/endorsed/xalan.jar on mac?? --> 
    558559  </target> 
    559560 
     
    648649   
    649650  <!-- this target downloads and installs Tomcat --> 
    650   <!-- we download tomcat and the compat module - its needed for 1.4, and doesn't seem to harm 1.5 --> 
    651   <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal"> 
     651  <!-- we download tomcat (version 6 for Java 1.5 and later, version 5 for Java 1.4 plus the 1.4 compatibility package). --> 
     652  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal" 
     653    description="downloads the appropriate version of Tomcat (Tomcat 5 if using Java 1.4, Tomcat 6 if using Java 1.5 or higher). If you want to change which version of Java you are using between 1.4 and 1.5/6 then you need to run prepare-tomcat"> 
    652654    <if> 
    653655      <bool> 
     
    694696      </echo> 
    695697 
     698      <!-- this is not strictly a prepare tomcat thing, but if one changes 
     699      Java, then they need to change tomcat as well, so might as well call  
     700      it here --> 
     701      <antcall target="configure-java-version"/> 
    696702      <else> 
    697703        <echo>Tomcat has been prepared, will not prepare</echo> 
     
    727733  </target> 
    728734   
    729   <target name="start-tomcat" description="Startup only Tomcat" depends="init,configure-java-version" if="tomcat.islocal"> 
     735  <target name="start-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal"> 
    730736    <property name="tomcat.classpath" refid="local.tomcat.classpath"/> 
    731737    <property name="tomcat.path" refid="local.tomcat.path"/> 
     
    10091015  <target name="compile-core" depends="init"  
    10101016    description="Compile only the Greenstone core"> 
    1011     <if> 
    1012       <!-- Rather than test for tomcat 6, testing here for NOT tomcat 5  
    1013       (so that it may hopefully still serve when it becomes tomcat 7) --> 
    1014       <bool><not><equals arg1="5" arg2="${tomcat.version.major}"/></not></bool> 
    1015       <copy file="${web.lib}/xercesImpl.jar" todir="${catalina.home}/lib"/> 
    1016       <copy file="${web.lib}/xml-apis.jar" todir="${catalina.home}/lib"/> 
    1017     </if> 
    10181017    <mkdir dir="${build.home}"/> 
    10191018    <javac srcdir="${src.home}" 
     
    16821681  </target> 
    16831682 
     1683<!-- ========== Some distribution targets ======================== --> 
    16841684  <target name="remove-source"> 
    16851685    <delete includeEmptyDirs="true"> 
     
    17271727  </target> 
    17281728 
     1729  <!-- fix up executable permissions for binary release --> 
     1730  <target name="fix-execute-permissions"> 
     1731    <echo>Setting binaries to executable</echo> 
     1732    <chmod dir="." includes="*.sh" perm="775"/> 
     1733    <chmod dir="bin/script" includes="*" perm="775"/> 
     1734    <chmod dir="bin" includes="*" perm="775"/> 
     1735    <!-- if linux --> 
     1736    <chmod dir="gs2build/bin/linux" includes="*" perm="775"/> 
     1737    <!-- /if --> 
     1738    <!-- if mac --> 
     1739    <chmod dir="gs2build/bin/darwin" includes="*" perm="775"/> 
     1740    <!-- /if --> 
     1741    <chmod dir="gs2build/bin/script" includes="**/*" perm="775"/> 
     1742    <chmod dir="gli" includes="*.sh" perm="775"/> 
     1743    <chmod file="packages/ant/bin/ant" perm="775"/> 
     1744  </target> 
     1745   
     1746  <!-- fix up executable permissions for source code release --> 
     1747  <target name="fix-execute-permissions-source"> 
     1748    <chmod dir="gs2build" includes="**/configure" perm="775"/> 
     1749    <chmod dir="gs2build/common-src/packages/gdbm/gdbm-1.8.3" includes="mkinstalldirs" perm="775"/> 
     1750    <chmod file="src/packages/javagdbm/configure" perm="775"/> 
     1751    <chmod file="src/packages/search4j/configure" perm="775"/> 
     1752     
     1753  </target> 
     1754 
     1755 
    17291756  <!-- ============= tweaks for making compilation static ========== -->   
    17301757  <target name="tweak-makefiles" depends="init" if="compile.static">