CLJS-2687: cljs.main: Accept File/separator as -co and -ro delimiter

Author: mfikes

src/main/clojure/cljs/cli.clj

@@ -203,7 +203,7 @@ classpath. Classpath-relative paths have prefix of @ or @/")
          (missing-file str))))))
 
 (defn load-edn-opts [str]
-  (reduce merge {} (map read-edn-opts (string/split str #":"))))
+  (reduce merge {} (map read-edn-opts (util/split-paths str))))
 
 (defn- repl-env-opts-opt
   [cfg ropts]
@@ -552,12 +552,12 @@ present"
       ["-ro" "--repl-opts"]    {:group ::main&compile :fn repl-env-opts-opt
                                 :arg "edn"
                                 :doc (str "Options to configure the repl-env, can be an EDN string or "
-                                          "colon separated list of EDN files / classpath resources. Options "
+                                          "system-dependent path-separated list of EDN files / classpath resources. Options "
                                           "will be merged left to right.")}
       ["-co" "--compile-opts"] {:group ::main&compile :fn compile-opts-opt
                                 :arg "edn"
                                 :doc (str "Options to configure the build, can be an EDN string or "
-                                          "colon separated list of EDN files / classpath resources. Options "
+                                          "system-dependent path-separated list of EDN files / classpath resources. Options "
                                           "will be merged left to right.")}}
      :main
      {["-r" "--repl"]          {:fn repl-opt

src/main/clojure/cljs/js_deps.cljc

@@ -7,7 +7,7 @@
 ;; You must not remove this notice, or any other, from this software.
 
 (ns cljs.js-deps
-  (:require [cljs.util :refer [distinct-by]]
+  (:require [cljs.util :as util :refer [distinct-by]]
             [clojure.java.io :as io]
             [clojure.string :as string])
   (:import [java.io File]
@@ -32,7 +32,7 @@
         (filter (partial instance? URLClassLoader))
         (mapcat #(.getURLs ^URLClassLoader %)))
       (-> (System/getProperty "java.class.path")
-        (string/split (re-pattern File/pathSeparator))))
+        util/split-paths))
     distinct
     (map io/file)))
 

src/main/clojure/cljs/util.cljc

@@ -111,6 +111,10 @@
   ([parts sep]
     (apply str (interpose sep parts))))
 
+(defn split-paths
+  [paths-str]
+  (string/split paths-str (re-pattern File/pathSeparator)))
+
 (declare ext)
 
 (defn ^File to-target-file