diff options
| -rw-r--r-- | MANIFEST.in | 4 | ||||
| -rw-r--r-- | Makefile | 32 |
2 files changed, 21 insertions, 15 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 5af81ddecc..1825574341 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,9 +6,8 @@ recursive-include awx/ui/templates *.html recursive-include awx/ui/dist * recursive-include awx/playbooks *.yml recursive-include awx/lib/site-packages * +recursive-include requirements *.txt recursive-include config * -recursive-include config/deb * -recursive-include config/rpm * recursive-exclude awx devonly.py* recursive-exclude awx/api/tests * recursive-exclude awx/main/tests * @@ -18,5 +17,6 @@ include tools/scripts/ansible-tower-service include tools/munin_monitors/* include tools/sosreport/* include COPYING +include Makefile prune awx/public prune awx/projects @@ -71,11 +71,13 @@ else endif DEBUILD = $(DEBUILD_BIN) $(DEBUILD_OPTS) DEB_PPA ?= reprepro +DEB_ARCH ?= amd64 # RPM build parameters RPM_SPECDIR= packaging/rpm RPM_SPEC = $(RPM_SPECDIR)/$(NAME).spec RPM_DIST ?= $(shell rpm --eval '%{?dist}' 2>/dev/null) +RPM_ARCH ?= $(shell rpm --eval '%{_arch}' 2>/dev/null) RPM_NVR = $(NAME)-$(VERSION)-$(RELEASE)$(RPM_DIST) MOCK_BIN ?= mock MOCK_CFG ?= @@ -149,15 +151,19 @@ push: git push origin master # Install runtime, development and jenkins requirements -requirements requirements_dev requirements_jenkins: %: real-% awx/lib/site-packages/oslo/__init__.py awx/lib/site-packages/dogpile/__init__.py +requirements requirements_dev requirements_jenkins: %: real-% # Create missing __init__.py files awx/lib/site-packages/%/__init__.py: touch $@ # Install third-party requirements needed for development environment. +# NOTE: +# * --target is only supported on newer versions of pip +# * https://github.com/pypa/pip/issues/3056 - the workaround is to override the `install-platlib` +# * --user (in conjunction with PYTHONUSERBASE="awx" may be a better option real-requirements: - pip install -r requirements/requirements.txt --target awx/lib/site-packages/ --ignore-installed + pip install -r requirements/requirements.txt --target awx/lib/site-packages/ --ignore-installed --install-option="--install-platlib=\$$base/lib/python" real-requirements_dev: real-requirements # (cat requirements/requirements.txt requirements/requirements_dev.txt > /tmp/req_dev.txt); @@ -368,7 +374,7 @@ release_clean: dist/$(SDIST_TAR_FILE): BUILD="$(BUILD)" $(PYTHON) setup.py sdist -sdist: minjs requirements dist/$(SDIST_TAR_FILE) +sdist: minjs dist/$(SDIST_TAR_FILE) # Build setup offline tarball offline_tar-build/$(DIST_FULL)/$(OFFLINE_TAR_FILE): @@ -410,22 +416,22 @@ rpm-build/$(RPM_NVR).src.rpm: /etc/mock/$(MOCK_CFG).cfg mock-srpm: rpmtar rpm-build/$(RPM_NVR).src.rpm -rpm-build/$(RPM_NVR).noarch.rpm: rpm-build/$(RPM_NVR).src.rpm +rpm-build/$(RPM_NVR).$(RPM_ARCH).rpm: rpm-build/$(RPM_NVR).src.rpm $(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build --rebuild rpm-build/$(RPM_NVR).src.rpm \ --define "tower_version $(VERSION)" --define "tower_release $(RELEASE)" @echo "#############################################" @echo "RPM artifacts:" - @echo rpm-build/$(RPM_NVR).noarch.rpm + @echo rpm-build/$(RPM_NVR).$(RPM_ARCH).rpm @echo "#############################################" -mock-rpm: rpmtar rpm-build/$(RPM_NVR).noarch.rpm +mock-rpm: rpmtar rpm-build/$(RPM_NVR).$(RPM_ARCH).rpm ifeq ($(OFFICIAL),yes) rpm-build/$(GPG_FILE): rpm-build gpg --export -a "${GPG_KEY}" > "$@" -rpm-sign: rpm-build/$(GPG_FILE) rpmtar rpm-build/$(RPM_NVR).noarch.rpm - rpm --define "_signature gpg" --define "_gpg_name $(GPG_KEY)" --addsign rpm-build/$(RPM_NVR).noarch.rpm +rpm-sign: rpm-build/$(GPG_FILE) rpmtar rpm-build/$(RPM_NVR).$(RPM_ARCH).rpm + rpm --define "_signature gpg" --define "_gpg_name $(GPG_KEY)" --addsign rpm-build/$(RPM_NVR).$(RPM_ARCH).rpm endif deb-build/$(SDIST_TAR_NAME): @@ -437,14 +443,14 @@ deb-build/$(SDIST_TAR_NAME): debian: sdist deb-build/$(SDIST_TAR_NAME) -deb-build/$(NAME)_$(VERSION)-$(RELEASE)_all.deb: +deb-build/$(NAME)_$(VERSION)-$(RELEASE)_$(DEB_ARCH).deb: cd deb-build/$(SDIST_TAR_NAME) && $(DEBUILD) -b @echo "#############################################" @echo "DEB artifacts:" - @echo deb-build/$(NAME)_$(VERSION)-$(RELEASE)_all.deb + @echo deb-build/$(NAME)_$(VERSION)-$(RELEASE)_$(DEB_ARCH).deb @echo "#############################################" -deb: debian deb-build/$(NAME)_$(VERSION)-$(RELEASE)_all.deb +deb: debian deb-build/$(NAME)_$(VERSION)-$(RELEASE)_$(DEB_ARCH).deb deb-build/$(NAME)_$(VERSION)-$(RELEASE)_source.changes: cd deb-build/$(SDIST_TAR_NAME) && $(DEBUILD) -S @@ -456,7 +462,7 @@ deb-build/$(NAME)_$(VERSION)-$(RELEASE)_source.changes: deb-src: debian deb-build/$(NAME)_$(VERSION)-$(RELEASE)_source.changes deb-upload: deb - $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$(NAME)_$(VERSION)-$(RELEASE)_amd64.changes ; \ + $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$(NAME)_$(VERSION)-$(RELEASE)_$(DEB_ARCH).changes ; \ deb-src-upload: deb-src $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$(NAME)_$(VERSION)-$(RELEASE)_source.changes ; \ @@ -464,7 +470,7 @@ deb-src-upload: deb-src reprepro: deb mkdir -p reprepro/conf cp -a packaging/reprepro/* reprepro/conf/ - @DEB=deb-build/$(NAME)_$(VERSION)-$(RELEASE)_all.deb ; \ + @DEB=deb-build/$(NAME)_$(VERSION)-$(RELEASE)_$(DEB_ARCH).deb ; \ for DIST in trusty precise ; do \ echo "Removing '$(NAME)' from the $${DIST} apt repo" ; \ echo reprepro --export=force -b reprepro remove $${DIST} $(NAME) ; \ |