Merge pull request #1623 from jlmitch5/remove_tmp_broc

removal of tmp dir when sync-ui is run
This commit is contained in:
jlmitch5
2016-04-20 13:54:44 -04:00

View File

@@ -167,7 +167,8 @@ endif
.DEFAULT_GOAL := build .DEFAULT_GOAL := build
.PHONY: clean rebase push requirements requirements_dev requirements_jenkins \ .PHONY: clean clean-tmp rebase push requirements requirements_dev \
requirements_jenkins \
develop refresh adduser migrate dbchange dbshell runserver celeryd \ develop refresh adduser migrate dbchange dbshell runserver celeryd \
receiver test test_unit test_coverage coverage_html test_jenkins dev_build \ receiver test test_unit test_coverage coverage_html test_jenkins dev_build \
release_build release_clean sdist rpmtar mock-rpm mock-srpm rpm-sign \ release_build release_clean sdist rpmtar mock-rpm mock-srpm rpm-sign \
@@ -220,6 +221,9 @@ clean-static:
clean-build-test: clean-build-test:
rm -rf awx/ui/build_test/ rm -rf awx/ui/build_test/
clean-tmp:
rm -rf tmp/
# Remove temporary build files, compiled Python files. # Remove temporary build files, compiled Python files.
clean: clean-rpm clean-deb clean-grunt clean-ui clean-static clean-build-test clean-tar clean-packer clean-bundle clean: clean-rpm clean-deb clean-grunt clean-ui clean-static clean-build-test clean-tar clean-packer clean-bundle
rm -rf awx/lib/site-packages rm -rf awx/lib/site-packages
@@ -527,9 +531,9 @@ build-ui: awx/ui/static
# proxy tower and refresh the ui when a change is made. # proxy tower and refresh the ui when a change is made.
DOCKER_MACHINE_NAME ?= none DOCKER_MACHINE_NAME ?= none
ifeq ($(DOCKER_MACHINE_NAME),none) ifeq ($(DOCKER_MACHINE_NAME),none)
sync-ui: node_modules brocolli-watcher sync-ui: node_modules clean-tmp brocolli-watcher
else else
sync-ui: node_modules sync-ui: node_modules clean-tmp
tmux new-session -d -s ui_sync 'exec make brocolli-watcher' tmux new-session -d -s ui_sync 'exec make brocolli-watcher'
tmux rename-window 'UI Sync' tmux rename-window 'UI Sync'
tmux select-window -t ui_sync:0 tmux select-window -t ui_sync:0