Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9C4EC17AA2 for ; Thu, 19 Mar 2015 23:17:03 +0000 (UTC) Received: (qmail 41922 invoked by uid 500); 19 Mar 2015 23:16:58 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 41772 invoked by uid 500); 19 Mar 2015 23:16:58 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 41751 invoked by uid 99); 19 Mar 2015 23:16:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Mar 2015 23:16:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4E3F8E1930; Thu, 19 Mar 2015 23:16:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Thu, 19 Mar 2015 23:16:59 -0000 Message-Id: In-Reply-To: <6f8e9141329241b39899ef6cfb9cbb37@git.apache.org> References: <6f8e9141329241b39899ef6cfb9cbb37@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] documentation commit: updated refs/heads/master to 3096413 Don't guess version from git This doesn't works when you need to provide documentation for non-released versions. It'll try to use last-know-tag for that and cause people confusion. Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/ab4fc456 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/ab4fc456 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/ab4fc456 Branch: refs/heads/master Commit: ab4fc456631fe6d63555c8b491df31b1284a842c Parents: 206d631 Author: Alexander Shorin Authored: Wed Mar 11 16:48:23 2015 +0300 Committer: Alexander Shorin Committed: Wed Mar 11 16:48:23 2015 +0300 ---------------------------------------------------------------------- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/ab4fc456/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 85b9b10..e0c00e8 100644 --- a/Makefile +++ b/Makefile @@ -12,13 +12,10 @@ SPHINXBUILD := sphinx-build BUILDDIR := build -COUCHVERSION := $(shell git describe --tags --abbrev=0 2>/dev/null || echo unknown) -COUCHDOCSHA := $(shell git rev-parse --verify --short HEAD 2>/dev/null || echo src) -COUCHRELEASE := $(COUCHVERSION)-git-$(COUCHDOCSHA) SOURCE := src/ PAPERSIZE := -D latex_paper_size=a4 SPHINXFLAGS := -a -E -W -n -A local=1 $(PAPERSIZE) -d $(BUILDDIR)/doctree -SPHINXOPTS := $(SPHINXFLAGS) -D version=$(COUCHVERSION) -D release=$(COUCHRELEASE) $(SOURCE) +SPHINXOPTS := $(SPHINXFLAGS) $(SOURCE) all: distclean html pdf info man install clean