Ignore:
Timestamp:
2008-08-13T11:45:21+12:00 (16 years ago)
Author:
oranfry
Message:

changes to wirk2 after ant cleaned up

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release-kits/wirk2/ant-scripts/wrap.xml

    r16633 r16745  
    33
    44    <target name="wrap">
    5         <addressedcall target="copy-files-for-wrapping"/>
    6         <addressedcall target="tweak-files-for-wrapping"/>
    7         <addressedcall target="compile-resources"/>
    8         <addressedcall target="compile-wrapper"/>
    9         <addressedcall target="link-wrapper-no-java"/>
    10         <addressedcall target="link-wrapper-with-java"/>
     5        <antcall target="copy-files-for-wrapping"/>
     6        <antcall target="tweak-files-for-wrapping"/>
     7        <antcall target="compile-resources"/>
     8        <antcall target="compile-wrapper"/>
     9        <antcall target="link-wrapper-no-java"/>
     10        <antcall target="link-wrapper-with-java"/>
    1111    </target>
    1212
    1313    <target name="copy-files-for-wrapping">
    14         <if><bool><istrue value="${execute}"/></bool>
    15            
    16             <!--create a directory to build the wrapped installer in -->
    17             <mkdir dir="${basedir}/wrapped-installer/build"/>
    18            
    19             <!-- copy source files -->
    20             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/>
    21             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp" overwrite="true"/>
    22             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h" overwrite="true"/>
     14        <!--create a directory to build the wrapped installer in -->
     15        <mkdir dir="${basedir}/wrapped-installer/build"/>
    2316       
    24         </if>
     17        <!-- copy source files -->
     18        <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/>
     19        <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp" overwrite="true"/>
     20        <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h" overwrite="true"/>
    2521    </target>
    2622   
    2723    <target name="tweak-files-for-wrapping">
    28         <if><bool><istrue value="${execute}"/></bool>
    29            
    30             <!-- substitute the real java installer filename and min version into various files -->
    31             <echo>Substitute concrete values of things into source files</echo>
    32             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>
    33             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
    34             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
    35            
    36         </if>
     24        <!-- substitute the real java installer filename and min version into various files -->
     25        <echo>Substitute concrete values of things into source files</echo>
     26        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>
     27        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
     28        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
    3729    </target>
    3830
    3931    <target name="compile-resources">
    40         <if><bool><istrue value="${execute}"/></bool>
     32        <if>
     33            <bool>
     34                <not>
     35                    <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
     36                        <srcfiles dir="${wirk2.home}/greenstone2/icon" includes="gs2.ico"/>
     37                        <srcfiles dir="${wirk2.home}/windows/wrapper" includes="${windows-java.installer}"/>
     38                        <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
     39                        <srcfiles dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
     40                        <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.rc"/>
     41                        <srcfiles dir="${basedir}/installer" includes="greenstone2.jar"/>
     42                    </uptodate>
     43                </not>
     44            </bool>
    4145           
    42             <if>
    43                 <bool>
    44                     <not>
    45                         <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
    46                             <srcfiles dir="${wirk2.home}/greenstone2/icon" includes="gs2.ico"/>
    47                             <srcfiles dir="${wirk2.home}/windows/wrapper" includes="${windows-java.installer}"/>
    48                             <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
    49                             <srcfiles dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
    50                             <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.rc"/>
    51                             <srcfiles dir="${basedir}/installer" includes="greenstone2.jar"/>
    52                         </uptodate>
    53                     </not>
    54                 </bool>
    55                
    56                 <echo>Compiling resources</echo>
    57                
    58                 <echo>getting the template resource script</echo>
    59                 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
    60                
    61                 <echo>copying the small resource files into place</echo>
    62                 <copy todir="${basedir}/wrapped-installer/build" overwrite="true">
    63                     <fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
    64                     <fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
    65                     <fileset dir="${wirk2.home}/greenstone2/icon" includes="icon.ico"/>
    66                 </copy>
    67                
    68                 <echo>adding greenstone2.jar to the resource script as chunks</echo>
    69                 <rsplit
    70                     resource="${basedir}/installer/greenstone-${version}-win32.jar"
    71                     outputDir="${basedir}/wrapped-installer/build"
    72                     resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
    73                     resourceName="JAR"
    74                     resourceType="JAR"
    75                     chunkSize="${resources.chunksize}"
    76                     />
     46            <echo>Compiling resources</echo>
    7747           
    78                 <echo>resource compiling the resource script</echo>
    79                 <exec executable="rc" dir="${basedir}/wrapped-installer/build">
    80                     <arg line="wrapper.rc"/>
    81                 </exec>
    82                
    83                 <echo>making a copy of the resource script</echo>
    84                 <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" overwrite="true"/>
    85                
    86                 <echo>adding ${windows-java.installer} to the copy as chunks</echo>
    87                 <rsplit
    88                     resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
    89                     outputDir="${basedir}/wrapped-installer/build"                 
    90                     resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"
    91                     resourceName="JAVA"
    92                     resourceType="EXE"
    93                     chunkSize="${resources.chunksize}"
    94                     />
     48            <echo>getting the template resource script</echo>
     49            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
     50           
     51            <echo>copying the small resource files into place</echo>
     52            <copy todir="${basedir}/wrapped-installer/build" overwrite="true">
     53                <fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
     54                <fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
     55                <fileset dir="${wirk2.home}/greenstone2/icon" includes="icon.ico"/>
     56            </copy>
     57           
     58            <echo>adding greenstone2.jar to the resource script as chunks</echo>
     59            <rsplit
     60                resource="${basedir}/installer/greenstone-${version}-win32.jar"
     61                outputDir="${basedir}/wrapped-installer/build"
     62                resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
     63                resourceName="JAR"
     64                resourceType="JAR"
     65                chunkSize="${resources.chunksize}"
     66                />
     67       
     68            <echo>resource compiling the resource script</echo>
     69            <exec executable="rc" dir="${basedir}/wrapped-installer/build">
     70                <arg line="wrapper.rc"/>
     71            </exec>
     72           
     73            <echo>making a copy of the resource script</echo>
     74            <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" overwrite="true"/>
     75           
     76            <echo>adding ${windows-java.installer} to the copy as chunks</echo>
     77            <rsplit
     78                resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
     79                outputDir="${basedir}/wrapped-installer/build"                 
     80                resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"
     81                resourceName="JAVA"
     82                resourceType="EXE"
     83                chunkSize="${resources.chunksize}"
     84                />
    9585
    96                 <echo>resource compiling the generated resource script again</echo>
    97                 <exec executable="rc" dir="${basedir}/wrapped-installer/build">
    98                     <arg line="wrapper-with-jre.rc"/>
    99                 </exec>
    100                
    101                 <else>
    102                     <echo>Resourses are up-to-date, will not compile</echo>
    103                 </else>
    104             </if>
     86            <echo>resource compiling the generated resource script again</echo>
     87            <exec executable="rc" dir="${basedir}/wrapped-installer/build">
     88                <arg line="wrapper-with-jre.rc"/>
     89            </exec>
    10590           
    106            
     91            <else>
     92                <echo>Resourses are up-to-date, will not compile</echo>
     93            </else>
    10794        </if>
    10895    </target>
    10996
    11097    <target name="compile-wrapper">
    111         <if><bool><istrue value="${execute}"/></bool>
     98        <exec executable="cl" dir="${basedir}/wrapped-installer/build">
     99            <arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/>
     100        </exec>
    112101
    113             <exec executable="cl" dir="${basedir}/wrapped-installer/build">
    114                 <arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/>
    115             </exec>
    116 
    117             <exec executable="cl" dir="${basedir}/wrapped-installer/build">
    118                 <arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/>
    119             </exec>
    120            
    121         </if>
     102        <exec executable="cl" dir="${basedir}/wrapped-installer/build">
     103            <arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/>
     104        </exec>
    122105    </target>
    123106   
    124107    <target name="link-wrapper-no-java">
    125         <if><bool><istrue value="${execute}"/></bool>
    126             <exec executable="link" dir="${basedir}/wrapped-installer/build">
    127                 <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
    128             </exec>
    129         </if>
     108        <exec executable="link" dir="${basedir}/wrapped-installer/build">
     109            <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
     110        </exec>
    130111    </target>
    131112
    132113    <target name="link-wrapper-with-java">
    133         <if><bool><istrue value="${execute}"/></bool>
    134             <exec executable="link" dir="${basedir}/wrapped-installer/build">
    135                 <arg line="/OUT:..\greenstone-${version}-win32-with-java.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper-with-jre.res"/>
    136             </exec>
    137         </if>
     114        <exec executable="link" dir="${basedir}/wrapped-installer/build">
     115            <arg line="/OUT:..\greenstone-${version}-win32-with-java.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper-with-jre.res"/>
     116        </exec>
    138117    </target>
    139118
Note: See TracChangeset for help on using the changeset viewer.