Changeset 19901

Show
Ignore:
Timestamp:
24.06.2009 14:27:00 (11 years ago)
Author:
oranfry
Message:

made the insert-windows-perl target take a todir attribute, and update calls to that target appropriately

Location:
release-kits
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/core/ant-scripts/init.xml

    r19644 r19901  
    159159        <dcff file="installer/build-binary.xml" startTag=".*&lt;!-- start cdrom --&gt;.*" endTag=".*&lt;!-- end cdrom --&gt;.*" /> 
    160160 
    161  
    162  
    163161        <installer file="installer/Greenstone-${version}-${os.suffix}.jar" 
    164162            compress="true" 
     
    399397    <!-- unzip windows perl into bin/windows of the given gsdl or gs2build --> 
    400398    <target name="insert-windows-perl"> 
    401         <mkdir dir="${gsdl.basedir}/bin/windows"/> 
    402         <delete dir="${gsdl.basedir}/bin/windows/perl"/> 
    403         <unzip src="${rk.home}/windows/perl.zip" dest="${gsdl.basedir}/bin/windows"/> 
     399        <mkdir dir="${todir}"/> 
     400        <delete dir="${todir}/perl"/> 
     401        <unzip src="${rk.home}/windows/perl.zip" dest="${todir}"/> 
    404402    </target> 
    405403 
  • release-kits/sork2/ant-scripts/build.xml

    r19600 r19901  
    2929        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/Greenstone-${version}-source-distribution/gli"/></antcall> 
    3030        <antcall target="insert-winbin"/> 
    31         <antcall target="insert-windows-perl"><param name="gsdl.basedir" value="${basedir}/distributions/Greenstone-${version}-source-distribution"/></antcall> 
     31        <antcall target="insert-windows-perl"><param name="todir" value="${basedir}/distributions/Greenstone-${version}-source-distribution/bin/windows"/></antcall> 
    3232        <antcall target="tweak-files" /> 
    3333        <antcall target="create-archives"/> 
  • release-kits/wirk2/ant-scripts/compile.xml

    r19847 r19901  
    1010        <antcall target="unzip-packages" /> 
    1111        <antcall target="get-winbin" /> 
    12         <antcall target="insert-windows-perl"><param name="gsdl.basedir" value="compiled"/></antcall> 
     12        <antcall target="insert-windows-perl"><param name="todir" value="compiled/bin/windows"/></antcall> 
    1313        <antcall target="compile-c-code" /> 
    1414