Don't exit auto builds if reloading Clojure code fails.

Closes #131.
emezeske · Oct 1, 2012 · 9d33c7e · 9d33c7e
1 parent 09a39fa
commit 9d33c7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/support/src/cljsbuild/compiler.clj b/support/src/cljsbuild/compiler.clj
@@ -51,7 +51,7 @@
         (catch Throwable e
           (notify-cljs
             notify-command
-            (str "Compiling \"" output-file "\" failed:") red)
+            (str "Compiling \"" output-file "\" failed.") red)
           (pst+ e))))))
 
 (defn- get-mtimes [paths]
@@ -79,14 +79,20 @@
       (subs path (count parent))
       path)))
 
-(defn reload-clojure [paths compiler-options]
+(defn reload-clojure [paths compiler-options notify-command]
   ; Incremental builds will use cached JS output unless one of the cljs input files
   ; has been modified.  Since reloading a clj file *might* affect the build, but does
   ; not affect any cljs file mtimes, we have to clear the cache here to force everything
   ; to be rebuilt.
   (fs/delete-dir (:output-dir compiler-options))
   (doseq [path paths]
-    (load (drop-extension path))))
+    (try
+      (load (drop-extension path))
+      (catch Throwable e
+        (notify-cljs
+          notify-command
+          (str "Reloading Clojure file \"" path "\" failed.") red)
+        (pst+ e)))))
 
 (defn run-compiler [cljs-path crossover-path crossover-macro-paths
                     compiler-options notify-command incremental?
@@ -106,9 +112,9 @@
             clj-modified (list-modified output-mtime clj-mtimes)
             cljs-modified (list-modified output-mtime cljs-mtimes)]
         (when (seq macro-modified)
-          (reload-clojure (map macro-classpath-files macro-modified) compiler-options))
+          (reload-clojure (map macro-classpath-files macro-modified) compiler-options notify-command))
         (when (seq clj-modified)
-          (reload-clojure (map (partial relativize cljs-path) clj-files) compiler-options))
+          (reload-clojure (map (partial relativize cljs-path) clj-files) compiler-options notify-command))
         (when (or (seq macro-modified) (seq clj-modified) (seq cljs-modified))
           (compile-cljs cljs-path compiler-options notify-command incremental?))))
     dependency-mtimes))
diff --git a/support/test/cljsbuild/test/compiler.clj b/support/test/cljsbuild/test/compiler.clj
@@ -45,5 +45,5 @@
     (fs/mod-time "crossovers/b.cljs") => mtime :times 1
     (fs/mod-time crossover-macro-absolute) => mtime :times 1
     (fs/mkdirs anything) => nil
-    (reload-clojure [crossover-macro-classpath] compiler-options) => nil :times 1
+    (reload-clojure [crossover-macro-classpath] compiler-options notify-command) => nil :times 1
     (cljs/build cljs-path compiler-options) => nil :times 1))