Changeset 15139

Show
Ignore:
Timestamp:
27.03.2008 14:34:58 (11 years ago)
Author:
oranfry
Message:

hid the ugly output mention in the message of my last commit

Location:
greenstone3/trunk
Files:
1 added
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r15136 r15139  
    1717 
    1818    <!-- ============ self defined tasks =================== --> 
    19     <taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpath="${basedir}/lib/java/anttasks.jar"/> 
    20     <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpath="${basedir}/lib/java/anttasks.jar"/> 
     19    <taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpathref="project.classpath"/> 
     20    <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpathref="project.classpath"/> 
    2121    <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/> 
    22     <taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpath="${basedir}/lib/java/anttasks.jar"/> 
     22    <taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/> 
     23    <taskdef name="if" classname="ise.antelope.tasks.IfTask" classpathref="project.classpath"/> 
     24    <taskdef name="try" classname="ise.antelope.tasks.TryTask" classpathref="project.classpath"/> 
    2325 
    2426<!-- ===================== Property Definitions =========================== --> 
     
    448450  <!-- if we are using java 1.5+, we need the xalan.jar file in web/WEB-INF/lib,  but if we are using java 1.4, we can't have it there --> 
    449451  <target name="configure-java-version" depends="init" 
    450     description="Run this target if you have changed the default version of java since installing greenstone3"> 
     452    description="Activates or deactivates some jar libraries as needed depending on your java version"> 
    451453 
    452454        <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/> 
     
    458460        </condition> 
    459461 
    460         <condition property="do.deactivate.xalan.jar"> 
    461             <and> 
    462                 <isset property="have.xalan.jar"/> 
    463                 <not><isset property="need.xalan.jar"/></not> 
    464             </and> 
    465         </condition> 
    466  
    467         <condition property="do.activate.xalan.jar"> 
    468             <and> 
    469                 <not><isset property="have.xalan.jar"/></not> 
    470                 <isset property="need.xalan.jar"/> 
    471             </and> 
    472         </condition> 
    473         <!-- 
    474         <echo>java version  : ${ant.java.version}</echo> 
    475         <echo>have xalan.jar: ${hava.xalan.jar}</echo> 
    476         <echo>need xalan.jar: ${need.xalan.jar}</echo> 
    477         <echo>activate?     : ${do.activate.xalan.jar}</echo> 
    478         <echo>deactivate?   : ${do.deactivate.xalan.jar}</echo> 
    479         --> 
    480  
    481     <antcall target="activate-xalan-jar"/> 
    482     <antcall target="deactivate-xalan-jar"/> 
    483  
    484   </target> 
    485    
    486   <target name="activate-xalan-jar" if="do.activate.xalan.jar"> 
     462        <!-- if they have xalan.jar but dont need it --> 
     463        <if> 
     464            <bool> 
     465                <and> 
     466                    <isset property="have.xalan.jar"/> 
     467                    <not><isset property="need.xalan.jar"/></not> 
     468                </and> 
     469            </bool> 
     470            <antcall target="deactivate-xalan-jar"/> 
     471        </if> 
     472 
     473        <!-- if they need xalan.jar but dont have it --> 
     474        <if> 
     475            <bool> 
     476                <and> 
     477                    <not><isset property="have.xalan.jar"/></not> 
     478                    <isset property="need.xalan.jar"/> 
     479                </and> 
     480            </bool> 
     481            <antcall target="activate-xalan-jar"/> 
     482        </if> 
     483 
     484  </target> 
     485   
     486  <target name="activate-xalan-jar"> 
     487        <echo>activating xalan.jar</echo> 
    487488    <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/> 
    488     <antcall target="copy-xalan-for-mac" /> 
    489   </target> 
    490  
    491   <target name="copy-xalan-for-mac" if="current.os.ismac"> 
    492         <echo>installing xalan.jar</echo> 
    493         <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/>  
    494   </target> 
    495  
    496   <target name="deactivate-xalan-jar" if="do.deactivate.xalan.jar"> 
    497         <echo>uninstalling xalan.jar</echo> 
     489        <if><bool><isset property="current.os.ismac"/></bool> 
     490            <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/>  
     491        </if> 
     492  </target> 
     493 
     494    <!-- to delete --> 
     495  <target name="copy-xalan-for-mac"></target> 
     496 
     497  <target name="deactivate-xalan-jar"> 
     498        <echo>deactivating xalan.jar</echo> 
    498499    <delete file="${web.lib}/xalan.jar"/> 
    499500  </target>