Ignore:
Timestamp:
2008-05-23T17:10:14+12:00 (16 years ago)
Author:
oranfry
Message:

changes to the ant scripts to accompany the changes in the wrapper and jar installer

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r15095 r15691  
    1515
    1616    <target name="wrap">
    17         <addressedcall target="setup-for-wrapping"/>
     17        <addressedcall target="copy-files-for-wrapping"/>
     18        <addressedcall target="tweak-files-for-wrapping"/>
     19        <addressedcall target="compile-resources"/>
    1820        <addressedcall target="compile-wrapper"/>
    19         <addressedcall target="clean-up-after-wrapping"/>
     21        <addressedcall target="link-wrapper-no-java"/>
     22        <addressedcall target="link-wrapper-with-java"/>
     23        <!--<addressedcall target="clean-up-after-wrapping"/>-->
    2024    </target>
    2125
    2226
    23     <target name="setup-for-wrapping">
     27    <target name="copy-files-for-wrapping">
    2428        <if><bool><istrue value="${execute}"/></bool>
    25 
     29           
    2630            <!--create a directory to build the wrapped installer in -->
    2731            <mkdir dir="${basedir}/wrapped-installer/build"/>
     32
     33            <!-- copy source files -->
    2834            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.cpp"/>
     35            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/libsearch4j.h"/>
    2936            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.rc"/>
    30             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper-with-jre.rc"/>
    31 
    32             <!-- copy resources to bundle -->
    33             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/icon/gs3.ico"/>
    34             <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"/>
    36             <copy tofile="${basedir}/wrapped-installer/build/greenstone3.jar" file="${basedir}/installer/greenstone-${version}-win32.jar"/>
     37       
     38        </if>
     39    </target>
     40   
     41    <target name="tweak-files-for-wrapping">
     42        <if><bool><istrue value="${execute}"/></bool>
    3743           
    38 
    3944            <!-- substitute the real java installer filename and min version into various files -->
     45            <echo>Substitute concrete values of things into source files</echo>
    4046            <rsr file="${basedir}/wrapped-installer/build/wrapper.rc" pattern="@java.installer@" replacement="${java.installer}"/>
    41             <rsr file="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" pattern="@java.installer@" replacement="${java.installer}"/>
    4247            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
    4348            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
     49            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
     50           
     51        </if>
     52    </target>
    4453
     54    <target name="compile-resources">
     55        <if><bool><istrue value="${execute}"/></bool>
     56           
     57            <if>
     58                <bool>
     59                    <not>
     60                        <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
     61                            <srcfiles dir="${wirk3.home}/icon" includes="gs3.ico"/>
     62                            <srcfiles dir="${wirk3.home}/wrapper" includes="${java.installer}"/>
     63                            <srcfiles dir="${wirk3.home}/wrapper" includes="*.bmp"/>
     64                            <srcfiles dir="${wirk3.home}/wrapper" includes="*.rc"/>
     65                            <srcfiles dir="${basedir}/installer" includes="greenstone3.jar"/>
     66                        </uptodate>
     67                    </not>
     68                </bool>
     69               
     70                <echo>Compiling resources</echo>
     71
     72                <echo>copying the resource files into place</echo>
     73                <copy todir="${basedir}/wrapped-installer/build">
     74                    <fileset dir="${wirk3.home}/wrapper" includes="*.bmp,${java.installer}"/>
     75                    <fileset dir="${wirk3.home}/icon" includes="gs3.ico"/>
     76                </copy>
     77                <copy tofile="${basedir}/wrapped-installer/build/greenstone3.jar" file="${basedir}/installer/greenstone-${version}-win32.jar"/>
     78
     79                <echo>splitting the big resources into chunks</echo>
     80                <property name="resource.chunk.size" value="8388608" /><!-- 8Mib -->
     81                <delete><fileset dir="${basedir}/wrapped-installer/build" includes="greenstone3.jar.*"/></delete>
     82                <exec executable="split.exe" dir="${basedir}/wrapped-installer/build">
     83                    <arg value="${basedir}/wrapped-installer/build/greenstone3.jar" />
     84                    <arg value="${resource.chunk.size}" />
     85                </exec>
     86                <delete><fileset dir="${basedir}/wrapped-installer/build" includes="${java.installer}.*"/></delete>
     87                <exec executable="split.exe" dir="${basedir}/wrapped-installer/build">
     88                    <arg value="${basedir}/wrapped-installer/build/${java.installer}" />
     89                    <arg value="${resource.chunk.size}" />
     90                </exec>
     91               
     92                <echo>adding the chunks to the resource scripts</echo>
     93               
     94                <!-- compile the resources with bundled java-->
     95                <exec executable="rc" dir="${basedir}/wrapped-installer/build">
     96                    <arg line="wrapper.rc"/>
     97                </exec>
     98                <move file="${basedir}/wrapped-installer/build/wrapper.RES" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.RES"/>
     99
     100                <!-- compile the resources without bundled java -->
     101                <rsr file="${basedir}/wrapped-installer/build/wrapper.rc" pattern="^.*//bundled java only$" replacement=""/>
     102                <exec executable="rc" dir="${basedir}/wrapped-installer/build">
     103                    <arg line="wrapper.rc"/>
     104                </exec>
     105               
     106                <else>
     107                    <echo>Resourses are up-to-date, will not compile</echo>
     108                </else>
     109            </if>
     110           
    45111           
    46112        </if>
    … …  
    50116        <if><bool><istrue value="${execute}"/></bool>
    51117
    52             <echo>Compiling the resources</echo>
    53             <exec executable="rc" dir="${basedir}/wrapped-installer/build">
    54                 <arg line="wrapper.rc"/>
    55             </exec>
    56             <exec executable="rc" dir="${basedir}/wrapped-installer/build">
    57                 <arg line="wrapper-with-jre.rc"/>
    58             </exec>
    59 
    60            
    61             <echo>Compiling the wrapper</echo>
    62118            <exec executable="cl" dir="${basedir}/wrapped-installer/build">
    63                 <arg line="/c -GX wrapper.cpp /out:wrapper.obj"/>
     119                <arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/>
    64120            </exec>
    65121           
    66             <echo>Linking</echo>
     122        </if>
     123    </target>
     124   
     125    <target name="link-wrapper-no-java">
     126        <if><bool><istrue value="${execute}"/></bool>
    67127            <exec executable="link" dir="${basedir}/wrapped-installer/build">
    68                 <arg line="/OUT:..\greenstone-${version}-win32.exe wrapper.obj wrapper.res"/>
     128                <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.res"/>
    69129            </exec>
     130        </if>
     131    </target>
     132
     133    <target name="link-wrapper-with-java">
     134        <if><bool><istrue value="${execute}"/></bool>
    70135            <exec executable="link" dir="${basedir}/wrapped-installer/build">
    71                 <arg line="/OUT:..\greenstone-${version}-win32-with-java.exe wrapper.obj wrapper-with-jre.res"/>
     136                <arg line="/OUT:..\greenstone-${version}-win32-with-java.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper-with-jre.res"/>
    72137            </exec>
    73138        </if>
Note: See TracChangeset for help on using the changeset viewer.