Changeset 18920

Show
Ignore:
Timestamp:
08.04.2009 16:17:01 (10 years ago)
Author:
oranfry
Message:

made dist-clean-sourcecode windows compatible and moved compile-gli into rk2-targets as gs3 has its own

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/rk-oran/shared/greenstone2/ant-scripts/rk2-targets.xml

    r18907 r18920  
    140140 
    141141    <target name="dist-clean-sourcecode"> 
    142         <exec dir="distributions/web" executable="make"><arg value="distclean"/></exec> 
     142        <delete> 
     143            <fileset dir="distributions/web" includes="Makefile,config.cache,config.h,config.log,stamp-h,config.status"/> 
     144        </delete> 
    143145        <delete dir="distributions/web/common-src"/> 
    144146        <delete dir="distributions/web/build-src"/> 
     
    168170    </target> 
    169171 
     172    <target name="compile-gli"> 
     173 
     174        <!-- default to sh --> 
     175        <property name="script.format" value="sh"/> 
     176         
     177        <echo>Compiling gli...</echo> 
     178        <exec dir="${glibasedir}" executable="${glibasedir}/makegli.${script.format}"/> 
     179 
     180        <echo>Creating jar...</echo> 
     181        <exec dir="${glibasedir}" executable="${glibasedir}/makejar.${script.format}"/> 
     182 
     183        <echo>Cleaning up intermediate files...</echo> 
     184        <delete dir="${glibasedir}/jar"/> 
     185        <delete dir="${glibasedir}/classes/org"/> 
     186 
     187        <if><bool><isset property="gsdlbasedir"/></bool> 
     188            <echo>Putting gli server jar in a better place</echo> 
     189            <exec executable="mv" failonerror="true"> 
     190                <arg line="${glibasedir}/GLIServer.jar ${gsdlbasedir}/bin/java" /> 
     191            </exec> 
     192        </if> 
     193 
     194    </target> 
    170195 
    171196