SONAR-RUNNER: Add script for Windows

5 files changed, 47 insertions, 10 deletions

diff --git a/src/main/assembly/bin/sonar-runner.sh b/src/bin/sonar-runner
index 1012948..af95fd5 100755
--- a/src/main/assembly/bin/sonar-runner.sh
+++ b/src/bin/sonar-runner
@@ -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 "$@"
diff --git a/src/bin/sonar-runner.bat b/src/bin/sonar-runner.bat
new file mode 100644
index 0000000..35bf67c
--- /dev/null
+++ b/src/bin/sonar-runner.bat
@@ -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
diff --git a/src/main/assembly/conf/sonar-runner.properties b/src/conf/sonar-runner.properties
index 5f01622..5f01622 100644
--- a/src/main/assembly/conf/sonar-runner.properties
+++ b/src/conf/sonar-runner.properties
diff --git a/src/it/example/analyze.sh b/src/it/example/analyze.sh
deleted file mode 100755
index f3e2f6a..0000000
--- a/src/it/example/analyze.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# TODO remove hard-coded version
-java -jar ../../../target/sonar-cli-0.1-SNAPSHOT.jar project.properties
diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml
new file mode 100644
index 0000000..ca8f257
--- /dev/null
+++ b/src/main/assembly/assembly.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>true</useProjectArtifact>
+      <outputDirectory>lib</outputDirectory>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <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>
+    </fileSet>
+    <fileSet>
+      <directory>src/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>