Merge branch 'release/1.9.32'

akvo · May 15, 2018 · 778d8a5 · 778d8a5
2 parents 4c48814 + cbbe977
commit 778d8a5
Show file tree

Hide file tree

Showing 65 changed files with 1,216 additions and 376 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,7 @@
+/GAE
+/Config
+/Dashboard/.sass-cache
+/Dashboard/tmp
+/.git
+/scripts
+/tests
diff --git a/.gitignore b/.gitignore
@@ -57,6 +57,7 @@ GAE/war/WEB-INF/lib/geronimo*.jar
 GAE/war/WEB-INF/lib/jdo2-api*.jar
 GAE/war/WEB-INF/lib/jsr107*.jar
 GAE/war/WEB-INF/lib/libservice.jar
+GAE/target
 
 # APK paths
 WFPMapping/device/debugcert
@@ -84,3 +85,5 @@ dwsync.xml
 out/
 .idea/
 *.iml
+rake.log
+lein.log
diff --git a/Dashboard/Assetfile b/Dashboard/Assetfile
@@ -48,7 +48,7 @@ class CSSMinFilter < Filter
   end
 end
 
-output '../GAE/war/admin'
+output '../GAE/target/akvo-flow/admin'
 input 'app' do
 
   match 'css/main.scss' do
@@ -126,7 +126,7 @@ input 'app' do
 
 end
 
-output '../GAE/war/vendorjs'
+output '../GAE/target/akvo-flow/vendorjs'
 input 'app' do
   match "js/vendor/**/*.js" do
     concat do |input|

diff --git a/Dashboard/AssetfilePublic b/Dashboard/AssetfilePublic
@@ -48,7 +48,7 @@ class CSSMinFilter < Filter
   end
 end
 
-output '../GAE/war/publicmap'
+output '../GAE/target/akvo-flow/publicmap'
 input 'app' do
 
   match 'css/main.scss' do

diff --git a/Dashboard/Rakefile b/Dashboard/Rakefile
@@ -30,3 +30,7 @@ task :watch do
   system "bundle exec guard start"
 end
 
+desc "Watch for changes in the background"
+task :watchbg do
+  system "bundle exec guard start --no-interactions"
+end
diff --git a/Dashboard/app/cljs/cp-html.sh b/Dashboard/app/cljs/cp-html.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OUT_ROOT=../../../GAE/war/admin/frames/
+OUT_ROOT=../../../GAE/target/akvo-flow/admin/frames/
 
 mkdir -p ${OUT_ROOT}
 

diff --git a/Dashboard/app/cljs/project.clj b/Dashboard/app/cljs/project.clj
@@ -14,9 +14,9 @@
 
   :source-paths ["src"]
 
-  :clean-targets ^{:protect false}  ["../../../GAE/war/admin/frames/users.html"
-                                     "../../../GAE/war/admin/frames/users.js"
-                                     "../../../GAE/war/admin/frames/out/"]
+  :clean-targets ^{:protect false}  ["../../../GAE/target/akvo-flow/admin/frames/users.html"
+                                     "../../../GAE/target/akvo-flow/admin/frames/users.js"
+                                     "../../../GAE/target/akvo-flow/admin/frames/out/"]
 
   :aliases {"copyhtml" ["shell" "./cp-html.sh"]
             "copyhtml-production" ["shell" "./cp-html.sh" "--production"]
@@ -34,14 +34,14 @@
               :source-paths ["src"]
               :compiler {
                 :main org.akvo.flow.dashboard.users.core
-                :output-to "../../../GAE/war/admin/frames/users.js"
-                :output-dir "../../../GAE/war/admin/frames/out"
+                :output-to "../../../GAE/target/akvo-flow/admin/frames/users.js"
+                :output-dir "../../../GAE/target/akvo-flow/admin/frames/out"
                 :asset-path "out"
                 :optimizations :none
                 :source-map true}}
              {:id "adv"
               :source-paths ["src"]
               :compiler {
                 :main org.akvo.flow.dashboard.users.core
-                :output-to "../../../GAE/war/admin/frames/users.js"
+                :output-to "../../../GAE/target/akvo-flow/admin/frames/users.js"
                 :optimizations :advanced}}]})