Changeset 22992

Timestamp:

2010-09-30T13:16:34+13:00 (14 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

File:

• main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml (modified) (2 diffs)

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

@@ -136 +136 @@
                 <job pattern="tempfile"/> 
             </iuv>
-                
-            <rsr> 
-                <fileset dir="${basedir}/compiled/runtime-src/packages/apache-httpd/httpd-2.2.11" includes="**/*.mak"/> 
-                <job pattern="/MD" replacement="/MT"/> 
-            </rsr> 
             
             <!-- compile c code -->
@@ -147 +142 @@
             <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="LOCAL_LIBRARY=1"/></exec>
             <delete><fileset dir="${basedir}/compiled/apache-httpd" includes="**/*.pdb"/></delete>
+
+            <copy file="${rk.home}/shared/windows/msvcr100.dll" tofile="${basedir}/compiled/apache-httpd/windows/lib/msvcr100.dll"/>
+            
             <mkdir dir="products"/>
             <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}.exe"/>