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

Require LICENSE_TIER to specify the license filename

Browse Source 
Previously, LICENSE_TIER was used to generate the license file by appending
'.json'.
This commit is contained in:
James Laska
2014-02-03 13:52:00 -05:00
parent ab7c65df1d
commit df9be04a20
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -10,7 +10,7 @@ VERSION=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.spl
RELEASE=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])") RELEASE=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])")
# Allow AMI license customization # Allow AMI license customization
LICENSE_TIER ?= 10 LICENSE_TIER ?= 10.json
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
BUILD=dev$(DATE) BUILD=dev$(DATE)
@@ -197,7 +197,7 @@ deb: sdist
(cd $(DEB_BUILD_DIR) && PKG_RELEASE=$(DEB_PKG_RELEASE) dpkg-buildpackage -nc -us -uc -b --changes-option="-fdebian/realfiles") (cd $(DEB_BUILD_DIR) && PKG_RELEASE=$(DEB_PKG_RELEASE) dpkg-buildpackage -nc -us -uc -b --changes-option="-fdebian/realfiles")
ami: ami:
(cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(LICENSE_TIER).json" ansible-tower.json) (cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(LICENSE_TIER)" ansible-tower.json)
install: install:
$(PYTHON) setup.py install egg_info -b "" $(PYTHON) setup.py install egg_info -b ""