Changeset 22490


Ignore:
Timestamp:
2010-07-23T11:11:47+12:00 (12 years ago)
Author:
sjm84
Message:

Fixed issues with apache httpd compiling on Windows 7

Location:
main/trunk/release-kits
Files:
2 edited

Legend:

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

    r22479 r22490  
    103103            </exec>
    104104           
     105            <!-- Insert a unique number after every occurrence of the word tempfile to prevent some strange race conditions present on Windows 7 (iuv = InsertUniqueValue) -->
     106            <iuv>
     107                <fileset dir="${basedir}/compiled/runtime-src/packages/apache-httpd/httpd-2.2.11" includes="**/*.mak"/>
     108                <job pattern="tempfile"/>
     109            </iuv>
     110               
     111            <rsr>
     112                <fileset dir="${basedir}/compiled/runtime-src/packages/apache-httpd/httpd-2.2.11" includes="**/*.mak"/>
     113                <job pattern="/MD" replacement="/MT"/>
     114            </rsr>
     115           
    105116            <!-- compile c code -->
    106117            <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

    r22325 r22490  
    8383        <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
    8484        <taskdef name="installer" classname="org.tp23.antinstaller.taskdefs.Installer" classpathref="project.classpath"/>
     85        <typedef name="iuv" classname="org.greenstone.anttasks.InsertUniqueValue" classpathref="project.classpath"/>
    8586        <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
    8687        <typedef name="dcff" classname="org.greenstone.anttasks.DeleteChunkFromFile" classpathref="project.classpath"/>
Note: See TracChangeset for help on using the changeset viewer.