Ignore:
Timestamp:
2021-10-15T12:17:51+13:00 (3 years ago)
Author:
davidb
Message:

iconv.zip changed to iconv-PRE-VS14.zip to keep in line with the recent change that provides both iconv-PRE-VS14.zip (the original iconv.zip) and iconv-VS14-PLUS.zip (a version based on gs-libiconv v1.11 that is needed to work with compilation with newer versions of Visual Studio. In this commit I decided to go with a change that meant the same (original) iconv.zip file is the one that is unzipped. Given that newer versions of VS are likely to be installed on developers systems, this might be a decision we want to revisit, choosing instead for the Release Kit to include the VS14-PLUS version. Note: in SVN both files are present, and if compiling an svn checked out version, then the build-scripts we have in svn test the version of VisualStudioVersion and unzip the approprirate one

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r34610 r35605  
    110110           
    111111            <unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/>
    112             <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/>
     112            <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv-PRE-VS14.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/>
    113113            <untar src="${basedir}/compiled/common-src/packages/sqlite/sqlite-autoconf-3070602.tar.gz" dest="${basedir}/compiled/common-src/packages/sqlite" compression="gzip"/>
    114114
Note: See TracChangeset for help on using the changeset viewer.