mirror of
https://github.com/ansible/awx.git
synced 2026-03-23 03:45:01 -02:30
Create package.json during build target
Rather than hard-code the name and version in package.json, generate the file during the build process. The strings %NAME% and %VERSION% will be replaced with appropriate values during a new build target 'package.json'.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -24,4 +24,5 @@ pep8.txt
|
|||||||
.tox
|
.tox
|
||||||
nohup.out
|
nohup.out
|
||||||
reports
|
reports
|
||||||
|
package.json
|
||||||
*~
|
*~
|
||||||
|
|||||||
34
Makefile
34
Makefile
@@ -6,6 +6,7 @@ PACKER ?= packer
|
|||||||
GIT_DATE := $(shell git log -n 1 --format="%ai")
|
GIT_DATE := $(shell git log -n 1 --format="%ai")
|
||||||
DATE := $(shell date -u +%Y%m%d%H%M)
|
DATE := $(shell date -u +%Y%m%d%H%M)
|
||||||
|
|
||||||
|
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])")
|
||||||
|
|
||||||
@@ -14,18 +15,18 @@ LICENSE_TIER ?= 10.json
|
|||||||
|
|
||||||
ifneq ($(OFFICIAL),yes)
|
ifneq ($(OFFICIAL),yes)
|
||||||
BUILD=dev$(DATE)
|
BUILD=dev$(DATE)
|
||||||
SDIST_TAR_FILE=ansible-tower-$(VERSION)-$(BUILD).tar.gz
|
SDIST_TAR_FILE=$(NAME)-$(VERSION)-$(BUILD).tar.gz
|
||||||
SETUP_TAR_NAME=ansible-tower-setup-$(VERSION)-$(BUILD)
|
SETUP_TAR_NAME=$(NAME)-setup-$(VERSION)-$(BUILD)
|
||||||
RPM_PKG_RELEASE=$(BUILD)
|
RPM_PKG_RELEASE=$(BUILD)
|
||||||
DEB_BUILD_DIR=deb-build/ansible-tower-$(VERSION)-$(BUILD)
|
DEB_BUILD_DIR=deb-build/$(NAME)-$(VERSION)-$(BUILD)
|
||||||
DEB_PKG_RELEASE=$(VERSION)-$(BUILD)
|
DEB_PKG_RELEASE=$(VERSION)-$(BUILD)
|
||||||
PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-nightly.json
|
PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-nightly.json
|
||||||
else
|
else
|
||||||
BUILD=
|
BUILD=
|
||||||
SDIST_TAR_FILE=ansible-tower-$(VERSION).tar.gz
|
SDIST_TAR_FILE=$(NAME)-$(VERSION).tar.gz
|
||||||
SETUP_TAR_NAME=ansible-tower-setup-$(VERSION)
|
SETUP_TAR_NAME=$(NAME)-setup-$(VERSION)
|
||||||
RPM_PKG_RELEASE=$(RELEASE)
|
RPM_PKG_RELEASE=$(RELEASE)
|
||||||
DEB_BUILD_DIR=deb-build/ansible-tower-$(VERSION)
|
DEB_BUILD_DIR=deb-build/$(NAME)-$(VERSION)
|
||||||
DEB_PKG_RELEASE=$(VERSION)-$(RELEASE)
|
DEB_PKG_RELEASE=$(VERSION)-$(RELEASE)
|
||||||
PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-release.json
|
PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-release.json
|
||||||
endif
|
endif
|
||||||
@@ -41,7 +42,7 @@ clean:
|
|||||||
rm -rf build rpm-build *.egg-info
|
rm -rf build rpm-build *.egg-info
|
||||||
rm -rf debian deb-build
|
rm -rf debian deb-build
|
||||||
rm -f awx/ui/static/css/awx*.js awx/ui/static/css/awx*.css
|
rm -f awx/ui/static/css/awx*.js awx/ui/static/css/awx*.css
|
||||||
rm -rf node_modules
|
rm -rf node_modules package.json
|
||||||
find . -type f -regex ".*\.py[co]$$" -delete
|
find . -type f -regex ".*\.py[co]$$" -delete
|
||||||
|
|
||||||
# Fetch from origin, rebase local commits on top of origin commits.
|
# Fetch from origin, rebase local commits on top of origin commits.
|
||||||
@@ -142,8 +143,11 @@ test_tox:
|
|||||||
test_jenkins:
|
test_jenkins:
|
||||||
$(PYTHON) manage.py jenkins -v2
|
$(PYTHON) manage.py jenkins -v2
|
||||||
|
|
||||||
|
package.json:
|
||||||
|
sed -e 's/%NAME%/$(NAME)/;s/%VERSION%/$(VERSION)/' packaging/grunt/package.template > $@
|
||||||
|
|
||||||
# Update local npm install
|
# Update local npm install
|
||||||
node_modules:
|
node_modules: package.json
|
||||||
npm install
|
npm install
|
||||||
|
|
||||||
# Build minified JS/CSS.
|
# Build minified JS/CSS.
|
||||||
@@ -182,13 +186,13 @@ sdist: clean minjs
|
|||||||
rpmtar: sdist
|
rpmtar: sdist
|
||||||
if [ "$(OFFICIAL)" != "yes" ] ; then \
|
if [ "$(OFFICIAL)" != "yes" ] ; then \
|
||||||
(cd dist/ && tar zxf $(SDIST_TAR_FILE)) ; \
|
(cd dist/ && tar zxf $(SDIST_TAR_FILE)) ; \
|
||||||
(cd dist/ && mv ansible-tower-$(VERSION)-$(BUILD) ansible-tower-$(VERSION)) ; \
|
(cd dist/ && mv $(NAME)-$(VERSION)-$(BUILD) $(NAME)-$(VERSION)) ; \
|
||||||
(cd dist/ && tar czf ansible-tower-$(VERSION).tar.gz ansible-tower-$(VERSION)) ; \
|
(cd dist/ && tar czf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)) ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rpm: rpmtar
|
rpm: rpmtar
|
||||||
@mkdir -p rpm-build
|
@mkdir -p rpm-build
|
||||||
@cp dist/ansible-tower-$(VERSION).tar.gz rpm-build/
|
@cp dist/$(NAME)-$(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}" \
|
||||||
@@ -197,20 +201,20 @@ rpm: rpmtar
|
|||||||
--define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \
|
--define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \
|
||||||
--define "_sourcedir %{_topdir}" \
|
--define "_sourcedir %{_topdir}" \
|
||||||
--define "_pkgrelease $(RPM_PKG_RELEASE)" \
|
--define "_pkgrelease $(RPM_PKG_RELEASE)" \
|
||||||
-ba packaging/rpm/ansible-tower.spec
|
-ba packaging/rpm/$(NAME).spec
|
||||||
|
|
||||||
deb: sdist
|
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))
|
||||||
(cd $(DEB_BUILD_DIR) && dh_make --indep --yes -f ../$(SDIST_TAR_FILE) -p ansible-tower-$(VERSION))
|
(cd $(DEB_BUILD_DIR) && dh_make --indep --yes -f ../$(SDIST_TAR_FILE) -p $(NAME)-$(VERSION))
|
||||||
@rm -rf $(DEB_BUILD_DIR)/debian
|
@rm -rf $(DEB_BUILD_DIR)/debian
|
||||||
@cp -a packaging/debian $(DEB_BUILD_DIR)/
|
@cp -a packaging/debian $(DEB_BUILD_DIR)/
|
||||||
@echo "ansible-tower-$(DEB_PKG_RELEASE).deb admin optional" > $(DEB_BUILD_DIR)/debian/realfiles
|
@echo "$(NAME)-$(DEB_PKG_RELEASE).deb admin optional" > $(DEB_BUILD_DIR)/debian/realfiles
|
||||||
(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)" ansible-tower.json)
|
(cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(LICENSE_TIER)" $(NAME).json)
|
||||||
|
|
||||||
install:
|
install:
|
||||||
$(PYTHON) setup.py install egg_info -b ""
|
$(PYTHON) setup.py install egg_info -b ""
|
||||||
|
|||||||
10
package.json
10
package.json
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "ansible-commander",
|
|
||||||
"version": "1.4.5",
|
|
||||||
"devDependencies": {
|
|
||||||
"grunt": "latest",
|
|
||||||
"grunt-contrib-jshint": "~0.8.0",
|
|
||||||
"grunt-contrib-uglify": "~0.3.1",
|
|
||||||
"grunt-contrib-less": "~0.9.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user