[Hyperic-hq-discuss] hq r6199 - trunk/installer/bin

[<tk...@hy...>]

Author: tkeeney
Date: 2007-10-12 17:52:12 -0700 (Fri, 12 Oct 2007)
New Revision: 6199
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=6199

Modified:
   trunk/installer/bin/hq-setup.bat
   trunk/installer/bin/hq-setup.sh
Log:
Updated HQ Server installer builds to use the 1.5.0_12 JRE.

Modified: trunk/installer/bin/hq-setup.bat
===================================================================
--- trunk/installer/bin/hq-setup.bat	2007-10-13 00:51:08 UTC (rev 6198)
+++ trunk/installer/bin/hq-setup.bat	2007-10-13 00:52:12 UTC (rev 6199)
@@ -22,7 +22,7 @@
 goto noJavaExe
 
 :haveBuiltinJRE:
-"%INSTALL_DIR%\jres\x86-win32-jre.exe" -d "%TEMP%" > nul
+"%INSTALL_DIR%\jres\x86-win32-jre-1_5.exe" -d "%TEMP%" > nul
 SET JAVA_HOME=%TEMP%\jre
 SET USE_BUILTIN_JRE=1
 goto basicAntSetup

Modified: trunk/installer/bin/hq-setup.sh
===================================================================
--- trunk/installer/bin/hq-setup.sh	2007-10-13 00:51:08 UTC (rev 6198)
+++ trunk/installer/bin/hq-setup.sh	2007-10-13 00:52:12 UTC (rev 6199)
@@ -37,17 +37,14 @@
 case "$platform" in
     Linux )
         if [ "${machine}" = "x86_64" ]; then
-            JRE_NAME=amd64-linux-jre.tar.gz
+            JRE_NAME=amd64-linux-jre-1_5.tar.gz
         else
-            JRE_NAME=x86-linux-glibc2-jre.tar.gz
+            JRE_NAME=x86-linux-glibc2-jre-1_5.tar.gz
         fi
         ;;
     SunOS )
-        JRE_NAME=sparc-sun-solaris-jre.tar.gz
+        JRE_NAME=sparc-sun-solaris-jre-1_5.tar.gz
         ;;
-    HP-UX )
-        JRE_NAME=hppa2.0-hp-hpux-11.x-jre.tar.gz
-        ;;
 esac
 
 HQ_JAVA_HOME=