Skip to content

A
ansible
Commit 1cf911d5 by James Cammarata
Options

Back-porting Makefile changes for version/release

parent b8a9d87f
Showing with 4 additions and 3 deletions
Makefile
...@@ -34,7 +34,8 @@ PYTHON=python ...@@ -34,7 +34,8 @@ PYTHON=python
SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
# VERSION file provides one place to update the software version # VERSION file provides one place to update the software version
VERSION := $(shell cat VERSION) VERSION := $(shell cat VERSION | cut -f1 -d' ')
RELEASE := $(shell cat VERSION | cut -f2 -d' ')
# Get the branch information from git # Get the branch information from git
ifneq ($(shell which git),) ifneq ($(shell which git),)
...@@ -53,7 +54,7 @@ DEBUILD_OPTS = --source-option="-I" ...@@ -53,7 +54,7 @@ DEBUILD_OPTS = --source-option="-I"
DPUT_BIN ?= dput DPUT_BIN ?= dput
DPUT_OPTS ?= DPUT_OPTS ?=
ifeq ($(OFFICIAL),yes) ifeq ($(OFFICIAL),yes)
DEB_RELEASE = 1ppa DEB_RELEASE = $(RELEASE)ppa
# Sign OFFICIAL builds using 'DEBSIGN_KEYID' # Sign OFFICIAL builds using 'DEBSIGN_KEYID'
# DEBSIGN_KEYID is required when signing # DEBSIGN_KEYID is required when signing
ifneq ($(DEBSIGN_KEYID),) ifneq ($(DEBSIGN_KEYID),)
...@@ -74,7 +75,7 @@ DEB_DIST ?= unstable ...@@ -74,7 +75,7 @@ DEB_DIST ?= unstable
RPMSPECDIR= packaging/rpm RPMSPECDIR= packaging/rpm
RPMSPEC = $(RPMSPECDIR)/ansible.spec RPMSPEC = $(RPMSPECDIR)/ansible.spec
RPMDIST = $(shell rpm --eval '%{?dist}') RPMDIST = $(shell rpm --eval '%{?dist}')
RPMRELEASE = 1 RPMRELEASE = $(RELEASE)
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
RPMRELEASE = 0.git$(DATE) RPMRELEASE = 0.git$(DATE)
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment