Changeset 21206

Show
Ignore:
Timestamp:
02.12.2009 14:16:30 (10 years ago)
Author:
oranfry
Message:

changes for 2.83 release

Location:
main/trunk/release-kits/wirk2
Files:
3 modified

Legend:

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

    r21202 r21206  
    1111        <antcall target="get-winbin" /> 
    1212        <antcall target="insert-windows-perl"><param name="todir" value="compiled/bin/windows"/></antcall> 
     13        <antcall target="insert-windows-vc-dlls"><param name="todir" value="compiled/apache-httpd/windows/bin"/></antcall> 
     14 
    1315        <antcall target="compile-c-code" /> 
    1416 
     
    3133        <unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/> 
    3234        <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/> 
     35        <untar src="${basedir}/compiled/runtime-src/packages/apache-httpd/httpd-2.2.11-gs.tar.gz" dest="${basedir}/compiled/runtime-src/packages/apache-httpd" compression="gzip"/> 
     36        <!--<untar src="${basedir}/compiled/runtime-src/packages/apache-httpd/libiconv-1.13.1.tar.gz" dest="${basedir}/compiled/runtime-src/packages/apache-httpd" compression="gzip"/>--> 
    3337        <untar src="${basedir}/compiled/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/compiled/common-src/packages/sqlite" compression="gzip"/> 
    3438    </target> 
     
    4347    <target name="compile-c-code"> 
    4448        <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/> 
    45         <exec dir="${basedir}/compiled" executable="${basedir}/compiled/compile.bat" /> 
     49        <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="clean"/></exec> 
     50        <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="APACHE_HTTPD=1"/></exec> 
     51        <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="LOCAL_LIBRARY=1"/></exec> 
    4652        <mkdir dir="products"/> 
    4753        <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}.exe"/> 
     
    7076    </target> 
    7177     
     78    <target name="insert-windows-vc-dlls"> 
     79        <property environment="env"/> 
     80        <copy todir="compiled/apache-httpd/windows/bin"><fileset dir="${env.VCINSTALLDIR}/redist/x86/Microsoft.VC80.CRT"/></copy> 
     81        <copy todir="compiled/apache-httpd/windows/modules"><fileset dir="${env.VCINSTALLDIR}/redist/x86/Microsoft.VC80.CRT"/></copy> 
     82    </target> 
     83     
    7284</project> 
  • main/trunk/release-kits/wirk2/ant-scripts/wrap.xml

    r19847 r21206  
    2626            <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
    2727            <job pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 
    28             <job pattern="@java.extracted@" replacement="${windows-java.extracted}"/> 
     28            <job pattern="@java.extracted@" replacement="${java.extracted}"/> 
    2929        </rsr> 
    3030    </target> 
     
    5050            <echo>adding greenstone2.jar to the resource script as chunks</echo> 
    5151            <rsplit 
    52                 resource="${basedir}/installer/Greenstone-${version}-win32.jar" 
     52                resource="${basedir}/installer/Greenstone-${version}-${os.suffix}.jar" 
    5353                outputDir="${basedir}/wrapped-installer" 
    5454                resourceScript="${basedir}/wrapped-installer/wrapper.rc" 
     
    7878        <mkdir dir="products"/> 
    7979        <exec executable="link" dir="${basedir}/wrapped-installer"> 
    80             <arg line="/OUT:..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
     80            <arg line="/OUT:..\products\Greenstone-${version}-${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
    8181        </exec> 
    8282    </target> 
  • main/trunk/release-kits/wirk2/resources/compile.bat

    r16170 r21206  
    1 call "C:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" 
     1::call "C:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" 
    22nmake /f win32.mak clean 
    3 nmake /f win32.mak 
     3nmake /f win32.mak APACHE_HTTPD=1 
    44nmake /f win32.mak LOCAL_LIBRARY=1