External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-10 20:49:24 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove PACKAGE_BUILD logic from Makefile

Browse Source 
Also fix some whitespace
This commit is contained in:
Shane McDonald
2017-08-03 16:19:27 -04:00
parent f13c56e3d9
commit 9c56a18ced
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@@ -2,7 +2,6 @@ PYTHON ?= python
PYTHON_VERSION = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_version; print(get_python_version())") PYTHON_VERSION = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
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())")
OFFICIAL ?= no OFFICIAL ?= no
PACKAGE_BUILD ?= no
PACKER ?= packer PACKER ?= packer
PACKER_BUILD_OPTS ?= -var 'official=$(OFFICIAL)' -var 'aw_repo_url=$(AW_REPO_URL)' PACKER_BUILD_OPTS ?= -var 'official=$(OFFICIAL)' -var 'aw_repo_url=$(AW_REPO_URL)'
NODE ?= node NODE ?= node
@@ -45,27 +44,20 @@ DATE := $(shell date -u +%Y%m%d%H%M)
NAME ?= awx NAME ?= awx
GIT_REMOTE_URL = $(shell git config --get remote.origin.url) GIT_REMOTE_URL = $(shell git config --get remote.origin.url)
ifeq ($(OFFICIAL),yes) ifeq ($(OFFICIAL),yes)
RELEASE ?= 1 VERSION_TARGET ?= $(RELEASE_VERSION)
VERSION_TARGET ?= $(RELEASE_VERSION)
elif ($(PACKAGE_BUILD),yes)
RELEASE ?= 0.git$(shell git describe --long | cut -d - -f 2-2)
VERSION_TARGET ?= $(RELEASE)
else else
RELEASE ?= VERSION_TARGET ?= $(VERSION3DOT)
VERSION_TARGET ?= $(VERSION3DOT)
endif endif
# TAR build parameters # TAR build parameters
ifeq ($(OFFICIAL),yes) ifeq ($(OFFICIAL),yes)
SDIST_TAR_NAME=$(NAME)-$(RELEASE_VERSION) SDIST_TAR_NAME=$(NAME)-$(RELEASE_VERSION)
WHEEL_NAME=$(NAME)-$(RELEASE_VERSION) WHEEL_NAME=$(NAME)-$(RELEASE_VERSION)
elif ($(PACKAGE_BUILD),yes)
SDIST_TAR_NAME=$(NAME)-$(RELEASE_VERSION)-$(RELEASE)
WHEEL_NAME=$(NAME)-$(RELEASE_VERSION)_$(RELEASE)
else else
SDIST_TAR_NAME=$(NAME)-$(VERSION3DOT) SDIST_TAR_NAME=$(NAME)-$(VERSION3DOT)
WHEEL_NAME=$(NAME)-$(VERSION3DOT) WHEEL_NAME=$(NAME)-$(VERSION3DOT)
endif endif
SDIST_COMMAND ?= sdist SDIST_COMMAND ?= sdist