Ignore:
Timestamp:
2008-03-20T10:48:10+13:00 (16 years ago)
Author:
oranfry
Message:

checking in a few weeks work on wirk3

Location:
release-kits/wirk3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • release-kits/wirk3

    • Property svn:externals

      •  

        old new  
        11lib http://svn.greenstone.org/release-kits/shared/lib
         2search4j http://svn.greenstone.org/release-kits/shared/search4j
        23
         4

  • release-kits/wirk3/ant-scripts/wrap.xml

    r15023 r15095  
    1111<project name="wirk3-wrap" default="wrap">
    1212    <property name="java.installer" value="jre-6u3-windows-i586-p-s.exe"/>
     13    <property name="java.min.version" value="1.5.0_00"/>
    1314
    1415
    … …  
    2324        <if><bool><istrue value="${execute}"/></bool>
    2425
     26            <!--create a directory to build the wrapped installer in -->
    2527            <mkdir dir="${basedir}/wrapped-installer/build"/>
    2628            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.cpp"/>
    … …  
    2830            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper-with-jre.rc"/>
    2931
    30             <!-- resources to bundle -->
     32            <!-- copy resources to bundle -->
    3133            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/icon/gs3.ico"/>
    3234            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/${java.installer}"/>
     35            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/search4j.exe"/>
    3336            <copy tofile="${basedir}/wrapped-installer/build/greenstone3.jar" file="${basedir}/installer/greenstone-${version}-win32.jar"/>
    34             <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/launcher/launch-installer.exe"/>
     37           
    3538
    36             <!-- substitute in the real java installer filename -->
     39            <!-- substitute the real java installer filename and min version into various files -->
    3740            <rsr file="${basedir}/wrapped-installer/build/wrapper.rc" pattern="@java.installer@" replacement="${java.installer}"/>
    3841            <rsr file="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" pattern="@java.installer@" replacement="${java.installer}"/>
    3942            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
     43            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
    4044
    4145           
    … …  
    6569            </exec>
    6670            <exec executable="link" dir="${basedir}/wrapped-installer/build">
    67                 <arg line="/OUT:..\greenstone-${version}-win32-with-jre.exe wrapper.obj wrapper-with-jre.res"/>
     71                <arg line="/OUT:..\greenstone-${version}-win32-with-java.exe wrapper.obj wrapper-with-jre.res"/>
    6872            </exec>
    6973        </if>
Note: See TracChangeset for help on using the changeset viewer.