Show
Ignore:
Timestamp:
14.01.2011 15:02:30 (9 years ago)
Author:
sjm84
Message:

Modified how the x64 components are handled

Location:
main/trunk/release-kits/kits/rk2/ant-scripts
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/components.xml

    r23583 r23585  
    2424  </patternset> 
    2525 
    26   <!-- imagemagick x64 --> 
    27   <patternset id="greenstone2.imagemagick-x64.component"> 
    28     <include name="ext/imagemagick"/> 
    29     <include name="ext/imagemagick/**/*"/> 
    30  </patternset>   
     26  <if><bool><equals arg1="${x64}" arg2="false"/></bool> 
     27    <!-- imagemagick --> 
     28    <patternset id="greenstone2.imagemagick.component"> 
     29      <include name="bin/**/imagemagick"/> 
     30      <include name="bin/**/imagemagick/**/*"/> 
     31    </patternset> 
     32  <else> 
     33    <!-- imagemagick x64 --> 
     34    <patternset id="greenstone2.imagemagick.component"> 
     35      <include name="ext/imagemagick"/> 
     36      <include name="ext/imagemagick/**/*"/> 
     37    </patternset>   
     38  </else> 
     39  </if> 
    3140 
    32   <!-- imagemagick --> 
    33   <patternset id="greenstone2.imagemagick.component"> 
    34     <include name="bin/**/imagemagick"/> 
    35     <include name="bin/**/imagemagick/**/*"/> 
    36   </patternset> 
    37    
    3841  <!-- ghostscript --> 
    3942  <patternset id="greenstone2.ghostscript.component"> 
     
    5760    </invert> 
    5861  </patternset> 
    59  
    60   <!-- the core component - defined by antithesis (64-bit version) --> 
    61   <patternset id="greenstone2.core-x64.component"> 
    62     <invert> 
    63       <patternset refid="greenstone2.source.component"/> 
    64       <patternset refid="greenstone2.imagemagick-x64.component"/> 
    65       <patternset refid="greenstone2.ghostscript.component"/> 
    66       <patternset refid="greenstone2.apachehttpd.component"/> 
    67     </invert> 
    68   </patternset> 
    69    
    7062</project> 
    7163 
  • main/trunk/release-kits/kits/rk2/ant-scripts/create-components.xml

    r23583 r23585  
    55 
    66        <!-- imagemagick --> 
    7         <antcall target="create-component"><param name="component" value="imagemagick${extension-x64}"/></antcall> 
     7        <antcall target="create-component"><param name="component" value="imagemagick"/></antcall> 
    88 
    99        <!-- apache httpd --> 
     
    1717         
    1818        <!-- core  --> 
    19         <antcall target="create-component"><param name="component" value="core${extension-x64}"/></antcall> 
     19        <antcall target="create-component"><param name="component" value="core"/></antcall> 
    2020 
    2121    </target>