CLJS-2291: Set up Windows CI

anmonteiro · dnolen · commit 0e3e485dd2f9 · 2017-08-03T17:09:08.000-04:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,44 @@
+environment:
+  nodejs_version: "6"
+
+platform:
+  - x64
+
+configuration:
+  - Release
+
+matrix:
+  allow_failures:
+    - platform: x64
+      configuration: Release
+
+cache:
+  - '%UserProfile%\.m2'
+
+install:
+  # these need to have a line in between because of Windows line endings
+  - ps: >-
+      New-Item c:\scripts -type directory
+
+      $env:Path += ";C:\scripts"
+
+      Invoke-WebRequest -Uri https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein.bat -OutFile "C:\scripts\lein.bat"
+
+      lein self-install
+
+      lein version
+  - ps: Install-Product node $env:nodejs_version x64
+  - ps: wget 'http://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/jsshell-win64.zip' -OutFile "$pwd\jsshell.zip"
+  - ps: 7z x "-o$pwd\jsshell" jsshell.zip -r
+  - ps: .\script\bootstrap.ps1
+  - ps: "[Console]::OutputEncoding = [Text.UTF8Encoding]::UTF8"
+  - ps: $env:SPIDERMONKEY_HOME = "$pwd/jsshell"
+  - ps: $SPIDERMONKEY_HOME = "$pwd/jsshell"
+
+test_script:
+  - cmd: lein test
+  # surprisingly this is the only way to have the output shown in Appveyor
+  - cmd: powershell -noninteractive -noprofile -command .\script\test.ps1
+
+# Don't actually build (MSBuild).
+build: off
diff --git a/script/bootstrap.ps1 b/script/bootstrap.ps1
@@ -5,8 +5,10 @@ $shell = New-Object -com shell.application
 # Read white listed dependency version info from the /bin/sh script and store in variables
 Get-Content $root\script\bootstrap |
     Where-Object { $_ -match '^\s*(\w+)\s*=\s*\"([^\"]*)\"\s*$' } |
