Changeset 22093

Show
Ignore:
Timestamp:
17.05.2010 13:48:32 (9 years ago)
Author:
sjm84
Message:

When run on Windows this now creates a cdrom-components--full-windows.tar.gz as well as the standard windows cdrom-components

Files:
1 modified

Legend:

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

    r21725 r22093  
    2222        <mkdir dir="cdrom/dist/Software/core/all"/> 
    2323        <mkdir dir="cdrom/dist/Software/core/${rk.os}"/> 
     24 
     25        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
     26          <mkdir dir="cdrom/dist/Software/core/full-windows"/> 
     27        </if> 
    2428 
    2529        <!-- core linux --> 
     
    4852                <patternset> 
    4953                    <include name="bin/windows"/> 
     54                    <include name="bin/windows/**/*"/> 
    5055                    <include name="server.exe"/> 
    51                     <include name="bin/windows/**/*"/> 
    5256                    <include name="cgi-bin/library.cgi"/> 
    5357                    <include name="cgi-bin/oaiserver.cgi"/> 
     
    5660                </patternset> 
    5761            </unzip> 
     62 
     63            <unzip src="components/core.comp" dest="cdrom/dist/Software/core/full-windows" overwrite="true"/> 
    5864 
    5965        <!-- core mac --> 
     
    120126            <copy todir="cdrom/build" overwrite="true"> 
    121127                <fileset dir="${rk.home}/shared/windows/wrapper"/> 
    122                 <fileset dir="${rk.home}/shared/greenstone2/wrapper" includes="*.bmp"/> 
    123128                <fileset dir="${rk.home}/shared/core/icon" includes="icon.ico"/> 
    124129                <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/> 
     
    172177        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
    173178            <tar destfile="products/cdrom-components-${version}-windows.tar.gz" compression="gzip"> 
    174                 <tarfileset dir="cdrom/dist"><include name="**/*"/></tarfileset> 
     179                <tarfileset dir="cdrom/dist"> 
     180                  <include name="**/*"/> 
     181                  <exclude name="**/full-windows/*"/> 
     182                </tarfileset> 
     183            </tar> 
     184            <tar destfile="products/cdrom-components-${version}-full-windows.tar.gz" compression="gzip"> 
     185                <tarfileset dir="cdrom/dist"> 
     186                  <include name="**/*"/> 
     187                  <exclude name="**/windows/*"/> 
     188                </tarfileset> 
    175189            </tar> 
    176190