Allow all static files to be loaded from dist

This commit is contained in:
Joe Fiorini
2015-02-27 11:21:32 -05:00
parent 7694ed2ea4
commit f2b4590545
7 changed files with 13 additions and 30 deletions

View File

@@ -91,7 +91,7 @@ clean-grunt:
# Remove UI build files
clean-ui:
rm -rf awx/ui/static/dist
rm -rf awx/ui/dist
rm -rf awx/ui/static/docs
# Remove temporary build files, compiled Python files.
@@ -277,7 +277,7 @@ package.json: packaging/grunt/package.template
sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%GIT_REMOTE_URL%#$(GIT_REMOTE_URL)#;' $< > $@
sync_ui: node_modules Brocfile.js
$(NODE) tools/ui/timepiece.js awx/ui/static/dist
$(NODE) tools/ui/timepiece.js awx/ui/dist
# Update local npm install
node_modules: package.json
@@ -285,14 +285,14 @@ node_modules: package.json
touch $@
devjs: node_modules clean-ui Brocfile.js bower.json Gruntfile.js
$(BROCCOLI) build awx/ui/static/dist -- --debug
$(BROCCOLI) build awx/ui/dist -- --debug
# Build minified JS/CSS.
minjs: node_modules clean-ui Brocfile.js
$(BROCCOLI) build awx/ui/static/dist -- --silent --no-debug --no-tests --compress
$(BROCCOLI) build awx/ui/dist -- --silent --no-debug --no-tests --compress
minjs_ci: node_modules clean-ui Brocfile.js
$(BROCCOLI) build awx/ui/static/dist -- --no-debug --compress
$(BROCCOLI) build awx/ui/dist -- --no-debug --compress
# Check .js files for errors and lint
jshint: node_modules Gruntfile.js