Changeset 17311

Timestamp:

2008-09-17T16:23:38+12:00 (16 years ago)

Author:

oranfry

Message:

standardised the java bundling stuff

File:

• release-kits/wirk2/installer/build.xml (modified) (4 diffs)

release-kits/wirk2/installer/build.xml

@@ -79 +79 @@
         
         <echo message="Creating admin and demo users"/>
-        <adduser txt2db="${installDir}/bin/windows/txt2db"
+        <adduser
+            txt2db="${installDir}/bin/windows/txt2db"
             usersDb="${installDir}/etc/users.db"
             username="admin"
@@ -99 +100 @@
 
         <echo message="Filling in concrete values in config files"/>
-        <rsr
-            file="${installDir}/setup.bat"
-            pattern="\*\*GSDLHOME\*\*"
-            replacement="${installDir}"/>
-        <rsr
-            file="${installDir}/cgi-bin/gsdlsite.cfg"
-            pattern="\*\*GSDLHOME\*\*"
-            replacement="${installDir}"/>
-
-        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/>
-        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
-
+        <rsr file="${installDir}/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
+        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg">
+            <job pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
+            <job pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/>
+            <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
+        </rsr>
         <rsr file="${installDir}/gsdlsite.cfg" pattern="@gsdlhome@" replacement="${installDir}"/>
                 
@@ -133 +128 @@
         </unzip>
         
+    </target>
+
+    <target name="install-java">
+        <echo>Installing bundled java</echo>
+        <mkdir dir="${installDir}/packages"/>
+        <copy todir="${installDir}/packages/jre">
+            <fileset dir="../@java.extracted@"/>
+        </copy>
     </target>
     
@@ -160 +163 @@
         <shortcut
             file="${startmenu.path}\Uninstall.lnk"
-            execute="${installDir}\bin\windows\search4j.exe -h packages\jre -l Uninstaller.jar"
+            execute="${installDir}\bin\windows\search4j.exe -h packages\jre -l Uninstall.jar"
             workingDirectory="${installDir}"
             iconFile="${installDir}\images\icon.ico"