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

Resolve npm repository warning

Browse Source
This commit is contained in:
James Laska
2014-07-07 09:30:27 -04:00
parent 1590ce1762
commit 69165b762a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -11,6 +11,7 @@ DATE := $(shell date -u +%Y%m%d%H%M)
NAME=ansible-tower NAME=ansible-tower
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])")
GIT_REMOTE_URL=$(shell git config --get remote.origin.url)
# Allow AMI license customization # Allow AMI license customization
AWS_INSTANCE_COUNT ?= 10 AWS_INSTANCE_COUNT ?= 10
@@ -178,7 +179,7 @@ test_jenkins:
$(PYTHON) manage.py jenkins -v2 $(PYTHON) manage.py jenkins -v2
package.json: package.json:
sed -e 's/%NAME%/$(NAME)/;s/%VERSION%/$(VERSION)/' packaging/grunt/package.template > $@ sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%GIT_REMOTE_URL%#$(GIT_REMOTE_URL)#;' packaging/grunt/package.template > $@
# Update local npm install # Update local npm install
node_modules: package.json node_modules: package.json