From 8916a9b7ac86553a8f1201a380348ccaa4eaae50 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 11 Apr 2016 17:31:14 +0300 Subject: [PATCH] Fix build scripts (related to webworker). --- scripts/build-bench | 2 -- scripts/build-bench.clj | 13 ------------ scripts/build-worker | 2 ++ scripts/build-worker.clj | 18 +++++++++++++++++ scripts/figwheel.clj | 43 ++++++++++++++-------------------------- scripts/watch-bench.clj | 7 ++++--- scripts/watch-worker | 2 ++ scripts/watch-worker.clj | 15 ++++++++++++++ 8 files changed, 56 insertions(+), 46 deletions(-) delete mode 100755 scripts/build-bench delete mode 100644 scripts/build-bench.clj create mode 100755 scripts/build-worker create mode 100644 scripts/build-worker.clj create mode 100755 scripts/watch-worker create mode 100644 scripts/watch-worker.clj diff --git a/scripts/build-bench b/scripts/build-bench deleted file mode 100755 index e3c4da20f..000000000 --- a/scripts/build-bench +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -lein trampoline run -m clojure.main scripts/build-bench.clj diff --git a/scripts/build-bench.clj b/scripts/build-bench.clj deleted file mode 100644 index e76ed965a..000000000 --- a/scripts/build-bench.clj +++ /dev/null @@ -1,13 +0,0 @@ -(require '[cljs.build.api :as b]) - -(b/build - (b/inputs "vendor" "dev") - {:main 'bench.core - :output-to "out/bench.js" - :output-dir "out" - :parallel-build false - :optimizations :simple - :language-in :ecmascript5 - :language-out :ecmascript5 - :target :nodejs - :verbose true}) diff --git a/scripts/build-worker b/scripts/build-worker new file mode 100755 index 000000000..0ed13a71d --- /dev/null +++ b/scripts/build-worker @@ -0,0 +1,2 @@ +#!/bin/sh +lein trampoline run -m clojure.main scripts/build-worker.clj diff --git a/scripts/build-worker.clj b/scripts/build-worker.clj new file mode 100644 index 000000000..5e85ad0d8 --- /dev/null +++ b/scripts/build-worker.clj @@ -0,0 +1,18 @@ +(require '[cljs.build.api :as b]) + +(println "Building ...") + +(let [start (System/nanoTime)] + (b/build + (b/inputs "src" "vendor") + {:main 'uxbox.worker + :output-to "resources/public/js/worker.js" + :output-dir "resources/public/js/worker" + :asset-path "js" + :parallel-build false + :optimizations :simple + :static-fns true + :language-in :ecmascript5 + :language-out :ecmascript5 + :verbose true}) + (println "... done. Elapsed" (/ (- (System/nanoTime) start) 1e9) "seconds")) diff --git a/scripts/figwheel.clj b/scripts/figwheel.clj index 2ed5f7fd7..a009451a8 100644 --- a/scripts/figwheel.clj +++ b/scripts/figwheel.clj @@ -7,37 +7,24 @@ (ra/start-figwheel! {:figwheel-options {:css-dirs ["resources/public/css"]} - :build-ids ["dev" "worker"] + :build-ids ["dev"] :all-builds [{:id "dev" :figwheel {:on-jsload "uxbox.ui/init"} :source-paths ["src" "vendor"] - :compiler {:main 'uxbox.core - :asset-path "js" - :parallel-build false - :optimizations :none - :closure-defines {"uxbox.repo.core.url" - "https://test.uxbox.io/api"} - :warnings {:ns-var-clash false} - :pretty-print true - :language-in :ecmascript6 - :language-out :ecmascript5 - :output-to "resources/public/js/main.js" - :output-dir "resources/public/js" - :verbose true}} - - {:id "worker" - :source-paths ["src" "vendor"] - :compiler {:main 'uxbox.worker - :asset-path "js" - :parallel-build false - :optimizations :simple - :warnings {:ns-var-clash false} - :pretty-print true - :static-fns true - :language-in :ecmascript6 - :language-out :ecmascript5 - :output-to "resources/public/js/worker.js" - :verbose true}}]}) + :compiler + {:main 'uxbox.core + :asset-path "js" + :parallel-build false + :optimizations :none + :closure-defines {"uxbox.repo.core.url" + "https://test.uxbox.io/api"} + :warnings {:ns-var-clash false} + :pretty-print true + :language-in :ecmascript6 + :language-out :ecmascript5 + :output-to "resources/public/js/main.js" + :output-dir "resources/public/js" + :verbose true}}]}) (ra/cljs-repl "dev") diff --git a/scripts/watch-bench.clj b/scripts/watch-bench.clj index 31c1ca1dc..a251ae361 100644 --- a/scripts/watch-bench.clj +++ b/scripts/watch-bench.clj @@ -1,14 +1,15 @@ (require '[cljs.build.api :as b]) (b/watch - (b/inputs "vendor" "dev") + (b/inputs "dev" "vendor") {:main 'bench.core :output-to "out/bench.js" :output-dir "out" :parallel-build false - :optimizations :simple - :pretty-print true + :optimizations :simple + :static-fns true :target :nodejs :language-in :ecmascript6 :language-out :ecmascript5 + :pretty-print true :verbose true}) diff --git a/scripts/watch-worker b/scripts/watch-worker new file mode 100755 index 000000000..9dd1e4666 --- /dev/null +++ b/scripts/watch-worker @@ -0,0 +1,2 @@ +#!/bin/sh +lein trampoline run -m clojure.main scripts/watch-worker.clj diff --git a/scripts/watch-worker.clj b/scripts/watch-worker.clj new file mode 100644 index 000000000..20758254f --- /dev/null +++ b/scripts/watch-worker.clj @@ -0,0 +1,15 @@ +(require '[cljs.build.api :as b]) + +(b/watch + (b/inputs "src" "vendor") + {:main 'uxbox.worker + :output-to "resources/public/js/worker.js" + :output-dir "resources/public/js/worker" + :asset-path "js" + :parallel-build false + :optimizations :simple + :static-fns true + :language-in :ecmascript6 + :language-out :ecmascript5 + :pretty-print true + :verbose true})