From 7151071779525ad9f1c0b0256ab8c1d50a29fe88 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Wed, 25 Apr 2018 11:55:57 -0400 Subject: [PATCH] Add awx-link make target --- Makefile | 7 ++++++- tools/docker-compose/bootstrap_development.sh | 4 +--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7d4c242693..14564df430 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ UI_RELEASE_FLAG_FILE = awx/ui/.release_built I18N_FLAG_FILE = .i18n_built -.PHONY: clean clean-tmp clean-venv requirements requirements_dev \ +.PHONY: awx-link clean clean-tmp clean-venv requirements requirements_dev \ develop refresh adduser migrate dbchange dbshell runserver celeryd \ receiver test test_unit test_ansible test_coverage coverage_html \ dev_build release_build release_clean sdist \ @@ -367,6 +367,11 @@ swagger: reports check: flake8 pep8 # pyflakes pylint +awx-link: + cp -R /tmp/awx.egg-info /awx_devel/ || true + sed -i "s/placeholder/$(shell git describe --long | sed 's/\./\\./g')/" /awx_devel/awx.egg-info/PKG-INFO + cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link + TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests # Run all API unit tests. test: diff --git a/tools/docker-compose/bootstrap_development.sh b/tools/docker-compose/bootstrap_development.sh index df6ecb2637..17629a334f 100755 --- a/tools/docker-compose/bootstrap_development.sh +++ b/tools/docker-compose/bootstrap_development.sh @@ -21,9 +21,7 @@ else echo "Failed to find awx source tree, map your development tree volume" fi -cp -R /tmp/awx.egg-info /awx_devel/ || true -sed -i "s/placeholder/$(git describe --long | sed 's/\./\\./g')/" /awx_devel/awx.egg-info/PKG-INFO -cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link +make awx-link ln -s /awx_devel/tools/rdb.py /venv/awx/lib/python2.7/site-packages/rdb.py || true yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /supervisor.conf