Changeset 19975

Show
Ignore:
Timestamp:
09.07.2009 10:10:16 (10 years ago)
Author:
oranfry
Message:

changed the source-fileset file to a file for all components, and made some updates to reflect this

Location:
greenstone3/trunk
Files:
1 modified
1 moved

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r19972 r19975  
    7373 
    7474  <!-- get the fileset defining what is sourcecode --> 
    75   <import file="resources/xml/source-fileset.xml"/> 
     75  <import file="resources/xml/components.xml"/> 
    7676     
    7777  <!-- version properties for external packages --> 
     
    16451645 
    16461646  <target name="remove-source"> 
    1647     <delete includeEmptyDirs="true"><fileset dir="." defaultexcludes="false"><patternset refid="greenstone3.source.fileset"/></fileset></delete> 
     1647    <delete includeEmptyDirs="true"> 
     1648      <fileset dir="." defaultexcludes="false"> 
     1649        <patternset refid="greenstone3.source.component"/> 
     1650     </fileset> 
     1651    </delete> 
    16481652  </target> 
    16491653 
  • greenstone3/trunk/resources/xml/components.xml

    r19971 r19975  
    1 <project name="source-fileset"> 
    2     <!-- the authoritative fileset representing the source files of a greenstone3 installation --> 
    3     <patternset id="greenstone3.source.fileset"> 
     1<!-- an ant project containing authoritative definitions of the components of greenstone3 --> 
     2<project name="components"> 
     3 
     4    <!-- source component - files that get compiled and could be safely removed from a binary distribution --> 
     5    <patternset id="greenstone3.source.component"> 
    46        <include name="src"/> 
    57        <include name="src/**/*"/> 
     
    2426        <include name="gs2build/win32cfg.h"/> 
    2527    </patternset> 
     28 
     29    <!-- imagemagick --> 
     30    <patternset id="greenstone3.imagemagick.component"> 
     31        <include name="gs2build/bin/**/imagemagick"/> 
     32                <include name="gs2build/bin/**/imagemagick/**/*"/> 
     33    </patternset> 
     34 
     35        <!-- ghostscript --> 
     36        <patternset id="greenstone3.ghostscript.component"> 
     37                <include name="gs2build/bin/**/ghostscript"/> 
     38                <include name="gs2build/bin/**/ghostscript/**/*"/> 
     39        </patternset> 
     40 
     41        <!-- ant --> 
     42        <patternset id="greenstone3.ant.component"> 
     43                <include name="packages/ant"/> 
     44                <include name="packages/ant/**/*"/> 
     45        </patternset> 
     46 
     47        <!-- tomcat --> 
     48        <patternset id="greenstone3.tomcat.component"> 
     49                <include name="packages/tomcat"/> 
     50                <include name="packages/tomcat/**/*"/> 
     51        </patternset> 
     52 
     53        <!-- all components - invert this set to get the core component --> 
     54        <patternset id="greenstone3.all.component"> 
     55        <invert> 
     56            <patternset refid="greenstone3.source.component"/> 
     57            <patternset refid="greenstone3.imagemagick.component"/> 
     58            <patternset refid="greenstone3.ghostscript.component"/> 
     59            <patternset refid="greenstone3.ant.component"/> 
     60            <patternset refid="greenstone3.tomcat.component"/> 
     61        </invert> 
     62        </patternset> 
     63 
    2664</project> 
    2765