Changeset 17308 for release-kits/wirk2
- Timestamp:
- 2008-09-17T16:22:34+12:00 (16 years ago)
- Location:
- release-kits/wirk2/ant-scripts
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
release-kits/wirk2/ant-scripts/build.xml
r17291 r17308 17 17 <!-- for the benefit of the shared scripts, set release-kit home --> 18 18 <property name="rk.home" value="${wirk2.home}" /> 19 19 <property name="rk.os" value="windows" /> 20 20 21 21 <!-- IMPORT OTHER ANT SCRIPTS --> -
release-kits/wirk2/ant-scripts/create-installer.xml
r17107 r17308 36 36 <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 37 37 <zipfileset dir="${basedir}/distributions/web" includes="**/*" /> 38 39 38 </installer> 39 40 40 </target> 41 41 -
release-kits/wirk2/ant-scripts/wrap.xml
r17268 r17308 7 7 <antcall target="compile-resources"/> 8 8 <antcall target="compile-wrapper"/> 9 <antcall target="link-wrapper-no-java"/> 10 <antcall target="link-wrapper-with-java"/> 9 <antcall target="link-wrapper"/> 11 10 </target> 12 11 … … 24 23 <target name="tweak-files-for-wrapping"> 25 24 <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}"/> 25 <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp"> 26 <job pattern="@java.installer@" replacement="${windows-java.installer}"/> 27 <job pattern="@java.min.version@" replacement="${java.min.version}"/> 28 <job pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 29 <job pattern="@java.extracted@" replacement="${windows-java.extracted}"/> 30 </rsr> 29 31 </target> 30 32 … … 65 67 chunkSize="${resources.chunksize}" 66 68 /> 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 69 76 70 <echo>adding ${windows-java.installer} to the copy as chunks</echo> … … 78 72 resource="${wirk2.home}/windows/wrapper/${windows-java.installer}" 79 73 outputDir="${basedir}/wrapped-installer/build" 80 resourceScript="${basedir}/wrapped-installer/build/wrapper -with-jre.rc"74 resourceScript="${basedir}/wrapped-installer/build/wrapper.rc" 81 75 resourceName="JAVA" 82 76 resourceType="EXE" 83 chunkSize="${resources.chunksize}" 84 /> 85 86 <echo>resource compiling the generated resource script again</echo> 77 chunkSize="${resources.chunksize}"/> 78 79 <echo>resource compiling the generated resource script</echo> 87 80 <exec executable="rc" dir="${basedir}/wrapped-installer/build"> 88 <arg line="wrapper -with-jre.rc"/>81 <arg line="wrapper.rc"/> 89 82 </exec> 90 83 … … 105 98 </target> 106 99 107 <target name="link-wrapper -no-java">100 <target name="link-wrapper"> 108 101 <exec executable="link" dir="${basedir}/wrapped-installer/build"> 109 102 <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> … … 111 104 </target> 112 105 113 <target name="link-wrapper-with-java">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>117 </target>118 119 106 </project>
Note:
See TracChangeset
for help on using the changeset viewer.