External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-11 13:09:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Rename package awx to ansible-tower

Browse Source
This commit is contained in:
Jenkins
2014-01-29 17:30:12 +00:00
committed by Matthew Jones
parent c18cb5a622
commit fd8e7fe6cb
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@@ -15,20 +15,20 @@ PACKER_LICENSE_FILE ?= test.json
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
BUILD=dev$(DATE) BUILD=dev$(DATE)
SDIST_TAR_FILE=awx-$(VERSION)-$(BUILD).tar.gz SDIST_TAR_FILE=ansible-tower-$(VERSION)-$(BUILD).tar.gz
SETUP_TAR_NAME=awx-setup-$(VERSION)-$(BUILD) SETUP_TAR_NAME=ansible-tower-setup-$(VERSION)-$(BUILD)
RPM_PKG_RELEASE=$(BUILD) RPM_PKG_RELEASE=$(BUILD)
DEB_BUILD_DIR=deb-build/awx-$(VERSION)-$(BUILD) DEB_BUILD_DIR=deb-build/ansible-tower-$(VERSION)-$(BUILD)
DEB_PKG_RELEASE=$(VERSION)-$(BUILD) DEB_PKG_RELEASE=$(VERSION)-$(BUILD)
PACKER_BUILD_OPTS=-var-file=vars-awxkeys.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=awx-$(VERSION).tar.gz SDIST_TAR_FILE=ansible-tower-$(VERSION).tar.gz
SETUP_TAR_NAME=awx-setup-$(VERSION) SETUP_TAR_NAME=ansible-tower-setup-$(VERSION)
RPM_PKG_RELEASE=$(RELEASE) RPM_PKG_RELEASE=$(RELEASE)
DEB_BUILD_DIR=deb-build/awx-$(VERSION) DEB_BUILD_DIR=deb-build/ansible-tower-$(VERSION)
DEB_PKG_RELEASE=$(VERSION)-$(RELEASE) DEB_PKG_RELEASE=$(VERSION)-$(RELEASE)
PACKER_BUILD_OPTS=-var-file=vars-awxkeys.json -var-file=vars-release.json PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-release.json
endif endif
.PHONY: clean rebase push requirements requirements_pypi develop refresh \ .PHONY: clean rebase push requirements requirements_pypi develop refresh \
@@ -168,13 +168,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 awx-$(VERSION)-$(BUILD) awx-$(VERSION)) ; \ (cd dist/ && mv ansible-tower-$(VERSION)-$(BUILD) ansible-tower-$(VERSION)) ; \
(cd dist/ && tar czf awx-$(VERSION).tar.gz awx-$(VERSION)) ; \ (cd dist/ && tar czf ansible-tower-$(VERSION).tar.gz ansible-tower-$(VERSION)) ; \
fi fi
rpm: rpmtar rpm: rpmtar
@mkdir -p rpm-build @mkdir -p rpm-build
@cp dist/awx-$(VERSION).tar.gz rpm-build/ @cp dist/ansible-tower-$(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}" \
@@ -183,23 +183,23 @@ 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/awx.spec -ba packaging/rpm/ansible-tower.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 awx-$(VERSION)) (cd $(DEB_BUILD_DIR) && dh_make --indep --yes -f ../$(SDIST_TAR_FILE) -p ansible-tower-$(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 "awx_$(DEB_PKG_RELEASE).deb admin optional" > $(DEB_BUILD_DIR)/debian/realfiles @echo "ansible-tower_$(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")
packer_license: packer_license:
@python -c "import json; fp = open('packaging/ami/license/$(PACKER_LICENSE_FILE)', 'w+'); json.dump(dict(instance_count=$(LICENSE_TIER)), fp); fp.close();" @python -c "import json; fp = open('packaging/ami/license/$(PACKER_LICENSE_FILE)', 'w+'); json.dump(dict(instance_count=$(LICENSE_TIER)), fp); fp.close();"
ami: packer_license ami: packer_license
(cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(PACKER_LICENSE_FILE)" awx.json) (cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(PACKER_LICENSE_FILE)" ansible-tower.json)
install: install:
$(PYTHON) setup.py install egg_info -b "" $(PYTHON) setup.py install egg_info -b ""

2
docs/build_system.md
View File

@@ -267,7 +267,7 @@ These nightly repositories can be used by the AWX setup playbook by running the
As noted above, `OFFICIAL` builds are copied out to the production server, and can be As noted above, `OFFICIAL` builds are copied out to the production server, and can be
found at the following location: found at the following location:
http://releases.ansible.com/awx/ http://releases.ansible.com/ansible-tower/
The AWX setup playbook will use this repo location by default. The AWX setup playbook will use this repo location by default.

8
setup.py
View File

@@ -105,11 +105,11 @@ class sdist_awx(_sdist, object):
super(sdist_awx, self).make_distribution() super(sdist_awx, self).make_distribution()
setup( setup(
name='awx', name='ansible-tower',
version=__version__.split("-")[0], # FIXME: Should keep full version here? version=__version__.split("-")[0], # FIXME: Should keep full version here?
author='AnsibleWorks, Inc.', author='Ansible, Inc.',
author_email='support@ansibleworks.com', author_email='support@ansible.com',
description='AWX: API, UI and Task Engine for Ansible', description='ansible-tower: API, UI and Task Engine for Ansible',
long_description='AWX provides a web-based user interface, REST API and ' long_description='AWX provides a web-based user interface, REST API and '
'task engine built on top of Ansible', 'task engine built on top of Ansible',
license='Proprietary', license='Proprietary',