Changeset 15900 for release-kits/wirk3/ant-scripts/wrap.xml
- Timestamp:
- 2008-06-06T11:59:58+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
release-kits/wirk3/ant-scripts/wrap.xml
r15691 r15900 10 10 11 11 <project name="wirk3-wrap" default="wrap"> 12 <property name="java.installer" value="jre-6u3-windows-i586-p-s.exe"/>13 <property name="java.min.version" value="1.5.0_00"/>14 15 12 16 13 <target name="wrap"> … … 21 18 <addressedcall target="link-wrapper-no-java"/> 22 19 <addressedcall target="link-wrapper-with-java"/> 23 <!--<addressedcall target="clean-up-after-wrapping"/>-->24 20 </target> 25 26 21 27 22 <target name="copy-files-for-wrapping"> … … 33 28 <!-- copy source files --> 34 29 <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.cpp"/> 30 <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/libsearch4j.cpp"/> 35 31 <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/libsearch4j.h"/> 36 <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.rc"/>37 32 38 33 </if> … … 44 39 <!-- substitute the real java installer filename and min version into various files --> 45 40 <echo>Substitute concrete values of things into source files</echo> 46 <rsr file="${basedir}/wrapped-installer/build/wrapper.rc" pattern="@java.installer@" replacement="${java.installer}"/>47 41 <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/> 48 42 <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/> … … 69 63 70 64 <echo>Compiling resources</echo> 71 72 <echo>copying the resource files into place</echo> 65 66 <echo>getting the template resource script</echo> 67 <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.rc" overwrite="true"/> 68 69 <echo>copying the small resource files into place</echo> 73 70 <copy todir="${basedir}/wrapped-installer/build"> 74 <fileset dir="${wirk3.home}/wrapper" includes="*.bmp ,${java.installer}"/>71 <fileset dir="${wirk3.home}/wrapper" includes="*.bmp"/> 75 72 <fileset dir="${wirk3.home}/icon" includes="gs3.ico"/> 76 73 </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 74 92 <echo>adding the chunks to the resource scripts</echo> 93 94 <!-- compile the resources with bundled java--> 75 <echo>adding greenstone3.jar to the resource script as chunks</echo> 76 <rsplit 77 resource="${basedir}/installer/greenstone-${version}-win32.jar" 78 outputDir="${basedir}/wrapped-installer/build" 79 resourceScript="${basedir}/wrapped-installer/build/wrapper.rc" 80 resourceName="JAR" 81 resourceType="JAR" 82 chunkSize="${resources.chunksize}" 83 /> 84 85 <echo>resource compiling the resource script</echo> 95 86 <exec executable="rc" dir="${basedir}/wrapped-installer/build"> 96 87 <arg line="wrapper.rc"/> 97 88 </exec> 98 <move file="${basedir}/wrapped-installer/build/wrapper.RES" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.RES"/> 89 90 <echo>making a copy of the resource script</echo> 91 <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/> 92 93 <echo>adding ${java.installer} to the copy as chunks</echo> 94 <rsplit 95 resource="${wirk3.home}/wrapper/${java.installer}" 96 outputDir="${basedir}/wrapped-installer/build" 97 resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" 98 resourceName="JAVA" 99 resourceType="EXE" 100 chunkSize="${resources.chunksize}" 101 /> 99 102 100 <!-- compile the resources without bundled java --> 101 <rsr file="${basedir}/wrapped-installer/build/wrapper.rc" pattern="^.*//bundled java only$" replacement=""/> 103 <echo>resource compiling the generated resource script again</echo> 102 104 <exec executable="rc" dir="${basedir}/wrapped-installer/build"> 103 <arg line="wrapper .rc"/>105 <arg line="wrapper-with-jre.rc"/> 104 106 </exec> 105 107 … … 117 119 118 120 <exec executable="cl" dir="${basedir}/wrapped-installer/build"> 121 <arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/> 122 </exec> 123 124 <exec executable="cl" dir="${basedir}/wrapped-installer/build"> 119 125 <arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/> 120 126 </exec> … … 126 132 <if><bool><istrue value="${execute}"/></bool> 127 133 <exec executable="link" dir="${basedir}/wrapped-installer/build"> 128 <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.res"/>134 <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 129 135 </exec> 130 136 </if> … … 134 140 <if><bool><istrue value="${execute}"/></bool> 135 141 <exec executable="link" dir="${basedir}/wrapped-installer/build"> 136 <arg line="/OUT:..\greenstone-${version}-win32-with-java.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper-with-jre.res"/>142 <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"/> 137 143 </exec> 138 144 </if> 139 145 </target> 140 146 141 <target name="clean-up-after-wrapping">142 <if><bool><istrue value="${execute}"/></bool>143 <delete dir="${basedir}/wrapped-installer/build"/>144 </if>145 </target>146 147 148 149 147 </project>
Note:
See TracChangeset
for help on using the changeset viewer.