couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: Starting to implement release manager checks
Date Sun, 14 Oct 2012 12:02:21 GMT
Updated Branches:
  refs/heads/docs c6503c540 -> 04cbf18a2


Starting to implement release manager checks


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/04cbf18a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/04cbf18a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/04cbf18a

Branch: refs/heads/docs
Commit: 04cbf18a2a1a9842fc97faaa036b855fe0576006
Parents: c6503c5
Author: Noah Slater <nslater@apache.org>
Authored: Sun Oct 14 13:02:17 2012 +0100
Committer: Noah Slater <nslater@apache.org>
Committed: Sun Oct 14 13:02:17 2012 +0100

----------------------------------------------------------------------
 bin/Makefile.am              |    4 +---
 bootstrap                    |    5 +++++
 configure.ac                 |   35 +++++++++++++++++++++++++++++------
 share/doc/build/Makefile.am  |   24 +++++++++++++++++-------
 src/couchdb/priv/Makefile.am |    6 ++----
 5 files changed, 54 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/04cbf18a/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 3d342fc..c5a4b54 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -18,9 +18,7 @@ endif
 
 noinst_SCRIPTS = couchjs_dev couch-config_dev
 
-if HELP2MAN
 dist_man1_MANS = couchdb.1
-endif
 
 CLEANFILES = $(bin_SCRIPTS) $(dist_man1_MANS) $(noinst_SCRIPTS)
 
@@ -118,7 +116,7 @@ HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
 
 couchdb.1: couchdb.tpl.in
 	touch $@
-	if test -x "$(HELP2MAN_EXECUTABLE)"; then \
+	if test -x "$(HELP2MAN)"; then \
 	    $(MAKE) -f Makefile couchdb; \
 	    $(HELP2MAN) $(HELP2MAN_OPTION) \
 	        --name="Apache CouchDB database server" ./couchdb --output $@; \

http://git-wip-us.apache.org/repos/asf/couchdb/blob/04cbf18a/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index e9f824e..9347674 100755
--- a/bootstrap
+++ b/bootstrap
@@ -112,6 +112,11 @@ fi
 mkdir -p build-aux
 mkdir -p m4
 
+# If automake gets invoked from a partially updated source tree, this file
+# is not created, and the build will fail, and need another bootstrap.
+
+# @@ figure out how to avoid this
+
 texi_file="share/doc/build/texinfo/CouchDB.texi"
 
 mkdir -p `dirname $texi_file`

http://git-wip-us.apache.org/repos/asf/couchdb/blob/04cbf18a/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index d262c29..8d9c749 100644
--- a/configure.ac
+++ b/configure.ac
@@ -555,6 +555,35 @@ if test x${SPHINX_BUILD} = x; then
     fi
 fi
 
