From e1b658860223f3acd9376a31714e14756fbe4f15 Mon Sep 17 00:00:00 2001 From: James Laska Date: Fri, 18 Sep 2015 15:38:49 -0400 Subject: [PATCH] Include license information in packaging --- MANIFEST.in | 1 + Makefile | 4 +++- setup.py | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 1825574341..cb40bf39d5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,6 +8,7 @@ recursive-include awx/playbooks *.yml recursive-include awx/lib/site-packages * recursive-include requirements *.txt recursive-include config * +recursive-include docs/licenses * recursive-exclude awx devonly.py* recursive-exclude awx/api/tests * recursive-exclude awx/main/tests * diff --git a/Makefile b/Makefile index a32012d3a5..c89f506797 100644 --- a/Makefile +++ b/Makefile @@ -405,6 +405,7 @@ release_build: tar-build/$(SETUP_TAR_FILE): @mkdir -p tar-build @cp -a setup tar-build/$(SETUP_TAR_NAME) + @rsync -az docs/licenses tar-build/$(SETUP_TAR_NAME)/ @cd tar-build/$(SETUP_TAR_NAME) && sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%RELEASE%#$(RELEASE)#;' group_vars/all.in > group_vars/all @cd tar-build && tar -czf $(SETUP_TAR_FILE) --exclude "*/all.in" $(SETUP_TAR_NAME)/ @ln -sf $(SETUP_TAR_FILE) tar-build/$(SETUP_TAR_LINK) @@ -444,7 +445,8 @@ setup-bundle-build: # TODO - Somehow share implementation with setup_tarball setup-bundle-build/$(OFFLINE_TAR_FILE): cp -a setup setup-bundle-build/$(OFFLINE_TAR_NAME) - cp -a docs/bundled_licenses setup-bundle-build/$(OFFLINE_TAR_NAME)/licenses + rsync -az docs/licenses setup-bundle-build/$(OFFLINE_TAR_NAME)/ + rsync -az docs/bundled_licenses setup-bundle-build/$(OFFLINE_TAR_NAME)/ cd setup-bundle-build/$(OFFLINE_TAR_NAME) && sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%RELEASE%#$(RELEASE)#;' group_vars/all.in > group_vars/all $(PYTHON) $(DEPS_SCRIPT) -d $(DIST) -r $(DIST_MAJOR) -u $(AW_REPO_URL) -s setup-bundle-build/$(OFFLINE_TAR_NAME) -v -v -v cd setup-bundle-build && tar -czf $(OFFLINE_TAR_FILE) --exclude "*/all.in" $(OFFLINE_TAR_NAME)/ diff --git a/setup.py b/setup.py index ff572e5879..1478d5132c 100755 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ etcpath = "/etc/tower" homedir = "/var/lib/awx" sharedir = "/usr/share/awx" bindir = "/usr/bin" +docdir = "/usr/share/doc/ansible-tower" munin_plugin_path = "/etc/munin/plugins/" munin_plugin_conf_path = "/etc/munin/plugin-conf.d" @@ -122,6 +123,7 @@ setup( "config/awx-httpd-443.conf", "config/awx-munin.conf"]), ("%s" % sharedir, ["tools/scripts/request_tower_configuration.sh",]), + ("%s" % docdir, ["docs/licenses/*",]), ("%s" % munin_plugin_path, ["tools/munin_monitors/tower_jobs", "tools/munin_monitors/callbackr_alive", "tools/munin_monitors/celery_alive",