Changeset 15095 for release-kits/wirk3/ant-scripts

Timestamp:

2008-03-20T10:48:10+13:00 (16 years ago)

Author:

oranfry

Message:

checking in a few weeks work on wirk3

Location:

release-kits/wirk3

Files:

• . (modified) (1 prop)
• ant-scripts/build.xml (modified) (2 diffs)
• ant-scripts/create-distribution.xml (modified) (2 diffs)
• ant-scripts/wrap.xml (modified) (4 diffs)

release-kits/wirk3

@@ -1 +1 @@
 lib http://svn.greenstone.org/release-kits/shared/lib
+search4j http://svn.greenstone.org/release-kits/shared/search4j
 
+

@@ -1 +1 @@
 lib http://svn.greenstone.org/release-kits/shared/lib
+search4j http://svn.greenstone.org/release-kits/shared/search4j
 
+

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

@@ -15 +15 @@
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>
-    <import file="create-launcher.xml"/>
     <import file="create-installer.xml"/>
     <import file="wrap.xml"/>
@@ -24 +23 @@
         <addressedcall target="compile"/>
         <addressedcall target="create-distribution"/>
-        <addressedcall target="create-launcher"/>
         <addressedcall target="create-installer"/>
         <addressedcall target="wrap"/>

release-kits/wirk3/ant-scripts/create-distribution.xml

@@ -59 +59 @@
     <target name="create-distributions-2">
         <if><bool><istrue value="${execute}"/></bool>
-            <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
+            <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false">
                 <property name="app.version" value="${version}"/>
                 <property name="branch.path" value="${branch.path}"/>
@@ -69 +69 @@
     <target name="create-distributions-3">
         <if><bool><istrue value="${execute}"/></bool>
-            <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
+            <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritall="false">
                 <property name="app.version" value="${version}"/>
                 <property name="branch.path" value="${branch.path}"/>

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

@@ -11 +11 @@
 <project name="wirk3-wrap" default="wrap">
     <property name="java.installer" value="jre-6u3-windows-i586-p-s.exe"/>
+    <property name="java.min.version" value="1.5.0_00"/>
 
 
@@ -23 +24 @@
         <if><bool><istrue value="${execute}"/></bool>
 
+            <!--create a directory to build the wrapped installer in -->
             <mkdir dir="${basedir}/wrapped-installer/build"/>
             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.cpp"/>
@@ -28 +30 @@
             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper-with-jre.rc"/>
 
-            <!-- resources to bundle -->
+            <!-- copy resources to bundle -->
             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/icon/gs3.ico"/>
             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/${java.installer}"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/search4j.exe"/>
             <copy tofile="${basedir}/wrapped-installer/build/greenstone3.jar" file="${basedir}/installer/greenstone-${version}-win32.jar"/>
-            <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/launcher/launch-installer.exe"/>
+            
 
-            <!-- substitute in the real java installer filename -->
+            <!-- substitute the real java installer filename and min version into various files -->
             <rsr file="${basedir}/wrapped-installer/build/wrapper.rc" pattern="@java.installer@" replacement="${java.installer}"/>
             <rsr file="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" pattern="@java.installer@" replacement="${java.installer}"/>
             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
+            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
 
             
@@ -65 +69 @@
             </exec>
             <exec executable="link" dir="${basedir}/wrapped-installer/build">
-                <arg line="/OUT:..\greenstone-${version}-win32-with-jre.exe wrapper.obj wrapper-with-jre.res"/>
+                <arg line="/OUT:..\greenstone-${version}-win32-with-java.exe wrapper.obj wrapper-with-jre.res"/>
             </exec>
         </if>

@@ -1 +1 @@
 lib http://svn.greenstone.org/release-kits/shared/lib
+search4j http://svn.greenstone.org/release-kits/shared/search4j
 
+