From 047e5f58bb9dc8b67e1b2b61ce897c23fed8a2a4 Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 26 Jan 2010 16:08:17 -0800 Subject: Windows SDK: use find_java.bat in all batch wrappers. SDK Bug: 2315813 Change-Id: If026d09f927b3d0b5707dfd08e1367e4ba2da28b --- hierarchyviewer/etc/hierarchyviewer.bat | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'hierarchyviewer') diff --git a/hierarchyviewer/etc/hierarchyviewer.bat b/hierarchyviewer/etc/hierarchyviewer.bat index 2024a79..28a4d8d 100755 --- a/hierarchyviewer/etc/hierarchyviewer.bat +++ b/hierarchyviewer/etc/hierarchyviewer.bat @@ -24,6 +24,11 @@ rem Change current directory and drive to where the script is, to avoid rem issues with directories containing whitespaces. cd /d %~dp0 +rem Check we have a valid Java.exe in the path. +set java_exe= +call find_java.bat +if not defined java_exe goto :EOF + set jarfile=hierarchyviewer.jar set frameworkdir= set libdir= @@ -38,4 +43,4 @@ if exist %frameworkdir%%jarfile% goto JarFileOk set jarpath=%frameworkdir%%jarfile% -call java -Xmx512m -Djava.ext.dirs=%frameworkdir% -Dhierarchyviewer.adb= -jar %jarpath% %* +call %java_exe% -Xmx512m -Djava.ext.dirs=%frameworkdir% -Dhierarchyviewer.adb= -jar %jarpath% %* -- cgit v1.1