CLJS-2152: "is not a relative path" exception thrown when :libs dir…

…ectory is provided.

src/main/clojure/cljs/closure.clj

@@ -1571,7 +1571,7 @@
     (if (.endsWith lib-path ".js")
       (util/get-name url)
       (let [path (util/path url)]
-        (subs path (+ (.lastIndexOf path lib-path) (.length lib-path)))))))
+        (subs path (+ (inc (.lastIndexOf path lib-path)) (.length lib-path)))))))
 
 (defn ^String rel-output-path
   "Given a IJavaScript which points to a .js file either in memory, in a jar file,

src/test/cljs/js_libs/tabby.js

@@ -0,0 +1,5 @@
+goog.provide("tabby");
+
+tabby.hello = function() {
+  return "hello there from tabby";
+};

src/test/cljs_build/libs_test/core.cljs

@@ -0,0 +1,6 @@
+(ns libs-test.core
+  (:require [tabby]))
+
+(enable-console-print!)
+
+(println (tabby/hello))

src/test/clojure/cljs/build_api_tests.clj

@@ -253,3 +253,20 @@
                  opts cenv)
     (is (.exists (io/file out "preloads_test/preload.cljs")))
     (is (contains? (get-in @cenv [::ana/namespaces 'preloads-test.preload :defs]) 'preload-var))))
+
+(deftest test-libs-cljs-2152
+  (let [out (.getPath (io/file (test/tmp-dir) "libs-test-out"))
+        {:keys [inputs opts]} {:inputs (str (io/file "src" "test" "cljs_build"))
+                               :opts {:main 'libs-test.core
+                                      :output-dir out
+                                      :libs ["src/test/cljs/js_libs"]
+                                      :optimizations :none
+                                      :closure-warnings {:check-types :off}}}
+        cenv (env/default-compiler-env)]
+    (test/delete-out-files out)
+    (build/build (build/inputs
+                   (io/file "src/test/cljs_build/libs_test/core.cljs") (io/file "src/test/cljs/js_libs")
+                   (io/file inputs "libs_test/core.cljs")
+                   (io/file "src/test/cljs/js_libs"))
+      opts cenv)
+    (is (.exists (io/file out "tabby.js")))))

src/test/clojure/cljs/closure_tests.clj

@@ -73,3 +73,13 @@
 
 (deftest test-string-provides
   (is (= ["CB0BFFB"] (deps/-provides "var x = 42;"))))
+
+(deftest test-lib-rel-path-cljs-2152
+  (let [ijs {:provides ["tabby"]
+             :url (io/as-url (io/file "src/test/cljs/js_libs/tabby.js"))
+             :lib-path "src/test/cljs/js_libs"}]
+    (is (= (closure/lib-rel-path ijs) "tabby.js")))
+  (let [ijs {:provides ["tabby"]
+             :url (io/as-url (io/file "src/test/cljs/js_libs/tabby.js"))
+             :lib-path (.getAbsolutePath (io/file "src/test/cljs/js_libs/tabby.js"))}]
+    (is (= (closure/lib-rel-path ijs) "tabby.js"))))