Support for installing SDK in C:\Program Files
Properly handles spaces in installation pathname on Windows.
Change-Id: I8bcfd18fddbe6d5ad70a8563e8696af2876c1d1b
diff --git a/apkbuilder/etc/apkbuilder.bat b/apkbuilder/etc/apkbuilder.bat
index c82f01d..3375b85 100755
--- a/apkbuilder/etc/apkbuilder.bat
+++ b/apkbuilder/etc/apkbuilder.bat
@@ -30,16 +30,16 @@
if not defined java_exe goto :EOF
set jarfile=sdklib.jar
-set frameworkdir=
+set frameworkdir=.
-if exist %frameworkdir%%jarfile% goto JarFileOk
- set frameworkdir=lib\
+if exist %frameworkdir%\%jarfile% goto JarFileOk
+ set frameworkdir=lib
-if exist %frameworkdir%%jarfile% goto JarFileOk
- set frameworkdir=..\framework\
+if exist %frameworkdir%\%jarfile% goto JarFileOk
+ set frameworkdir=..\framework
:JarFileOk
-set jarpath=%frameworkdir%%jarfile%
+set jarpath=%frameworkdir%\%jarfile%
-call %java_exe% -classpath %jarpath% com.android.sdklib.build.ApkBuilderMain %*
+call "%java_exe%" -classpath "%jarpath%" com.android.sdklib.build.ApkBuilderMain %*
diff --git a/find_java/find_java.bat b/find_java/find_java.bat
index 6355f23..e7bc590 100755
--- a/find_java/find_java.bat
+++ b/find_java/find_java.bat
@@ -23,14 +23,14 @@
rem Check we have a valid Java.exe in the path. The return code will
rem be 0 if the command worked or 1 if the exec failed (program not found).
-for /f %%a in ('%~dps0\find_java.exe -s') do set java_exe=%%a
+for /f "delims=" %%a in ('"%~dps0\find_java.exe" -s') do set java_exe=%%a
if not defined java_exe goto :CheckFailed
:SearchJavaW
rem Check if we can find a javaw.exe at the same location than java.exe.
rem If that doesn't work, just fall back on the java.exe we just found.
-for /f %%a in ('%~dps0\find_java.exe -s -w') do set javaw_exe=%%a
-if not exist %javaw_exe% set javaw_exe=%java_exe%
+for /f "delims=" %%a in ('"%~dps0\find_java.exe" -s -w') do set javaw_exe=%%a
+if not exist "%javaw_exe%" set javaw_exe=%java_exe%
goto :EOF
diff --git a/hierarchyviewer/etc/hierarchyviewer1.bat b/hierarchyviewer/etc/hierarchyviewer1.bat
index 3f8c416..b4da06a 100755
--- a/hierarchyviewer/etc/hierarchyviewer1.bat
+++ b/hierarchyviewer/etc/hierarchyviewer1.bat
@@ -30,17 +30,17 @@
if not defined java_exe goto :EOF
set jarfile=hierarchyviewer.jar
-set frameworkdir=
+set frameworkdir=.
set libdir=
-if exist %frameworkdir%%jarfile% goto JarFileOk
- set frameworkdir=lib\
+if exist %frameworkdir%\%jarfile% goto JarFileOk
+ set frameworkdir=lib
-if exist %frameworkdir%%jarfile% goto JarFileOk
- set frameworkdir=..\framework\
+if exist %frameworkdir%\%jarfile% goto JarFileOk
+ set frameworkdir=..\framework
:JarFileOk
-set jarpath=%frameworkdir%%jarfile%
+set jarpath=%frameworkdir%\%jarfile%
-call %java_exe% -Xmx512m -Djava.ext.dirs=%frameworkdir% -Dhierarchyviewer.adb= -jar %jarpath% %*
+call "%java_exe%" -Xmx512m "-Djava.ext.dirs=%frameworkdir%" -Dhierarchyviewer.adb= -jar %jarpath% %*
diff --git a/monitor/monitor.bat b/monitor/monitor.bat
index 9bcc4e0..aab18ae 100755
--- a/monitor/monitor.bat
+++ b/monitor/monitor.bat
@@ -26,7 +26,7 @@
if not defined java_exe goto :EOF
:QueryArch
-for /f %%a in ('%java_exe% -jar lib\archquery.jar') do set vmarch=%%a
+for /f "delims=" %%a in ('"%java_exe%" -jar lib\archquery.jar') do set vmarch=%%a
start lib\monitor-%vmarch%\monitor