+if test x${strictness_enabled} = xyes; then
+    AX_PYTHON_MODULE([pygments], [fatal])
+else
+    AX_PYTHON_MODULE([pygments])
+fi
+
+AC_PATH_PROG([PDFLATEX], [pdflatex])
+
+if test x${PDFLATEX} = x; then
+    if test x${strictness_enabled} = xyes; then
+        AC_MSG_ERROR([Could not find the `pdflatex' executable.
+    
+Is LaTeX installed?])
+    else
+        AC_MSG_WARN([You will be unable to regenerate PDF documentation.])
+    fi
+fi
+
+AC_PATH_PROG([MAKEINFO], [makeinfo])
+
+if test x${MAKEINFO} = x; then
+    if test x${strictness_enabled} = xyes; then
+        AC_MSG_ERROR([Could not find the `pdflatex' executable.
+    
+Is GNU Texinfo installed?])
+    else
+        AC_MSG_WARN([You will be unable to regenerate info documentation.])
+    fi
+fi
 
 AC_ARG_VAR([ERL], [path to the `erl' executable])
 AC_ARG_VAR([ERLC], [path to the `erlc' executable])
@@ -567,12 +596,6 @@ AM_CONDITIONAL([USE_CURL], [test x${use_curl} = xyes])
 AM_CONDITIONAL([TESTS], [test x${tests_enabled} = xyes])
 AM_CONDITIONAL([STRICTNESS], [test x${strictness_enabled} = xyes])
 
-AM_CONDITIONAL([HELP2MAN], [test ! x${HELP2MAN} = x])
-AM_CONDITIONAL([SPHINX_BUILD], [test ! x${SPHINX_BUILD} = x])
-
-AC_SUBST([HELP2MAN])
-AC_SUBST([SPHINX_BUILD])
-
 AC_SUBST([package_author_name], ["LOCAL_PACKAGE_AUTHOR_NAME"])
 AC_SUBST([package_author_address], ["LOCAL_PACKAGE_AUTHOR_ADDRESS"])
 AC_SUBST([package_identifier], ["LOCAL_PACKAGE_IDENTIFIER"])

http://git-wip-us.apache.org/repos/asf/couchdb/blob/04cbf18a/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 9ba2f4c..ae68fd7 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -178,9 +178,9 @@ EXTRA_DIST = \
 	$(src_files) \
 	html/.buildinfo
 
-$(dist_localdoc_DATA): pdf
+$(pdf_files): pdf
 
-$(nobase_dist_localdoc_DATA): html
+$(html_files): html
 
 $(texinfo_files): texinfo.stamp
 	@if test -f $@; then :; else \
@@ -191,7 +191,11 @@ $(texinfo_files): texinfo.stamp
 texinfo.stamp: $(image_files) $(src_files)
 	@rm -f texinfo.tmp
 	@touch texinfo.tmp
-	$(SPHINX_BUILD) -b texinfo $(SPHINXOPTS) $(builddir)/texinfo
+	if test -x "$(SPHINX_BUILD)" -a -x "$(MAKEINFO)"; then \
+	    $(SPHINX_BUILD) -b texinfo $(SPHINXOPTS) $(builddir)/texinfo; \
+	else \
+	    touch $(texinfo_files); \
+	fi
 	@mv -f texinfo.tmp $@
 
 $(pdf_files): pdf.stamp
@@ -203,9 +207,13 @@ $(pdf_files): pdf.stamp
 pdf.stamp: $(image_files) $(src_files)
 	@rm -f pdf.tmp
 	@touch pdf.tmp
-	$(SPHINX_BUILD) -b latex $(SPHINXOPTS) $(builddir)/latex
-	$(MAKE) -C latex all-pdf
-	-gzip -9 < latex/CouchDB.pdf > latex/CouchDB.pdf.gz
+	if test -x "$(SPHINX_BUILD)" -a -x "$(PDFLATEX)"; then \
+	    $(SPHINX_BUILD) -b latex $(SPHINXOPTS) $(builddir)/latex; \
+	    $(MAKE) -C latex all-pdf; \
+	    gzip -9 < latex/CouchDB.pdf > latex/CouchDB.pdf.gz; \
+	else \
+	    touch $(texinfo_files); \
+	fi
 	@mv -f pdf.tmp $@
 
 $(html_files): html.stamp
@@ -217,7 +225,9 @@ $(html_files): html.stamp
 html.stamp: $(image_files) $(src_files)
 	@rm -f html.tmp
 	@touch html.tmp
-	$(SPHINX_BUILD) -b html $(SPHINXOPTS) $(builddir)/html
+	if test -x "$(SPHINX_BUILD)"; then \
+	    $(SPHINX_BUILD) -b html $(SPHINXOPTS) $(builddir)/html; \
+	fi
 	@mv -f html.tmp $@
 
 dvi:

http://git-wip-us.apache.org/repos/asf/couchdb/blob/04cbf18a/src/couchdb/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 704e870..27d48f3 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -14,9 +14,7 @@ couchlibdir = $(localerlanglibdir)/couch-$(version)
 couchprivdir = $(couchlibdir)/priv
 couchprivlibdir = $(couchlibdir)/priv/lib
 
-if HELP2MAN
 dist_man1_MANS = couchjs.1
-endif
 
 EXTRA_DIST = \
 	spawnkillable/couchspawnkillable.sh \
@@ -70,8 +68,8 @@ HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
 
 couchjs.1: couchjs
 	touch $@
-	if test -x "$(HELP2MAN_EXECUTABLE)"; then \
-	    $(HELP2MAN_EXECUTABLE) $(HELP2MAN_OPTION) \
+	if test -x "$(HELP2MAN)"; then \
+	    $(HELP2MAN) $(HELP2MAN_OPTION) \
 	        --name="$(package_name) JavaScript interpreter" ./couchjs --output $@; \
 	fi
 


Mime
View raw message