Changeset 23587 for main


Ignore:
Timestamp:
2011-01-14T15:42:08+13:00 (13 years ago)
Author:
sjm84
Message:

Fix to allow imagemagick into the ext dir on x64

Location:
main/trunk/release-kits
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r23585 r23587  
    2424  </patternset>
    2525
    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>
     26  <!-- imagemagick -->
     27  <patternset id="greenstone2.imagemagick.component">
     28    <include name="bin/**/imagemagick"/>
     29    <include name="bin/**/imagemagick/**/*"/>
     30  </patternset>
     31
     32  <!-- imagemagick -->
     33  <patternset id="greenstone2.imagemagick-x64.component">
     34    <include name="ext/imagemagick"/>
     35    <include name="ext/imagemagick/**/*"/>
     36  </patternset>
    4037
    4138  <!-- ghostscript -->

  • main/trunk/release-kits/kits/rk2/ant-scripts/create-components.xml

    r23585 r23587  
    55
    66        <!-- imagemagick -->
    7         <antcall target="create-component"><param name="component" value="imagemagick"/></antcall>
     7        <antcall target="create-component">
     8            <param name="component" value="imagemagick"/>
     9            <param name="ext-x64" value="-x64"/>
     10        </antcall>
    811
    912        <!-- apache httpd -->
    10         <antcall target="create-component"><param name="component" value="apachehttpd"/></antcall>
     13        <antcall target="create-component">
     14            <param name="component" value="apachehttpd"/>
     15            <param name="ext-x64" value=""/>
     16        </antcall>
    1117
    1218        <!-- windows and mac only -->
    1319        <if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
    1420            <!-- ghostscript -->
    15             <antcall target="create-component"><param name="component" value="ghostscript"/></antcall>
     21            <antcall target="create-component">
     22                <param name="component" value="ghostscript"/>
     23                <param name="ext-x64" value=""/>
     24            </antcall>
    1625        </if>
    1726       
    1827        <!-- core  -->
    19         <antcall target="create-component"><param name="component" value="core"/></antcall>
     28        <antcall target="create-component">
     29            <param name="component" value="core"/>
     30            <param name="ext-x64" value=""/>
     31        </antcall>
    2032
    2133    </target>

  • main/trunk/release-kits/shared/core/ant-scripts/shared.xml

    r23525 r23587  
    377377    <target name="create-component">
    378378        <mkdir dir="components"/>
    379      
     379       
    380380        <!-- the PatternSet To File task takes one or more patternsets and outputs to a file all of the files it includes -->
    381381        <pstf dir="compiled" outfile="compiled/uninstall/${component}.uninstall" toplevelonly="true">
    382             <patternset refid="greenstone${version.major}.${component}.component"/>
     382            <patternset refid="greenstone${version.major}.${component}${ext-x64}.component"/>
    383383        </pstf>
    384384     
    385385        <zip destfile="components/${component}.comp" compress="false">
    386386            <zipfileset dir="compiled">
    387                 <patternset refid="greenstone${version.major}.${component}.component"/>
     387                <patternset refid="greenstone${version.major}.${component}${ext-x64}.component"/>
    388388            </zipfileset>
    389389        </zip>
    … …  
    402402         
    403403      </else></if></else></if>
    404     </target>   
     404    </target>
    405405   
    406406</project>
Note: See TracChangeset for help on using the changeset viewer.