@@ -104,9 +104,8 @@ | |||
</goals> | |||
<configuration> | |||
<appendAssemblyId>false</appendAssemblyId> | |||
<finalName>sonar-runner-${project.version}</finalName> | |||
<descriptors> | |||
<descriptor>assembly.xml</descriptor> | |||
<descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor> | |||
</descriptors> | |||
</configuration> | |||
</execution> |
@@ -12,16 +12,14 @@ if [ -z "$SONAR_RUNNER_HOME" ] ; then | |||
SONAR_RUNNER_HOME=`cd "$SONAR_RUNNER_HOME" && pwd` | |||
fi | |||
JAVACMD="`which java`" | |||
JAVACLASSPATH="${SONAR_RUNNER_HOME}"/lib/sonar-runner.jar | |||
JAVACLASSPATH=$JAVACLASSPATH:"${SONAR_RUNNER_HOME}"/lib/sonar-batch-bootstrapper.jar | |||
JAVA_CMD="`which java`" | |||
JAVA_CLASSPATH="${SONAR_RUNNER_HOME}"/lib/sonar-runner.jar:"${SONAR_RUNNER_HOME}"/lib/sonar-batch-bootstrapper.jar | |||
#echo "Info: Using sonar-runner at $SONAR_RUNNER_HOME" | |||
#echo "Info: Using java at $JAVACMD" | |||
#echo "Info: Using classpath $JAVACLASSPATH" | |||
exec "$JAVACMD" \ | |||
-classpath $JAVACLASSPATH \ | |||
exec "$JAVA_CMD" \ | |||
-classpath $JAVA_CLASSPATH \ | |||
"-Drunner.home=${SONAR_RUNNER_HOME}" \ | |||
org.sonar.runner.Main "$@" |
@@ -0,0 +1,5 @@ | |||
@REM Sonar Runner Startup Script for Windows | |||
@echo off | |||
"%JAVA_HOME%\bin\java.exe" -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 |
@@ -1,4 +0,0 @@ | |||
#!/bin/sh | |||
# TODO remove hard-coded version | |||
java -jar ../../../target/sonar-cli-0.1-SNAPSHOT.jar project.properties |
@@ -5,7 +5,6 @@ | |||
<format>zip</format> | |||
</formats> | |||
<includeBaseDirectory>true</includeBaseDirectory> | |||
<dependencySets> | |||
<dependencySet> | |||
<useProjectArtifact>true</useProjectArtifact> | |||
@@ -15,10 +14,25 @@ | |||
</dependencySets> | |||
<fileSets> | |||
<fileSet> | |||
<directory>${basedir}/src/main/assembly</directory> | |||
<outputDirectory>/</outputDirectory> | |||
<directory>src/bin</directory> | |||
<outputDirectory>bin</outputDirectory> | |||
<includes> | |||
<include>sonar-runner.bat</include> | |||
</includes> | |||
<lineEnding>dos</lineEnding> | |||
</fileSet> | |||
<fileSet> | |||
<directory>src/bin</directory> | |||
<outputDirectory>bin</outputDirectory> | |||
<includes> | |||
<include>sonar-runner</include> | |||
</includes> | |||
<lineEnding>unix</lineEnding> | |||
<fileMode>0755</fileMode> | |||
<directoryMode>0755</directoryMode> | |||
</fileSet> | |||
<fileSet> | |||
<directory>src/conf</directory> | |||
<outputDirectory>conf</outputDirectory> | |||
</fileSet> | |||
</fileSets> | |||
</assembly> |