Changeset 15053 for release-kits/wirk3/installer/build.xml

Timestamp:

2008-03-06T14:08:49+13:00 (16 years ago)

Author:

oranfry

Message:

lots of work on wirk3

File:

• release-kits/wirk3/installer/build.xml (modified) (2 diffs)

release-kits/wirk3/installer/build.xml

@@ -24 +24 @@
         <echo>antinstaller.jar: ${antinstaller.jar}</echo>
         <mkdir dir="${installDir}"/>
-
 
         <!-- install binaries  -->
@@ -106 +105 @@
         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
 
-        <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH -->
+        <!-- get the found JRE_HOME -->
+        <exec executable="cmd" dir="${installDir}" outputproperty="backup.jre.home"><arg line="/C launch-installer.exe -find"/></exec>
+                
+        <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH, and set the fallback JRE_HOME -->
         <echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
-        <exec executable="cmd" output="${installDir}/gs3-setup.sh" append="true">
-            <arg
-            line="/C echo set ANT_HOME=${installDir}/packages/ant
-set PATH=%ANT_HOME%/bin:%PATH%"/>
-        </exec>
+        <exec executable="cmd" output="${installDir}/machine.bat" append="true"><arg line="/C echo set ANT_HOME=${installDir}/packages/ant"/></exec>
+        <exec executable="cmd" output="${installDir}/machine.bat" append="true"><arg line="/C echo set PATH=\%ANT_HOME\%/bin:\%PATH\%"/></exec>
+        <exec executable="cmd" output="${installDir}/machine.bat" append="true"><arg line="/C echo set BACKUP_JRE_HOME=${backup.jre.home}"/></exec>
 
         <!-- delete unneeded files -->