External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Change for RPM packaging to allow daily dev builds

Browse Source
This commit is contained in:
James Cammarata
2013-06-26 07:33:09 -04:00
parent bf5a1d1d67
commit 1a3fbcd796
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@@ -8,13 +8,15 @@ DATE := $(shell date -u +%Y%m%d%H%M)
VERSION=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[0])") VERSION=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[0])")
RELEASE=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])") RELEASE=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])")
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
BUILD=-dev$(DATE) BUILD=dev$(DATE)
SDIST_TAR_FILE=awx-$(VERSION)$(BUILD).tar.gz SDIST_TAR_FILE=awx-$(VERSION)-$(BUILD).tar.gz
DEB_BUILD_DIR=deb-build/awx-$(VERSION)$(BUILD) RPM_PKG_RELEASE=$(BUILD)
DEB_PKG_RELEASE=$(VERSION)$(BUILD) DEB_BUILD_DIR=deb-build/awx-$(VERSION)-$(BUILD)
DEB_PKG_RELEASE=$(VERSION)-$(BUILD)
else else
BUILD= BUILD=
SDIST_TAR_FILE=awx-$(VERSION).tar.gz SDIST_TAR_FILE=awx-$(VERSION).tar.gz
RPM_PKG_RELEASE=
DEB_BUILD_DIR=deb-build/awx-$(VERSION) DEB_BUILD_DIR=deb-build/awx-$(VERSION)
DEB_PKG_RELEASE=$(VERSION)-$(RELEASE) DEB_PKG_RELEASE=$(VERSION)-$(RELEASE)
endif endif
@@ -134,12 +136,14 @@ sdist: clean
BUILD=$(BUILD) $(PYTHON) setup.py sdist_awx; \ BUILD=$(BUILD) $(PYTHON) setup.py sdist_awx; \
fi fi
compiled: sdist rpmtar: sdist
#(cd dist/ && tar zxf $(SDIST_TAR_FILE)) (cd dist/ && tar zxf $(SDIST_TAR_FILE))
(cd dist/ && mv awx-$(VERSION)-$(BUILD) awx-$(VERSION))
(cd dist/ && tar czf awx-$(VERSION).tar.gz awx-$(VERSION))
rpm: compiled rpm: rpmtar
@mkdir -p rpm-build @mkdir -p rpm-build
@cp dist/*.gz rpm-build/ @cp dist/awx-$(VERSION).tar.gz rpm-build/
@rpmbuild --define "_topdir %(pwd)/rpm-build" \ @rpmbuild --define "_topdir %(pwd)/rpm-build" \
--define "_builddir %{_topdir}" \ --define "_builddir %{_topdir}" \
--define "_rpmdir %{_topdir}" \ --define "_rpmdir %{_topdir}" \
@@ -147,9 +151,10 @@ rpm: compiled
--define "_specdir %{_topdir}" \ --define "_specdir %{_topdir}" \
--define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \ --define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \
--define "_sourcedir %{_topdir}" \ --define "_sourcedir %{_topdir}" \
--define "_pkgrelease $(BUILD)" \
-ba packaging/rpm/awx.spec -ba packaging/rpm/awx.spec
deb: compiled deb: sdist
@mkdir -p deb-build @mkdir -p deb-build
@cp dist/$(SDIST_TAR_FILE) deb-build/ @cp dist/$(SDIST_TAR_FILE) deb-build/
(cd deb-build && tar zxf $(SDIST_TAR_FILE)) (cd deb-build && tar zxf $(SDIST_TAR_FILE))

2
setup.py
View File

@@ -154,7 +154,7 @@ setup(
), ),
options = { options = {
'egg_info': { 'egg_info': {
'tag_build': '%s' % build_timestamp, 'tag_build': '-%s' % build_timestamp,
}, },
'aliases': { 'aliases': {
'dev_build': 'clean --all egg_info sdist_awx', 'dev_build': 'clean --all egg_info sdist_awx',