Changeset 23221 for main


Ignore:
Timestamp:
2010-10-27T12:10:57+13:00 (13 years ago)
Author:
sjm84
Message:

This no longer includes the zipped up expat from windows

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/release-kits/kits/sork2/ant-scripts/build.xml

    r21744 r23221  
    101101        <delete file="distributions/source-component/common-src/packages/windows/crypt/crypt.zip"/>
    102102       
    103         <unzip src="distributions/source-component/common-src/packages/windows/expat/expat.zip" dest="distributions/source-component/common-src/packages/windows/expat"/>
    104         <delete file="distributions/source-component/common-src/packages/windows/expat/expat.zip"/>
     103        <if><bool><and>
     104            <not><equals arg1="${branch.path}" arg2="trunk"/></not>
     105            <not><equals arg1="${branch.path}" arg2="tags/stable"/></not>
     106            <islessthan arg1="${branch.tag.version}" arg2="2.84"/>
     107        </and></bool>
     108            <unzip src="distributions/source-component/common-src/packages/windows/expat/expat.zip" dest="distributions/source-component/common-src/packages/windows/expat"/>
     109            <delete file="distributions/source-component/common-src/packages/windows/expat/expat.zip"/>
     110        </if>
    105111       
    106112        <unzip src="distributions/source-component/common-src/packages/windows/stlport/stlport.zip" dest="distributions/source-component/common-src/packages/windows/stlport"/>
Note: See TracChangeset for help on using the changeset viewer.