From: Evgeny Mandrikov <mandrikov@gmail.com>
Date: Tue, 26 Apr 2011 15:08:37 +0000 (+0000)
Subject: SONARPLUGINS-1114 Automatically determine SONAR_RUNNER_HOME on Windows
X-Git-Tag: 2.5-rc1~344
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1189b4b5f6670267b267ec4c18ac5bae8633b532;p=sonar-scanner-cli.git

SONARPLUGINS-1114 Automatically determine SONAR_RUNNER_HOME on Windows
---

diff --git a/src/main/assembly/bin/sonar-runner.bat b/src/main/assembly/bin/sonar-runner.bat
index 5d6137e..4635e80 100644
--- a/src/main/assembly/bin/sonar-runner.bat
+++ b/src/main/assembly/bin/sonar-runner.bat
@@ -2,11 +2,16 @@
 @REM
 @REM Required ENV vars:
 @REM   JAVA_HOME - location of a JDK home dir
-@REM   SONAR_RUNNER_HOME - location of runner's installed home dir
 @REM
 @REM Optional ENV vars:
+@REM   SONAR_RUNNER_HOME - location of runner's installed home dir
 @REM   SONAR_RUNNER_OPTS - parameters passed to the Java VM when running Sonar
 
 @echo off
 
+if NOT "%SONAR_RUNNER_HOME%"=="" goto run
+set SONAR_RUNNER_HOME=%~dp0..
+
+:run
+echo %SONAR_RUNNER_HOME%
 "%JAVA_HOME%\bin\java.exe" %SONAR_RUNNER_OPTS% -classpath "%SONAR_RUNNER_HOME%\lib\sonar-runner.jar";"%SONAR_RUNNER_HOME%\lib\sonar-batch-bootstrapper.jar" "-Drunner.home=%SONAR_RUNNER_HOME%" org.sonar.runner.Main %*