Changeset 22992

Show
Ignore:
Timestamp:
30.09.2010 13:16:34 (9 years ago)
Author:
sjm84
Message:

Modified the release kit so that Apache is no longer statically compiled and msvcr100.dll is copied into the correct directory

Files:
1 modified

Legend:

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

    r22944 r22992  
    136136                <job pattern="tempfile"/>  
    137137            </iuv> 
    138                  
    139             <rsr>  
    140                 <fileset dir="${basedir}/compiled/runtime-src/packages/apache-httpd/httpd-2.2.11" includes="**/*.mak"/>  
    141                 <job pattern="/MD" replacement="/MT"/>  
    142             </rsr>  
    143138             
    144139            <!-- compile c code --> 
     
    147142            <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="LOCAL_LIBRARY=1"/></exec> 
    148143            <delete><fileset dir="${basedir}/compiled/apache-httpd" includes="**/*.pdb"/></delete> 
     144 
     145            <copy file="${rk.home}/shared/windows/msvcr100.dll" tofile="${basedir}/compiled/apache-httpd/windows/lib/msvcr100.dll"/> 
     146             
    149147            <mkdir dir="products"/> 
    150148            <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}.exe"/>