-    Where-Object { $matches[1] -in "CLOJURE_RELEASE", "CLOSURE_RELEASE",
-        "DJSON_RELEASE", "GCLOSURE_LIB_RELEASE", "RHINO_RELEASE", "TREADER_RELEASE" } |
+    Where-Object { $matches[1] -in "CLOJURE_RELEASE", "SPEC_ALPHA_RELEASE",
+        "CORE_SPECS_ALPHA_RELEASE", "CLOSURE_RELEASE", "DJSON_RELEASE",
+        "TRANSIT_RELEASE", "GCLOSURE_LIB_RELEASE", "RHINO_RELEASE",
+        "TREADER_RELEASE", "TEST_CHECK_RELEASE" } |
     Foreach-Object { New-Variable $matches[1] $matches[2] -Scope private }
 
 function Get-WebResource($url, $dstPath) {
@@ -95,11 +97,26 @@ Expand-ZipFile $root\clojure-$CLOJURE_RELEASE.zip $root\lib clojure-$CLOJURE_REL
 Move-File $root\lib\clojure-$CLOJURE_RELEASE.jar $root\lib\clojure.jar
 Delete-File $root\clojure-$CLOJURE_RELEASE.zip
 
+Write-Host "Fetching specs.alpha...."
+Get-WebResource  `
+    https://repo1.maven.org/maven2/org/clojure/spec.alpha/$SPEC_ALPHA_RELEASE/spec.alpha-$SPEC_ALPHA_RELEASE.jar `
+    $root\lib\spec.alpha-$SPEC_ALPHA_RELEASE.jar
+
+Write-Host "Fetching core.specs.alpha...."
+Get-WebResource  `
+    https://repo1.maven.org/maven2/org/clojure/core.specs.alpha/$CORE_SPECS_ALPHA_RELEASE/core.specs.alpha-$CORE_SPECS_ALPHA_RELEASE.jar `
+    $root\lib\core.specs.alpha-$CORE_SPECS_ALPHA_RELEASE.jar
+
 Write-Host "Fetching data.json..."
 Get-WebResource `
     https://repo1.maven.org/maven2/org/clojure/data.json/$DJSON_RELEASE/data.json-$DJSON_RELEASE.jar `
     $root\lib\data.json-$DJSON_RELEASE.jar
 
+Write-Host "Fetching transit-clj..."
+Get-WebResource `
+    https://repo1.maven.org/maven2/com/cognitect/transit-clj/$TRANSIT_RELEASE/transit-clj-$TRANSIT_RELEASE.jar `
+    $root\lib\transit-clj-$TRANSIT_RELEASE.jar
+
 # TODO: Implement Closure SVN support
 Write-Host "Fetching Google Closure library..."
 Get-WebResource `
@@ -115,7 +132,7 @@ Get-WebResource `
     $root\compiler-$CLOSURE_RELEASE.zip
 Get-ChildItem $root\closure\compiler\* | Delete-File
 Expand-ZipFile $root\compiler-$CLOSURE_RELEASE.zip $root\closure\compiler
-Copy-File $root\closure\compiler\compiler.jar $root\lib\compiler.jar
+Copy-File $root\closure\compiler\closure-compiler-v$CLOSURE_RELEASE.jar $root\lib\compiler.jar
 Delete-File $root\compiler-$CLOSURE_RELEASE.zip
 
 Write-Host "Fetching Rhino..."
@@ -131,4 +148,9 @@ Get-WebResource `
     https://repo1.maven.org/maven2/org/clojure/tools.reader/$TREADER_RELEASE/tools.reader-$TREADER_RELEASE.jar `
     $root\lib\tools.reader-$TREADER_RELEASE.jar
 
-Write-Host "[Bootstrap Completed]"
+Write-Host "Fetching test.check $TEST_CHECK_RELEASE ..."
+Get-WebResource `
+    https://repo1.maven.org/maven2/org/clojure/test.check/$TEST_CHECK_RELEASE/test.check-$TEST_CHECK_RELEASE.jar `
+    $root\lib\test.check-$TEST_CHECK_RELEASE.jar
+
+Write-Host "[Bootstrap Completed]"
diff --git a/script/test.ps1 b/script/test.ps1
@@ -11,7 +11,7 @@ $targets =
     @{ env="CHAKRACORE_HOME"; name="ChakraCore"; cmd={ & "$env:CHAKRACORE_HOME\ch" $testjs } }
 $ran = 0
 
-$opts = '{:optimizations :advanced :output-wrapper true :verbose true :compiler-stats true :output-dir \"builds\\out-adv\"}'
+$opts = '{:optimizations :advanced :output-wrapper true :verbose true :compiler-stats true :parallel-build true :output-dir \"builds/out-adv\" :npm-deps {:lodash \"4.17.4\"} :closure-warnings {:non-standard-jsdoc :off :global-this :off} :install-deps true :language-in :es6 :language-out :es5 :foreign-libs [{:file \"src/test/cljs/calculator_global.js\" :provides [\"calculator\"] :global-exports {calculator Calculator}} {:file \"src/test/cljs/es6_dep.js\" :module-type :es6 :provides [\"es6_calc\"]} {:file \"src/test/cljs/calculator_amd.js\" :module-type :amd :provides [\"calculator_amd\"] :requires [\"es6_calc\"]} {:file \"src/test/cljs/es6_default_hello.js\" :provides [\"es6_default_hello\"] :module-type :es6}]}"'
 
 function Test-It($env, $name, [scriptblock] $cmd) {
     $env_val = if(Test-Path env:$env) { (Get-Item env:$env).Value } else { "" }
@@ -32,7 +32,7 @@ try {
 
     New-Item builds\out-adv -ItemType Directory -Force | Out-Null
 
-    bin\cljsc src\test/cljs $opts | Set-Content $testjs
+    bin\cljsc src\test\cljs $opts | Set-Content $testjs
 
     $targets | Foreach-Object { Test-It @_ }
 }
diff --git a/src/main/cljs/cljs/module_deps.js b/src/main/cljs/cljs/module_deps.js
@@ -77,7 +77,7 @@ md.on('end', function() {
       if (dep.file.indexOf('node_modules') !== -1) {
         var providedModule = dep.file
           .substring(dep.file.lastIndexOf('node_modules'))
-          .replace('\\', '/')
+          .replace(/\\/g, '/')
           .replace('node_modules/', '');
 
         dep.provides = dep.provides || [];
diff --git a/src/main/clojure/cljs/closure.clj b/src/main/clojure/cljs/closure.clj
@@ -2232,14 +2232,15 @@
                                                             (.startsWith main "./")
                                                             (subs 2))
                                                      main-path (-> pkg-json-path
+                                                                 (string/replace #"\\" "/")
                                                                  (string/replace #"package\.json$" "")
                                                                  (str main))]
-                                                 (when (= main-path path)
+                                                 (when (= main-path (string/replace path #"\\" "/"))
                                                    name))))
                                            pkg-jsons)]
-                       {:provides (let [module-rel-name (string/replace
-                                                          (subs path (.lastIndexOf path "node_modules"))
-                                                          #"node_modules[\\\/]" "")
+                       {:provides (let [module-rel-name (-> (subs path (.lastIndexOf path "node_modules"))
+                                                            (string/replace #"\\" "/")
+                                                            (string/replace #"node_modules[\\\/]" ""))
                                         provides (cond-> [module-rel-name (string/replace module-rel-name #"\.js(on)?$" "")]
                                                    (some? pkg-json-main)
                                                    (conj pkg-json-main))
diff --git a/src/main/clojure/cljs/util.cljc b/src/main/clojure/cljs/util.cljc
@@ -142,16 +142,24 @@
     (filename x)
     (last (string/split (path x) #"\/"))))
 
+(def windows?
+  (.startsWith (.toLowerCase (System/getProperty "os.name")) "windows"))
+
 (defn ^String relative-name
   "Given a file return a path relative to the working directory. Given a
    URL return the JAR relative path of the resource."
   [x]
   {:pre [(or (file? x) (url? x))]}
   (letfn [(strip-user-dir [s]
             (let [user-dir (System/getProperty "user.dir")
-                  user-path (.getFile (.toURL (io/file user-dir)))
-                  user-path (cond-> user-path
-                              (not (.endsWith user-path File/separator))
+                  ;; on Windows, URLs end up having forward slashes like
+                  ;; /C:/Users/... - Antonio
+                  s (-> (cond-> s
+                          windows? (string/replace #"^[\\/]" ""))
+                      (string/replace "\\" File/separator)
+                      (string/replace "/" File/separator))
+                  user-path (cond-> user-dir
+                              (not (.endsWith user-dir File/separator))
                               (str File/separator))]
               (string/replace s user-path "")))]
     (if (file? x)
@@ -316,9 +324,6 @@
       2 (str (first xs) " and " (second xs))
       (str (string/join ", " (pop xs)) " and " (peek xs)))))
 
-(def windows?
-  (.startsWith (.toLowerCase (System/getProperty "os.name")) "windows"))
-
 (defn module-file-seq
   ([] (module-file-seq (io/file "node_modules")))
   ([dir]
diff --git a/src/test/clojure/cljs/build_api_tests.clj b/src/test/clojure/cljs/build_api_tests.clj
@@ -15,15 +15,16 @@
             [clojure.java.shell :as sh]
             [cljs.env :as env]
             [cljs.analyzer :as ana]
+            [cljs.util :as util]
             [cljs.test-util :as test]
             [cljs.build.api :as build]
             [cljs.closure :as closure]))
 
 (deftest test-target-file-for-cljs-ns
   (is (= (.getPath (build/target-file-for-cljs-ns 'example.core-lib nil))
-         "out/example/core_lib.js"))
+        (test/platform-path "out/example/core_lib.js")))
   (is (= (.getPath (build/target-file-for-cljs-ns 'example.core-lib "output"))
-         "output/example/core_lib.js")))
+        (test/platform-path "output/example/core_lib.js"))))
 
 (deftest test-cljs-dependents-for-macro-namespaces
   (env/with-compiler-env (env/default-compiler-env)
@@ -200,7 +201,7 @@
           loader (io/file out "cljs" "loader.js")]
       (build/build (build/inputs (io/file inputs "bar.cljs") (io/file inputs "foo.cljs")) opts)
       (is (.exists loader))
-      (is (not (nil? (re-find #"/loader_test/foo\.js" (slurp loader))))))
+      (is (not (nil? (re-find #"[\\/]loader_test[\\/]foo\.js" (slurp loader))))))
     (test/delete-out-files out)
     (let [project (merge-with merge (loader-test-project out)
                     {:opts {:optimizations :advanced
@@ -250,7 +251,7 @@
       (is (contains? (:js-module-index @cenv) "react-dom/server")))
     (testing "builds with string requires are idempotent"
       (build/build (build/inputs (io/file inputs "npm_deps_test/string_requires.cljs")) opts cenv)
-      (is (not (nil? (re-find #"\.\./node_modules/react-dom/server\.js" (slurp (io/file out "cljs_deps.js"))))))
+      (is (not (nil? (re-find #"\.\.[\\/]node_modules[\\/]react-dom[\\/]server\.js" (slurp (io/file out "cljs_deps.js"))))))
       (test/delete-out-files out)))
   (.delete (io/file "package.json"))
   (test/delete-node-modules))
@@ -406,7 +407,8 @@
                                                                    :konan "*"
                                                                    :resolve "*"
                                                                    :browser-resolve "*"}}))
-  (sh/sh "npm" "install")
+  (apply sh/sh (cond->> ["npm" "install"]
+                 util/windows? (into ["cmd" "/c"])))
   (let [ws (atom [])
         out (.getPath (io/file (test/tmp-dir) "node-modules-opt-test-out"))
         {:keys [inputs opts]} {:inputs (str (io/file "src" "test" "cljs_build"))
diff --git a/src/test/clojure/cljs/module_processing_tests.clj b/src/test/clojure/cljs/module_processing_tests.clj
@@ -6,6 +6,7 @@
             [cljs.analyzer :as ana]
             [cljs.compiler :as comp]
             [cljs.js-deps :as deps]
+            [cljs.util :as util]
             [cljs.test-util :as test]))
 
 ;; Hard coded JSX transform for the test case
@@ -32,8 +33,8 @@
     (with-redefs [cljs.js-deps/load-library (memoize cljs.js-deps/load-library*)]
       (is (= {:foreign-libs []
               :ups-foreign-libs []
-              :libs ["out/src/test/cljs/reactJS.js"
-                     "out/src/test/cljs/Circle.js"]
+              :libs [(test/platform-path "out/src/test/cljs/reactJS.js")
+                     (test/platform-path "out/src/test/cljs/Circle.js")]
               :closure-warnings {:non-standard-jsdoc :off}}
             (env/with-compiler-env cenv
               (closure/process-js-modules
@@ -63,7 +64,7 @@
 
       (is (= {:foreign-libs []
               :ups-foreign-libs []
-              :libs ["out/src/test/cljs/es6_hello.js"]
+              :libs [(test/platform-path "out/src/test/cljs/es6_hello.js")]
               :closure-warnings {:non-standard-jsdoc :off}}
              (env/with-compiler-env cenv
                (closure/process-js-modules
@@ -88,19 +89,23 @@
       (let [opts (closure/process-js-modules {:foreign-libs [{:file "src/test/cljs/calculator.js"
                                                               :provides ["calculator"]
                                                               :module-type :commonjs}]})
-            compile (fn [form] (with-out-str
-                                 (comp/emit (ana/analyze (ana/empty-env) form))))
-            output "module$src$test$cljs$calculator.add((3),(4));\n"]
+            compile (fn [form]
+                      (with-out-str
+                        (comp/emit (ana/analyze (ana/empty-env) form))))
+            crlf (if util/windows? "\r\n" "\n")
+            output (str "module$src$test$cljs$calculator.add((3),(4));" crlf)]
         (swap! cenv
                #(assoc % :js-dependency-index (deps/js-dependency-index opts)))
         (binding [ana/*cljs-ns* 'cljs.user]
           (is (= (compile '(ns my-calculator.core (:require [calculator :as calc :refer [subtract add] :rename {subtract sub}])))
-                 "goog.provide('my_calculator.core');\ngoog.require('cljs.core');\ngoog.require('module$src$test$cljs$calculator');\n"))
+                (str "goog.provide('my_calculator.core');" crlf
+                     "goog.require('cljs.core');" crlf
+                     "goog.require('module$src$test$cljs$calculator');" crlf)))
           (is (= (compile '(calc/add 3 4)) output))
           (is (= (compile '(calculator/add 3 4)) output))
           (is (= (compile '(add 3 4)) output))
           (is (= (compile '(sub 5 4))
-                 "module$src$test$cljs$calculator.subtract((5),(4));\n")))))))
+                (str "module$src$test$cljs$calculator.subtract((5),(4));" crlf))))))))
 
 (deftest test-cljs-1822
   (test/delete-out-files)
@@ -110,8 +115,8 @@
       (is (= {:optimizations :simple
               :foreign-libs []
               :ups-foreign-libs []
-              :libs ["out/src/test/cljs/react-min.js"
-                     "out/src/test/cljs/Circle-min.js"]
+              :libs [(test/platform-path "out/src/test/cljs/react-min.js")
+                     (test/platform-path "out/src/test/cljs/Circle-min.js")]
               :closure-warnings {:non-standard-jsdoc :off}}
             (env/with-compiler-env cenv
               (closure/process-js-modules
@@ -141,8 +146,8 @@
     (with-redefs [cljs.js-deps/load-library (memoize cljs.js-deps/load-library*)]
       (is (= {:foreign-libs []
               :ups-foreign-libs []
-              :libs ["out/src/test/cljs/reactJS.js"
-                     "out/src/test/cljs/Circle.js"]
+              :libs [(test/platform-path "out/src/test/cljs/reactJS.js")
+                     (test/platform-path "out/src/test/cljs/Circle.js")]
               :closure-warnings {:non-standard-jsdoc :off}}
             (env/with-compiler-env cenv
               (closure/process-js-modules
diff --git a/src/test/clojure/cljs/test_util.clj b/src/test/clojure/cljs/test_util.clj
@@ -7,7 +7,9 @@
 ;; You must not remove this notice, or any other, from this software.
 
 (ns cljs.test-util
-  (:require [clojure.java.io :as io]))
+  (:require [clojure.java.io :as io]
+            [clojure.string :as string])
+  (:import [java.io File]))
 
 (defn delete-out-files
   "Processed files are only copied/written if input has changed. In test case it
@@ -49,3 +51,6 @@
   "Returns the temporary directory of the system."
   []
   (System/getProperty "java.io.tmpdir"))
+
+(defn platform-path [path]
+  (.replace path \/ (.charAt (str File/separator) 0)))
diff --git a/src/test/clojure/cljs/util_tests.clj b/src/test/clojure/cljs/util_tests.clj
@@ -29,8 +29,15 @@
           (sort (util/unknown-opts #{:optimisations :bogus} #{:optimizations :static-fns}))))))
 
 (deftest test-relative-name
-  (let [initial (System/getProperty "user.dir")]
-    (System/setProperty "user.dir" "/Users/user/clojurescript")
-    (is (= (util/relative-name (io/file "/Users/user/clojurescript/out/index.js")) "out/index.js"))
-    (is (= (util/relative-name (io/as-url (io/file "/Users/user/clojurescript/out/index.js"))) "out/index.js"))
-    (System/setProperty "user.dir" initial)))
+  (if util/windows?
+    (let [initial (System/getProperty "user.dir")]
+      (System/setProperty "user.dir" "C:\\Users\\anmonteiro\\Downloads\\clojurescript-master")
+      (is (= (util/relative-name (io/file "C:\\Users\\anmonteiro\\Downloads\\clojurescript-master\\out\\index.js")) "out\\index.js"))
+      (is (= (util/relative-name (io/as-url (io/file "C:\\Users\\anmonteiro\\Downloads\\clojurescript-master\\node_modules\\lodash\\array.js"))) "node_modules\\lodash\\array.js"))
+      (System/setProperty "user.dir" initial))
+    ;; Non-windows
+    (let [initial (System/getProperty "user.dir")]
+      (System/setProperty "user.dir" "/Users/user/clojurescript")
+      (is (= (util/relative-name (io/file "/Users/user/clojurescript/out/index.js")) "out/index.js"))
+      (is (= (util/relative-name (io/as-url (io/file "/Users/user/clojurescript/out/index.js"))) "out/index.js"))
+      (System/setProperty "user.dir" initial))))
