From 6d5a5883fe34648e146ccea83ce0fb75ce5ae2c0 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Tue, 10 Mar 2015 17:16:33 -0500 Subject: [PATCH] Setting up new release candidate versioning --- Makefile | 7 ++++--- VERSION | 2 +- docs/man/man1/ansible-doc.1 | 12 +++++++++--- docs/man/man1/ansible-galaxy.1 | 6 +++--- docs/man/man1/ansible-playbook.1 | 14 ++++++++++---- docs/man/man1/ansible-pull.1 | 12 +++++++++--- docs/man/man1/ansible-vault.1 | 6 +++--- docs/man/man1/ansible.1 | 28 ++++++++++++---------------- lib/ansible/__init__.py | 2 +- packaging/rpm/ansible.spec | 3 ++- 10 files changed, 54 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index f688bd73bf6..92dd4f630e7 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,8 @@ PYTHON=python SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") # VERSION file provides one place to update the software version -VERSION := $(shell cat VERSION) +VERSION := $(shell cat VERSION | cut -f1 -d' ') +RELEASE := $(shell cat VERSION | cut -f2 -d' ') # Get the branch information from git ifneq ($(shell which git),) @@ -53,7 +54,7 @@ DEBUILD_OPTS = --source-option="-I" DPUT_BIN ?= dput DPUT_OPTS ?= ifeq ($(OFFICIAL),yes) - DEB_RELEASE = 1ppa + DEB_RELEASE = $(RELEASE)ppa # Sign OFFICIAL builds using 'DEBSIGN_KEYID' # DEBSIGN_KEYID is required when signing ifneq ($(DEBSIGN_KEYID),) @@ -74,7 +75,7 @@ DEB_DIST ?= unstable RPMSPECDIR= packaging/rpm RPMSPEC = $(RPMSPECDIR)/ansible.spec RPMDIST = $(shell rpm --eval '%{?dist}') -RPMRELEASE = 1 +RPMRELEASE = $(RELEASE) ifneq ($(OFFICIAL),yes) RPMRELEASE = 0.git$(DATE) endif diff --git a/VERSION b/VERSION index 2e0e38c63a6..bea2acab409 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9 +1.9.0 0.1.rc1 diff --git a/docs/man/man1/ansible-doc.1 b/docs/man/man1/ansible-doc.1 index 2d5068d0d3a..c61fe842cf6 100644 --- a/docs/man/man1/ansible-doc.1 +++ b/docs/man/man1/ansible-doc.1 @@ -2,12 +2,12 @@ .\" Title: ansible-doc .\" Author: :doctype:manpage .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/09/2014 +.\" Date: 03/10/2015 .\" Manual: System administration commands -.\" Source: Ansible 1.9 +.\" Source: Ansible 1.9.0 .\" Language: English .\" -.TH "ANSIBLE\-DOC" "1" "12/09/2014" "Ansible 1\&.9" "System administration commands" +.TH "ANSIBLE\-DOC" "1" "03/10/2015" "Ansible 1\&.9\&.0" "System administration commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -64,3 +64,9 @@ Ansible is released under the terms of the GPLv3 License\&. \fBansible\-playbook\fR(1), \fBansible\fR(1), \fBansible\-pull\fR(1) .sp Extensive documentation is available in the documentation site: http://docs\&.ansible\&.com\&. IRC and mailing list info can be found in file CONTRIBUTING\&.md, available in: https://github\&.com/ansible/ansible +.SH "AUTHOR" +.PP +\fB:doctype:manpage\fR +.RS 4 +Author. +.RE diff --git a/docs/man/man1/ansible-galaxy.1 b/docs/man/man1/ansible-galaxy.1 index eac74b6a85d..7462ba54151 100644 --- a/docs/man/man1/ansible-galaxy.1 +++ b/docs/man/man1/ansible-galaxy.1 @@ -2,12 +2,12 @@ .\" Title: ansible-galaxy .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/09/2014 +.\" Date: 03/10/2015 .\" Manual: System administration commands -.\" Source: Ansible 1.9 +.\" Source: Ansible 1.9.0 .\" Language: English .\" -.TH "ANSIBLE\-GALAXY" "1" "12/09/2014" "Ansible 1\&.9" "System administration commands" +.TH "ANSIBLE\-GALAXY" "1" "03/10/2015" "Ansible 1\&.9\&.0" "System administration commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man/man1/ansible-playbook.1 b/docs/man/man1/ansible-playbook.1 index 085c5f79f1e..db9e186b6d3 100644 --- a/docs/man/man1/ansible-playbook.1 +++ b/docs/man/man1/ansible-playbook.1 @@ -2,12 +2,12 @@ .\" Title: ansible-playbook .\" Author: :doctype:manpage .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/09/2014 +.\" Date: 03/10/2015 .\" Manual: System administration commands -.\" Source: Ansible 1.9 +.\" Source: Ansible 1.9.0 .\" Language: English .\" -.TH "ANSIBLE\-PLAYBOOK" "1" "12/09/2014" "Ansible 1\&.9" "System administration commands" +.TH "ANSIBLE\-PLAYBOOK" "1" "03/10/2015" "Ansible 1\&.9\&.0" "System administration commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -66,7 +66,7 @@ search path to load modules from\&. The default is .PP \fB\-e\fR \fIVARS\fR, \fB\-\-extra\-vars=\fR\fIVARS\fR .RS 4 -Extra variables to inject into a playbook, in key=value key=value format or as quoted JSON (hashes and arrays)\&. +Extra variables to inject into a playbook, in key=value key=value format or as quoted JSON (hashes and arrays)\&. To load variables from a file, specify the file preceded by @ (e\&.g\&. @vars\&.yml)\&. .RE .PP \fB\-f\fR \fINUM\fR, \fB\-\-forks=\fR\fINUM\fR @@ -181,3 +181,9 @@ Ansible is released under the terms of the GPLv3 License\&. \fBansible\fR(1), \fBansible\-pull\fR(1), \fBansible\-doc\fR(1) .sp Extensive documentation is available in the documentation site: http://docs\&.ansible\&.com\&. IRC and mailing list info can be found in file CONTRIBUTING\&.md, available in: https://github\&.com/ansible/ansible +.SH "AUTHOR" +.PP +\fB:doctype:manpage\fR +.RS 4 +Author. +.RE diff --git a/docs/man/man1/ansible-pull.1 b/docs/man/man1/ansible-pull.1 index a9b69788b47..cb43f219e8e 100644 --- a/docs/man/man1/ansible-pull.1 +++ b/docs/man/man1/ansible-pull.1 @@ -2,12 +2,12 @@ .\" Title: ansible .\" Author: :doctype:manpage .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/09/2014 +.\" Date: 03/10/2015 .\" Manual: System administration commands -.\" Source: Ansible 1.9 +.\" Source: Ansible 1.9.0 .\" Language: English .\" -.TH "ANSIBLE" "1" "12/09/2014" "Ansible 1\&.9" "System administration commands" +.TH "ANSIBLE" "1" "03/10/2015" "Ansible 1\&.9\&.0" "System administration commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -104,3 +104,9 @@ Ansible is released under the terms of the GPLv3 License\&. \fBansible\fR(1), \fBansible\-playbook\fR(1), \fBansible\-doc\fR(1) .sp Extensive documentation is available in the documentation site: http://docs\&.ansible\&.com\&. IRC and mailing list info can be found in file CONTRIBUTING\&.md, available in: https://github\&.com/ansible/ansible +.SH "AUTHOR" +.PP +\fB:doctype:manpage\fR +.RS 4 +Author. +.RE diff --git a/docs/man/man1/ansible-vault.1 b/docs/man/man1/ansible-vault.1 index 286e642748d..fbb8cd8cbea 100644 --- a/docs/man/man1/ansible-vault.1 +++ b/docs/man/man1/ansible-vault.1 @@ -2,12 +2,12 @@ .\" Title: ansible-vault .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/09/2014 +.\" Date: 03/10/2015 .\" Manual: System administration commands -.\" Source: Ansible 1.9 +.\" Source: Ansible 1.9.0 .\" Language: English .\" -.TH "ANSIBLE\-VAULT" "1" "12/09/2014" "Ansible 1\&.9" "System administration commands" +.TH "ANSIBLE\-VAULT" "1" "03/10/2015" "Ansible 1\&.9\&.0" "System administration commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/man/man1/ansible.1 b/docs/man/man1/ansible.1 index eb2e8aaeeb2..90af404b913 100644 --- a/docs/man/man1/ansible.1 +++ b/docs/man/man1/ansible.1 @@ -2,12 +2,12 @@ .\" Title: ansible .\" Author: :doctype:manpage .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/09/2014 +.\" Date: 03/10/2015 .\" Manual: System administration commands -.\" Source: Ansible 1.9 +.\" Source: Ansible 1.9.0 .\" Language: English .\" -.TH "ANSIBLE" "1" "12/09/2014" "Ansible 1\&.9" "System administration commands" +.TH "ANSIBLE" "1" "03/10/2015" "Ansible 1\&.9\&.0" "System administration commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -89,19 +89,14 @@ The to pass to the module\&. .RE .PP -\fB\-k\fR, \fB\-\-ask\-pass\fR +\fB\-k\fR, \fB\-\-ask\-pass\fR .RS 4 Prompt for the SSH password instead of assuming key\-based authentication with ssh\-agent\&. .RE .PP -\fB--ask-su-pass\fR -.RS 4 -Prompt for the su password instead of assuming key\-based authentication with ssh\-agent\&. -.RE -.PP \fB\-K\fR, \fB\-\-ask\-sudo\-pass\fR .RS 4 -Prompt for the password to use with \-\-sudo, if any\&. +Prompt for the password to use with \-\-sudo, if any .RE .PP \fB\-o\fR, \fB\-\-one\-line\fR @@ -111,12 +106,7 @@ Try to output everything on one line\&. .PP \fB\-s\fR, \fB\-\-sudo\fR .RS 4 -Run the command as the user given by \-u and sudo to root. -.RE -.PP -\fB\-S\fR, \fB\-\-su\fR -.RS 4 -Run operations with su\&. +Run the command as the user given by \-u and sudo to root\&. .RE .PP \fB\-t\fR \fIDIRECTORY\fR, \fB\-\-tree=\fR\fIDIRECTORY\fR @@ -221,3 +211,9 @@ Ansible is released under the terms of the GPLv3 License\&. \fBansible\-playbook\fR(1), \fBansible\-pull\fR(1), \fBansible\-doc\fR(1) .sp Extensive documentation is available in the documentation site: http://docs\&.ansible\&.com\&. IRC and mailing list info can be found in file CONTRIBUTING\&.md, available in: https://github\&.com/ansible/ansible +.SH "AUTHOR" +.PP +\fB:doctype:manpage\fR +.RS 4 +Author. +.RE diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py index 27e79a41cad..6c1a45bb185 100644 --- a/lib/ansible/__init__.py +++ b/lib/ansible/__init__.py @@ -14,5 +14,5 @@ # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -__version__ = '1.9' +__version__ = '1.9.0' __author__ = 'Michael DeHaan' diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 8ae7286b63d..bdab60d9954 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -1,5 +1,6 @@ %define name ansible %define ansible_version $VERSION +%define ansible_release $RELEASE %if 0%{?rhel} == 5 %define __python /usr/bin/python26 @@ -7,7 +8,7 @@ Name: %{name} Version: %{ansible_version} -Release: 1%{?dist} +Release: %{ansible_release}%{?dist} Url: http://www.ansible.com Summary: SSH-based application deployment, configuration management, and IT orchestration platform License: GPLv3