Changeset 22490 for main

Timestamp:

2010-07-23T11:11:47+12:00 (14 years ago)

Author:

sjm84

Message:

Fixed issues with apache httpd compiling on Windows 7

Location:

main/trunk/release-kits

Files:

• kits/rk2/ant-scripts/compile.xml (modified) (1 diff)
• shared/core/ant-scripts/shared.xml (modified) (1 diff)

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

@@ -103 +103 @@
             </exec>
             
+            <!-- Insert a unique number after every occurrence of the word tempfile to prevent some strange race conditions present on Windows 7 (iuv = InsertUniqueValue) -->
+            <iuv>
+                <fileset dir="${basedir}/compiled/runtime-src/packages/apache-httpd/httpd-2.2.11" includes="**/*.mak"/> 
+                <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 -->
             <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="clean"/></exec>

main/trunk/release-kits/shared/core/ant-scripts/shared.xml

@@ -83 +83 @@
         <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
         <taskdef name="installer" classname="org.tp23.antinstaller.taskdefs.Installer" classpathref="project.classpath"/>
+        <typedef name="iuv" classname="org.greenstone.anttasks.InsertUniqueValue" classpathref="project.classpath"/>
         <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
         <typedef name="dcff" classname="org.greenstone.anttasks.DeleteChunkFromFile" classpathref="project.classpath"/>