diff options
author | Raphael Moll <ralf@android.com> | 2010-11-17 10:24:38 -0800 |
---|---|---|
committer | Raphael Moll <ralf@android.com> | 2010-11-17 10:24:38 -0800 |
commit | 2c7f15a964b3753efacc5666984abccaf5a9fbc5 (patch) | |
tree | a3c80df85224a7266dcd21f990b2489228efb87d /hierarchyviewer2 | |
parent | 6ae57d2716a4b4f9933b752ca774804c4541babe (diff) | |
download | sdk-2c7f15a964b3753efacc5666984abccaf5a9fbc5.zip sdk-2c7f15a964b3753efacc5666984abccaf5a9fbc5.tar.gz sdk-2c7f15a964b3753efacc5666984abccaf5a9fbc5.tar.bz2 |
Fix HV.bat for swt layout issue.
SDK Bug 3185449
Change-Id: I88dfaeb287fdef5cf82a0bc3da286c6c4493f910
Diffstat (limited to 'hierarchyviewer2')
-rwxr-xr-x | hierarchyviewer2/app/etc/hierarchyviewer.bat | 139 |
1 files changed, 70 insertions, 69 deletions
diff --git a/hierarchyviewer2/app/etc/hierarchyviewer.bat b/hierarchyviewer2/app/etc/hierarchyviewer.bat index d0b8bef..9edf96a 100755 --- a/hierarchyviewer2/app/etc/hierarchyviewer.bat +++ b/hierarchyviewer2/app/etc/hierarchyviewer.bat @@ -1,69 +1,70 @@ -@echo off -rem Copyright (C) 2008 The Android Open Source Project -rem -rem Licensed under the Apache License, Version 2.0 (the "License"); -rem you may not use this file except in compliance with the License. -rem You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. - -rem don't modify the caller's environment -setlocal - -rem Set up prog to be the path of this script, including following symlinks, -rem and set up progdir to be the fully-qualified pathname of its directory. -set prog=%~f0 - -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 lib\find_java.bat -if not defined java_exe goto :EOF - -set jarfile=hierarchyviewer2.jar -set frameworkdir= -set libdir= - -if exist %frameworkdir%%jarfile% goto JarFileOk - set frameworkdir=lib\ - -if exist %frameworkdir%%jarfile% goto JarFileOk - set frameworkdir=..\framework\ - -:JarFileOk - -if debug NEQ "%1" goto NoDebug - set java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y - shift 1 -:NoDebug - -set jarpath=%frameworkdir%%jarfile% - -if not defined ANDROID_SWT goto QueryArch - set swt_path=%ANDROID_SWT% - goto SwtDone - -:QueryArch - - for /f %%a in ('%java_exe% -jar %frameworkdir%archquery.jar') do set swt_path=%frameworkdir%%%a - -:SwtDone - -if exist %swt_path% goto SetPath - echo SWT folder '%swt_path%' does not exist. - echo Please set ANDROID_SWT to point to the folder containing swt.jar for your platform. - exit /B - -:SetPath -set javaextdirs=%swt_path%;%frameworkdir% - -call %java_exe% %java_debug% -Xmx512m -Djava.ext.dirs=%frameworkdir% -Dcom.android.hierarchyviewer.bindir= -jar %jarpath% %* +@echo off
+rem Copyright (C) 2008 The Android Open Source Project
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+rem don't modify the caller's environment
+setlocal
+
+rem Set up prog to be the path of this script, including following symlinks,
+rem and set up progdir to be the fully-qualified pathname of its directory.
+set prog=%~f0
+
+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 lib\find_java.bat
+if not defined java_exe goto :EOF
+
+set jarfile=hierarchyviewer2.jar
+set frameworkdir=
+set libdir=
+
+if exist %frameworkdir%%jarfile% goto JarFileOk
+ set frameworkdir=lib\
+
+if exist %frameworkdir%%jarfile% goto JarFileOk
+ set frameworkdir=..\framework\
+
+:JarFileOk
+
+if debug NEQ "%1" goto NoDebug
+ set java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y
+ shift 1
+:NoDebug
+
+set jarpath=%frameworkdir%%jarfile%;%frameworkdir%hierarchyviewerlib.jar
+
+if not defined ANDROID_SWT goto QueryArch
+ set swt_path=%ANDROID_SWT%
+ goto SwtDone
+
+:QueryArch
+
+ for /f %%a in ('%java_exe% -jar %frameworkdir%archquery.jar') do set swt_path=%frameworkdir%%%a
+
+:SwtDone
+
+if exist %swt_path% goto SetPath
+ echo SWT folder '%swt_path%' does not exist.
+ echo Please set ANDROID_SWT to point to the folder containing swt.jar for your platform.
+ exit /B
+
+:SetPath
+
+call %java_exe% %java_debug% -Xmx512m -Dcom.android.hierarchyviewer.bindir= -classpath "%jarpath%;%swt_path%\swt.jar" com.android.hierarchyviewer.HierarchyViewerApplication %*
+
+
|