Merge pull request #190 from evolvedbinary/7.x.x/hotfix/windows-build-script

[7.x.x] Fix issues in the Windows version of the quick build script

Author: adamretter

build.bat

@@ -25,7 +25,7 @@
 @REM
 
 @echo off
-setlocal enabledelayedexpansion
+setlocal
 
 set "TARGET=useage"
 set "DEBUG=false"
@@ -118,16 +118,21 @@ if "%TARGET%"=="clean" (
 ) else if "%TARGET%"=="dependency-security-check" (
     set "CMD=%BASE_CMD% dependency-check:check"
 ) else if "%TARGET%"=="format-poms" (
+    setlocal enabledelayedexpansion
     set "SAXON=%USERPROFILE%\.m2\repository\net\sf\saxon\Saxon-HE\9.9.1-8\Saxon-HE-9.9.1-8.jar"
-    for /r %%POM in (pom.xml) do (
-        echo | set /p dummyName="Formatting %%POM ..."
-        java -jar "%SAXON%" -s:%%POM -xsl:format-pom.xslt -o:%%POM
-        echo OK
+    for /r %%P in (pom.xml) do (
+        if exist "%%P" (
+            set "POM=%%P"
+            echo | set /p dummyName="Formatting !POM! ..."
+            java -jar "!SAXON!" -s:!POM! -xsl:format-pom.xslt -o:!POM!
+            echo OK
 
-        echo | set /p dummyName="Checking for duplicate license entries in %%POM ... "
-        java -cp "%SAXON%" net.sf.saxon.Query -q:check-pom-license-uniqueness.xq pom-file-uri=file:%%POM
-        echo OK
+            echo | set /p dummyName="Checking for duplicate license entries in !POM! ... "
+            java -cp "!SAXON!" net.sf.saxon.Query -q:check-pom-license-uniqueness.xq pom-file-path=!POM!
+            echo OK
+        )
     )
+    endlocal
     goto end
 ) else (
     echo Invalid target: %TARGET%

build.sh

@@ -182,7 +182,7 @@ if [ "${TARGET}" == "format-poms" ]; then
     echo "OK"
 
     echo -n "Checking for duplicate license entries in ${pom} ... "
-    CMD="java -cp ${SAXON} net.sf.saxon.Query -q:check-pom-license-uniqueness.xq pom-file-uri=file:${pom}"
+    CMD="java -cp ${SAXON} net.sf.saxon.Query -q:check-pom-license-uniqueness.xq pom-file-path=${pom}"
     $CMD
     echo "OK"
 

check-pom-license-uniqueness.xq

@@ -31,9 +31,18 @@ declare namespace pom = "http://maven.apache.org/POM/4.0.0";
 declare option output:omit-xml-declaration "yes";
 
 
-(: Must be set externally with the URI to the pom.xml file :)
-declare variable $pom-file-uri as xs:string external;
+(: Must be set externally with the file-system path to the pom.xml file :)
+declare variable $pom-file-path as xs:string external;
 
+declare %private function local:path-to-uri($path as xs:string) as xs:string {
+    if (starts-with($path, "/"))
+    then
+        "file://" || $path
+    else
+        "file:///" || replace($path, "\\", "/")
+};
+
+let $pom-file-uri := local:path-to-uri($pom-file-path)
 let $pom := doc($pom-file-uri)
 return
 (