compiling less stuff for deploymenet

jlgeering · Feb 12, 2015 · e4dd71b · e4dd71b
1 parent 3cd40fb
commit e4dd71b
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 7 deletions.
diff --git a/env/dev/src/tramboard_clj/core/include.clj → ...ev/src/clj/tramboard_clj/core/include.clj b/env/dev/src/tramboard_clj/core/include.clj → ...ev/src/clj/tramboard_clj/core/include.clj
diff --git a/env/dev/src/tramboard_clj/script/main.cljs → ...v/src/cljs/tramboard_clj/script/main.cljs b/env/dev/src/tramboard_clj/script/main.cljs → ...v/src/cljs/tramboard_clj/script/main.cljs
diff --git a/env/prod/src/tramboard_clj/core/include.clj → ...od/src/clj/tramboard_clj/core/include.clj b/env/prod/src/tramboard_clj/core/include.clj → ...od/src/clj/tramboard_clj/core/include.clj
diff --git a/env/prod/src/tramboard_clj/script/main.cljs → ...d/src/cljs/tramboard_clj/script/main.cljs b/env/prod/src/tramboard_clj/script/main.cljs → ...d/src/cljs/tramboard_clj/script/main.cljs
diff --git a/project.clj b/project.clj
@@ -23,17 +23,18 @@
                  [org.clojars.jws/ring-etag-middleware "0.1.2-SNAPSHOT"]
                  [org.clojars.fterrier/om-autocomplete "0.2.0-SNAPSHOT"]]
 
-  :plugins [[lein-cljsbuild "1.0.3"]
+  :plugins [[lein-cljsbuild "1.0.4"]
             [lein-less "1.7.2"]]
 
   :java-agents [[com.newrelic.agent.java/newrelic-agent "3.13.0" :bootclasspath true]]
 
-  :cljsbuild {:builds {:app {:source-paths ["src"]}}}
+  :source-paths ["src/clj"]
+  :cljsbuild {:builds {:app {:source-paths ["src/cljs"]}}}
 
   :less {:source-paths ["src/less"]
          :target-path "resources/public/css"}
 
-  :profiles {:dev {:source-paths ["env/dev/src"]
+  :profiles {:dev {:source-paths ["env/dev/src/clj"]
                    :dependencies [[figwheel-sidecar "0.2.1-SNAPSHOT"]
                                   [figwheel "0.2.1-SNAPSHOT"]
                                   [midje "1.6.3"]]
@@ -46,19 +47,19 @@
 
                    :ring {:handler tramboard-clj.core.handler/app}
                    :figwheel {:css-dirs ["resources/public/css"]}
-                   :cljsbuild {:builds {:app {:source-paths ["env/dev/src"]
+                   :cljsbuild {:builds {:app {:source-paths ["env/dev/src/cljs"]
                                               :compiler {:output-to "resources/public/js/dev.js"
                                                          :output-dir "resources/public/out"
                                                          :optimizations :none
                                                          :pretty-print true
                                                          :source-map "resources/public/out.js.map"}}}}}
 
              :production
-                      {:source-paths ["env/prod/src"]
+                      {:source-paths ["env/prod/src/clj"]
                        :omit-source true
                        :aot :all
-                       :hooks [leiningen.cljsbuild leiningen.less]
-                       :cljsbuild {:builds {:app {:source-paths ["env/prod/src"]
+                       :hooks [leiningen.less]
+                       :cljsbuild {:builds {:app {:source-paths ["env/prod/src/cljs"]
                                                   :compiler {:output-to "resources/public/js/main.js"
                                                              :optimizations :advanced
                                                              :pretty-print false}}}}}}

diff --git a/src/tramboard_clj/core/handler.clj → src/clj/tramboard_clj/core/handler.clj b/src/tramboard_clj/core/handler.clj → src/clj/tramboard_clj/core/handler.clj
diff --git a/src/tramboard_clj/core/server.clj → src/clj/tramboard_clj/core/server.clj b/src/tramboard_clj/core/server.clj → src/clj/tramboard_clj/core/server.clj
diff --git a/src/tramboard_clj/core/views.clj → src/clj/tramboard_clj/core/views.clj b/src/tramboard_clj/core/views.clj → src/clj/tramboard_clj/core/views.clj
diff --git a/src/tramboard_clj/core/zvv.clj → src/clj/tramboard_clj/core/zvv.clj b/src/tramboard_clj/core/zvv.clj → src/clj/tramboard_clj/core/zvv.clj
diff --git a/src/tramboard_clj/script/state.cljs → src/cljs/tramboard_clj/script/state.cljs b/src/tramboard_clj/script/state.cljs → src/cljs/tramboard_clj/script/state.cljs
diff --git a/src/tramboard_clj/script/time.cljs → src/cljs/tramboard_clj/script/time.cljs b/src/tramboard_clj/script/time.cljs → src/cljs/tramboard_clj/script/time.cljs
diff --git a/src/tramboard_clj/script/tram.cljs → src/cljs/tramboard_clj/script/tram.cljs b/src/tramboard_clj/script/tram.cljs → src/cljs/tramboard_clj/script/tram.cljs