diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2015-11-10 09:42:10 +0100 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2015-11-10 14:32:00 +0100 |
| commit | 7b6c311c7d076de58cb57b28c6a9a31d5c7c9afe (patch) | |
| tree | 6be7723852fed64b4dfbe34c6ea6a9f732775793 /src/main/assembly | |
| parent | 5a8d95da69a698a82faa01e7b396e33de61d4975 (diff) | |
| download | sonar-scanner-cli-7b6c311c7d076de58cb57b28c6a9a31d5c7c9afe.tar.gz sonar-scanner-cli-7b6c311c7d076de58cb57b28c6a9a31d5c7c9afe.zip | |
SQSCANNER-1 Extract SonarQube Scanner as a standalone project
Diffstat (limited to 'src/main/assembly')
| -rwxr-xr-x | src/main/assembly/bin/sonar-runner | 4 | ||||
| -rw-r--r-- | src/main/assembly/bin/sonar-runner.bat | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/assembly/bin/sonar-runner b/src/main/assembly/bin/sonar-runner index eea044a..ec2f426 100755 --- a/src/main/assembly/bin/sonar-runner +++ b/src/main/assembly/bin/sonar-runner @@ -80,7 +80,7 @@ if [ -z "$SONAR_RUNNER_HOME" ] ; then fi # check that the SONAR_RUNNER_HOME has been correctly set -if [ ! -f "$SONAR_RUNNER_HOME/lib/sonar-runner-dist-${project.version}.jar" ] ; then +if [ ! -f "$SONAR_RUNNER_HOME/lib/sonar-scanner-${project.version}.jar" ] ; then echo '$SONAR_RUNNER_HOME' does not point to a valid installation directory: $SONAR_RUNNER_HOME exit 1 fi @@ -92,7 +92,7 @@ else JAVA_CMD="`which java`" fi -JAR_FILE="${SONAR_RUNNER_HOME}"/lib/sonar-runner-dist-${project.version}.jar +JAR_FILE="${SONAR_RUNNER_HOME}"/lib/sonar-scanner-${project.version}.jar PROJECT_HOME=`pwd` #echo "Info: Using sonar-runner at $SONAR_RUNNER_HOME" diff --git a/src/main/assembly/bin/sonar-runner.bat b/src/main/assembly/bin/sonar-runner.bat index 67fa742..72d054b 100644 --- a/src/main/assembly/bin/sonar-runner.bat +++ b/src/main/assembly/bin/sonar-runner.bat @@ -58,7 +58,7 @@ goto run if "%SONAR_RUNNER_HOME:~-1%"=="\" set SONAR_RUNNER_HOME=%SONAR_RUNNER_HOME:~0,-1% @REM Check if the provided SONAR_RUNNER_HOME is a valid install dir -IF EXIST "%SONAR_RUNNER_HOME%\lib\sonar-runner-dist-${project.version}.jar" goto run +IF EXIST "%SONAR_RUNNER_HOME%\lib\sonar-scanner-${project.version}.jar" goto run echo. echo ERROR: SONAR_RUNNER_HOME exists but does not point to a valid install @@ -74,7 +74,7 @@ echo %SONAR_RUNNER_HOME% set PROJECT_HOME=%CD% -%JAVA_EXEC% -Djava.awt.headless=true %SONAR_RUNNER_OPTS% -cp "%SONAR_RUNNER_HOME%\lib\sonar-runner-dist-${project.version}.jar" "-Drunner.home=%SONAR_RUNNER_HOME%" "-Dproject.home=%PROJECT_HOME%" org.sonar.runner.cli.Main %* +%JAVA_EXEC% -Djava.awt.headless=true %SONAR_RUNNER_OPTS% -cp "%SONAR_RUNNER_HOME%\lib\sonar-scanner-${project.version}.jar" "-Drunner.home=%SONAR_RUNNER_HOME%" "-Dproject.home=%PROJECT_HOME%" org.sonar.runner.cli.Main %* if ERRORLEVEL 1 goto error goto end |