Changeset 17308 for release-kits/wirk2/ant-scripts

Timestamp:

2008-09-17T16:22:34+12:00 (16 years ago)

Author:

oranfry

Message:

standardised the java bundling stuff

Location:

release-kits/wirk2/ant-scripts

Files:

• build.xml (modified) (1 diff)
• create-installer.xml (modified) (1 diff)
• wrap.xml (modified) (6 diffs)

release-kits/wirk2/ant-scripts/build.xml

@@ -17 +17 @@
     <!-- for the benefit of the shared scripts, set release-kit home -->
     <property name="rk.home" value="${wirk2.home}" />
-
+    <property name="rk.os" value="windows" />
 
     <!-- IMPORT OTHER ANT SCRIPTS -->

release-kits/wirk2/ant-scripts/create-installer.xml

@@ -36 +36 @@
             <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
             <zipfileset dir="${basedir}/distributions/web" includes="**/*" />
-            
         </installer>
+        
     </target>
     

release-kits/wirk2/ant-scripts/wrap.xml

@@ -7 +7 @@
         <antcall target="compile-resources"/>
         <antcall target="compile-wrapper"/>
-        <antcall target="link-wrapper-no-java"/>
-        <antcall target="link-wrapper-with-java"/>
+        <antcall target="link-wrapper"/>
     </target>
 
@@ -24 +23 @@
     <target name="tweak-files-for-wrapping">
         <echo>Substitute concrete values of things into source files</echo>
-        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>
-        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
-        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
+        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp">
+            <job pattern="@java.installer@" replacement="${windows-java.installer}"/>
+            <job pattern="@java.min.version@" replacement="${java.min.version}"/>
+            <job pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
+            <job pattern="@java.extracted@" replacement="${windows-java.extracted}"/>
+        </rsr>
     </target>
 
@@ -65 +67 @@
                 chunkSize="${resources.chunksize}"
                 />
-        
-            <echo>resource compiling the resource script</echo>
-            <exec executable="rc" dir="${basedir}/wrapped-installer/build">
-                <arg line="wrapper.rc"/>
-            </exec>
-            
-            <echo>making a copy of the resource script</echo>
-            <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" overwrite="true"/>
             
             <echo>adding ${windows-java.installer} to the copy as chunks</echo>
@@ -78 +72 @@
                 resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
                 outputDir="${basedir}/wrapped-installer/build"                  
-                resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"
+                resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
                 resourceName="JAVA"
                 resourceType="EXE"
-                chunkSize="${resources.chunksize}"
-                />
-
-            <echo>resource compiling the generated resource script again</echo>
+                chunkSize="${resources.chunksize}"/>
+            
+            <echo>resource compiling the generated resource script</echo>
             <exec executable="rc" dir="${basedir}/wrapped-installer/build">
-                <arg line="wrapper-with-jre.rc"/>
+                <arg line="wrapper.rc"/>
             </exec>
             
@@ -105 +98 @@
     </target>
     
-    <target name="link-wrapper-no-java">
+    <target name="link-wrapper">
         <exec executable="link" dir="${basedir}/wrapped-installer/build">
             <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
@@ -111 +104 @@
     </target>
 
-    <target name="link-wrapper-with-java">
-        <exec executable="link" dir="${basedir}/wrapped-installer/build">
-            <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"/>
-        </exec>
-    </target>
-
 </project>