From 811d0b140344b9418c3a708fd04f92583cd1f0f2 Mon Sep 17 00:00:00 2001
From: Joe Fiorini <joe@joefiorini.com>
Date: Mon, 20 Jul 2015 11:33:09 -0400
Subject: [PATCH] Build to awx/ui/static instead of dist

---
 .gitignore               |  3 +--
 MANIFEST.in              |  2 +-
 Makefile                 | 11 ++++++-----
 awx/settings/defaults.py |  2 +-
 awx/ui/static/.gitkeep   |  0
 testem.yml               | 18 +++++++++---------
 6 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 awx/ui/static/.gitkeep

diff --git a/.gitignore b/.gitignore
index 6efedbb024..aca0152fb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,8 +18,7 @@ awx/main/fixtures
 awx/*.log
 tower/tower_warnings.log
 celerybeat-schedule
-awx/ui/static/docs
-awx/ui/dist
+awx/ui/static
 
 # Python & setuptools
 __pycache__
diff --git a/MANIFEST.in b/MANIFEST.in
index 4d8c16bfed..211971e20f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,7 +3,7 @@ recursive-include awx/static *.ico
 recursive-include awx/templates *.html
 recursive-include awx/api/templates *.md *.html
 recursive-include awx/ui/templates *.html
-recursive-include awx/ui/dist *
+recursive-include awx/ui/static *
 recursive-include awx/playbooks *.yml
 recursive-include awx/lib/site-packages *
 recursive-include config *
diff --git a/Makefile b/Makefile
index 46570f6e8b..767a79b476 100644
--- a/Makefile
+++ b/Makefile
@@ -106,9 +106,10 @@ clean-grunt:
 
 # Remove UI build files
 clean-ui:
-	rm -rf awx/ui/static/dist
+	rm -rf DEBUG
+	rm -rf awx/ui/build_test
+	rm -rf awx/ui/static/
 	rm -rf awx/ui/dist
-	rm -rf awx/ui/static/docs
 
 # Remove packer artifacts
 clean-packer:
@@ -330,14 +331,14 @@ awx/ui/%: node_modules clean-ui Brocfile.js bower.json
 	$(BROCCOLI_BIN) build $@ -- $(UI_FLAGS)
 
 devjs: node_modules clean-ui Brocfile.js bower.json Gruntfile.js
-	make awx/ui/dist
+	make awx/ui/static
 
 # Build minified JS/CSS.
 minjs: node_modules clean-ui Brocfile.js
-	make -e awx/ui/dist UI_FLAGS="--silent --no-debug --no-tests --compress --no-docs --no-sourcemaps"
+	make -e awx/ui/static UI_FLAGS="--silent --no-debug --no-tests --compress --no-docs --no-sourcemaps"
 
 minjs_ci: node_modules clean-ui Brocfile.js
-	make -e awx/ui/dist UI_FLAGS="--no-debug --compress --no-docs"
+	make -e awx/ui/static UI_FLAGS="--no-debug --compress --no-docs"
 
 # Check .js files for errors and lint
 jshint: node_modules Gruntfile.js
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index dcfdebe2a2..7fd620af35 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -62,7 +62,7 @@ USE_L10N = True
 USE_TZ = True
 
 STATICFILES_DIRS = (
-    os.path.join(BASE_DIR, 'ui', 'dist'),
+    os.path.join(BASE_DIR, 'ui', 'static'),
     os.path.join(BASE_DIR, 'static'),
 )
 
diff --git a/awx/ui/static/.gitkeep b/awx/ui/static/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/testem.yml b/testem.yml
index 913cd51282..b8325fb636 100644
--- a/testem.yml
+++ b/testem.yml
@@ -3,23 +3,23 @@ framework: mocha
 cwd: awx/ui/
 port: 7358
 src_files:
-  - static/js/**/*.js
-  - static/lib/**/*.js
+  - client/**/*.js
+  - client/**/*.js
   - tests/**/*.js
 serve_files:
-  - dist/tower.concat.js
-  - dist/tests/**/*.js
-  - dist/tests/unit.js
+  - static/tower.concat.js
+  - static/tests/**/*.js
+  - static/tests/unit.js
 unsafe_file_serving: true
 test_page: tests.html
 disable_watching: true
 routes:
-  /awx/ui/dist: /static
+  /awx/ui/static: /static
   /tests.html: ../../packaging/grunt/testem.mustache
-  /test-loader.js: static/lib/ember-cli-test-loader/test-loader.js
+  /test-loader.js: client/lib/ember-cli-test-loader/test-loader.js
   /vendor: ../../node_modules
-  /angular-mocks.js: dist/lib/angular-mocks/angular-mocks.js
-  /templates.js: dist/node-tests/templates.js
+  /angular-mocks.js: static/lib/angular-mocks/angular-mocks.js
+  /templates.js: static/templates.js
 reporter: xunit
 launch_in_dev:
   - Mocha