couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: html now installed but does not pass distcheck
Date Mon, 01 Oct 2012 22:28:33 GMT
Updated Branches:
  refs/heads/docs 36a82023f -> d4cdb2b34


html now installed but does not pass distcheck


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

Branch: refs/heads/docs
Commit: d4cdb2b347bf0cd05d9ab18db78ba8d3352e6abe
Parents: 36a8202
Author: Noah Slater <nslater@apache.org>
Authored: Mon Oct 1 23:28:27 2012 +0100
Committer: Noah Slater <nslater@apache.org>
Committed: Mon Oct 1 23:28:27 2012 +0100

----------------------------------------------------------------------
 license.skip                |    2 +
 share/doc/Makefile.am       |    1 -
 share/doc/build/Makefile.am |   43 +++++++++++++++++++++++++++++++++++--
 3 files changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d4cdb2b3/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 366efb7..9356ed0 100644
--- a/license.skip
+++ b/license.skip
@@ -58,6 +58,8 @@
 ^share/Makefile.in
 ^share/doc/Makefile
 ^share/doc/Makefile.in
+^share/doc/build/Makefile
+^share/doc/build/Makefile.in
 ^share/doc/images/*
 ^share/server/json2.js
 ^share/server/mimeparse.js

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d4cdb2b3/share/doc/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/Makefile.am b/share/doc/Makefile.am
index 8782b8b..60f3e82 100644
--- a/share/doc/Makefile.am
+++ b/share/doc/Makefile.am
@@ -26,7 +26,6 @@ EXTRA_DIST = \
 	images/futon-replform.png \
 	make.bat \
 	Makefile.am \
-	src/_static \
 	src/api/authn.rst \
 	src/api/configuration.rst \
 	src/api/database.rst \

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d4cdb2b3/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 20b7b41..96bdb9a 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -10,11 +10,26 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
+# -----------------------------------------------------------------------------
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ../src
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+# -----------------------------------------------------------------------------
+
 EXTRA_DIST = \
     html/.buildinfo
 
-nobase_dist_localdocdir_DATA = \
-    html/_images \
+html_files = \
     html/_images/futon-createdb.png \
     html/_images/futon-editdoc.png \
     html/_images/futon-editeddoc.png \
@@ -57,7 +72,6 @@ nobase_dist_localdocdir_DATA = \
     html/_static/file.png \
     html/_static/jquery.js \
     html/_static/minus.png \
-    html/_static/opensearch.xml \
     html/_static/plus.png \
     html/_static/pygments.css \
     html/_static/searchtools.js \
@@ -95,3 +109,26 @@ nobase_dist_localdocdir_DATA = \
     html/search.html \
     html/searchindex.js \
     html/ssl.html
+
+nobase_dist_localdoc_DATA = \
+	$(html_files)
+
+$(html_files): sphinx-html
+
+# @@ seems to get called twice during the build
+.PHONY: sphinx-html
+sphinx-html: ../src/_static
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html
+
+# @@ figure out how to remove this _static dir
+../src/_static:
+	mkdir -p $@
+
+# @@ figure out how to move conf.py up a dir
+# http://sphinx.pocoo.org/glossary.html#term-configuration-directory
+
+# @@ check that maintainer-clean works for help2man
+maintainer-clean-local:
+	mkdir ../src/_static
+	rm -fr html
+	rm -fr doctrees

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d4cdb2b3/share/doc/src/_static/.gitignore
----------------------------------------------------------------------
diff --git a/share/doc/src/_static/.gitignore b/share/doc/src/_static/.gitignore
deleted file mode 100644
index e69de29..0000000


Mime
View raw message