Merge pull request #233 from danielli90/branch-1.4

Branch 1.4 - Adjust spark-clr jar name based on version tag in AppVeyor

RunSamples.cmd

@@ -38,6 +38,12 @@ powershell -f downloadtools.ps1 run !VERBOSE!
 call tools\updateruntime.cmd
 popd
 
+@rem downloadtools.ps1 sets ProjectVersion when invoked in AppVeyor
+if defined ProjectVersion (
+    set SPARKCLR_JAR=spark-clr-%ProjectVersion%.jar
+    echo [RunSamples.cmd] SPARKCLR_JAR=%SPARKCLR_JAR%
+)
+
 SET CMDHOME=%~dp0
 @REM Remove trailing backslash \
 set CMDHOME=%CMDHOME:~0,-1%

downloadtools.ps1

@@ -339,6 +339,19 @@ function Download-RuntimeDependencies
 
     $envStream.WriteLine("set HADOOP_HOME=$H_HOME");
 
+    # set projectversion with repo-tag
+    $tagName = $env:APPVEYOR_REPO_TAG_NAME
+    Write-Host "[downloadtools.Download-RuntimeDependencies] [INFO] tagname=[$tagName]"
+    
+    if (($tagName.Length -gt 1) -and ($tagName.SubString(0,1).ToLower() -eq "v"))
+    {
+        $len = $tagName.Length - 1
+        $versionStr = $tagName.SubString(1, $len)
+    
+        Write-Host "[downloadtools.Download-RuntimeDependencies] [INFO] Setting project version to $versionStr"
+        $envStream.WriteLine("set ProjectVersion=$versionStr");
+    }
+
     $envStream.close()
 
     Update-SparkVerboseMode

scripts/sparkclr-submit.cmd

@@ -25,7 +25,8 @@ if "%SPARK_ASSEMBLY_JAR%"=="0" (
   exit /b 1
 )
 
-set SPARKCLR_JAR=spark-clr-1.4.1-SNAPSHOT.jar
+if not defined SPARKCLR_JAR (set SPARKCLR_JAR=spark-clr-1.4.1-SNAPSHOT.jar)
+
 set SPARKCLR_CLASSPATH=%SPARKCLR_HOME%\lib\%SPARKCLR_JAR%
 if not "%SPARKCSV_JARS%" == "" (
     SET SPARKCLR_CLASSPATH=%SPARKCLR_CLASSPATH%;%SPARKCSV_JARS%