am 2b7a00d4: am 29e98002: Merge "SDK Launcher: capture stdout from batch file." into eclair

Merge commit '2b7a00d4dd82ab5db15249150bb36c9d09db1cb3'

* commit '2b7a00d4dd82ab5db15249150bb36c9d09db1cb3':
  SDK Launcher: capture stdout from batch file.

1 files changed, 5 insertions, 5 deletions

diff --git a/files/find_java.bat b/files/find_java.bat
index 6039e89..ac11d06 100755
--- a/files/find_java.bat
+++ b/files/find_java.bat
@@ -36,7 +36,7 @@ rem We get here if the default %java_exe% was not found in the path.
 rem Search for an alternative in %ProgramFiles%\Java\*\bin\java.exe

 

 echo.

-echo Java not found in your path.

+echo WARNING: Java not found in your path.

 echo Checking it it's installed in %ProgramFiles%\Java instead.

 echo.

 

@@ -45,9 +45,9 @@ for /D %%a in ( "%ProgramFiles%\Java\*" ) do call :TestJavaDir "%%a"
 if defined java_exe goto :EOF

 

 echo.

-echo No suitable Java found. In order to properly use the Android Developer Tools,

-echo you need a suitable version of Java installed on your system. We recommend

-echo that you install the JDK version of JavaSE, available here:

+echo ERROR: No suitable Java found. In order to properly use the Android Developer

+echo Tools, you need a suitable version of Java installed on your system. We

+echo recommend that you install the JDK version of JavaSE, available here:

 echo   http://java.sun.com/javase/downloads/

 echo.

 echo You can find the complete Android SDK requirements here:

@@ -74,7 +74,7 @@ echo Java was found at %full_path%.
 echo Please consider adding it to your path:

 echo - Under Windows XP, open Control Panel / System / Advanced / Environment Variables

 echo - Under Windows Vista, open Control Panel / System / Advanced System Settings

-echo                                                    / Environment Variables

+echo                             / Environment Variables

 echo At the end of the "Path" entry in "User variables", add the following:

 echo   ;%full_path%

 echo.