Changeset 23809

Show
Ignore:
Timestamp:
24.03.2011 10:11:03 (8 years ago)
Author:
sjm84
Message:

More fixes to allow the disabling of GLI

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r23808 r23809  
    20242024<!-- ========== Some distribution targets ======================== --> 
    20252025  <target name="remove-source"> 
     2026    <if><bool><isset property="with.gli.and.gems"/></bool> 
    20262027    <delete includeEmptyDirs="true"> 
    20272028      <fileset dir="." defaultexcludes="false"> 
     
    20292030     </fileset> 
    20302031    </delete> 
     2032     
     2033    <else> 
     2034    <delete includeEmptyDirs="true"> 
     2035      <fileset dir="." defaultexcludes="false"> 
     2036        <patternset refid="greenstone3.source.no.gli.component"/> 
     2037     </fileset> 
     2038    </delete> 
     2039    </else> 
     2040    </if> 
    20312041  </target> 
    20322042 
     
    20512061    <if><bool><istrue value="${current.os.isunix}"/></bool> 
    20522062      <delete><fileset dir="." includes="*.bat"/></delete> 
    2053       <delete><fileset dir="gli" includes="*.bat"/></delete> 
     2063      <if><bool><isset property="with.gli.and.gems"/></bool> 
     2064    <delete><fileset dir="gli" includes="*.bat"/></delete> 
     2065      </if> 
    20542066      <delete><fileset dir="gs2build" includes="*.bat"/></delete> 
    20552067      <delete><fileset dir="bin/script" includes="*.bat"/></delete> 
     
    20622074    <else><if><bool><istrue value="${current.os.iswindows}"/></bool> 
    20632075      <delete><fileset dir="." includes="*.sh,*.bash,*.csh"/></delete> 
    2064       <delete><fileset dir="gli" includes="*.sh,*.bash,*.csh"/></delete> 
     2076      <if><bool><isset property="with.gli.and.gems"/></bool> 
     2077    <delete><fileset dir="gli" includes="*.sh,*.bash,*.csh"/></delete> 
     2078      </if> 
    20652079      <delete><fileset dir="gs2build" includes="*.sh,*.bash,*.csh"/></delete> 
    20662080      <delete><fileset dir="bin/script" includes="*.sh,*.bash,*.csh"/></delete> 
  • main/trunk/greenstone3/resources/xml/components.xml

    r20930 r23809  
    66        <include name="gli/src"/> 
    77        <include name="gli/src/**/*"/> 
     8        <include name="src"/> 
     9        <include name="src/**/*"/> 
     10        <include name="gs2build/common-src"/> 
     11        <include name="gs2build/common-src/**/*"/> 
     12        <include name="gs2build/build-src"/> 
     13        <include name="gs2build/build-src/**/*"/> 
     14        <include name="gs2build/runtime-src"/> 
     15        <include name="gs2build/runtime-src/**/*"/> 
     16        <include name="gs2build/aclocal.m4"/> 
     17        <include name="gs2build/config.guess"/> 
     18        <include name="gs2build/config.h.in"/> 
     19        <include name="gs2build/config.sub"/> 
     20        <include name="gs2build/configure"/> 
     21        <include name="gs2build/configure.in"/> 
     22        <include name="gs2build/install-sh"/> 
     23        <include name="gs2build/Makefile.in"/> 
     24        <include name="gs2build/win32.mak"/> 
     25        <include name="gs2build/win32cfg.h"/> 
     26    </patternset> 
     27 
     28    <!-- source component without gli- files that get compiled and could be safely removed from a binary distribution --> 
     29    <patternset id="greenstone3.source.no.gli.component"> 
    830        <include name="src"/> 
    931        <include name="src/**/*"/>