Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: rnewson@apache.org
To: commits@couchdb.apache.org
Subject: [40/50] git commit: Got distcheck working. AWE YEAH
Message-Id: <20121118165624.3844031462D@tyr.zones.apache.org>
Date: Sun, 18 Nov 2012 16:56:24 +0000 (UTC)

Got distcheck working. AWE YEAH


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

Branch: refs/heads/docs
Commit: 59a23f1f1e1fd4308eaae1e12f0b7d17a4fe9baa
Parents: bb40ec4
Author: Noah Slater <nslater@apache.org>
Authored: Sat Oct 13 22:31:35 2012 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Nov 18 00:15:30 2012 +0000

----------------------------------------------------------------------
 share/doc/build/Makefile.am |   20 ++++++----
 share/doc/conf.py           |   72 ++++++++++++++++++++++++++++++++++++++
 share/doc/src/conf.py       |   72 --------------------------------------
 3 files changed, 84 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/59a23f1f/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index b24a4c3..f83f787 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -13,14 +13,14 @@
 # -----------------------------------------------------------------------------
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
+SPHINXOPTS    = -n -c $(srcdir)/..
 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
+ALLSPHINXOPTS   = -d doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(srcdir)/../src
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
@@ -132,7 +132,6 @@ src_files = \
 	../src/api-basics.rst \
 	../src/changes.rst \
 	../src/commonjs.rst \
-	../src/conf.py \
 	../src/config_reference.rst \
 	../src/configuring.rst \
 	../src/ddocs.rst \
@@ -154,6 +153,7 @@ dist_localdoc_DATA = $(pdf_files)
 nobase_dist_localdoc_DATA = $(html_files)
 
 EXTRA_DIST = \
+    ../conf.py \
 	../demo.mk \
 	../make.bat \
 	../Makefile.am \
@@ -188,7 +188,7 @@ $(texinfo_files): texinfo.stamp
 texinfo.stamp: $(image_files) $(src_files)
 	@rm -f texinfo.tmp
 	@touch texinfo.tmp
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) texinfo
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(builddir)/texinfo
 	@mv -f texinfo.tmp $@
 
 $(pdf_files): pdf.stamp
@@ -200,7 +200,7 @@ $(pdf_files): pdf.stamp
 pdf.stamp: $(image_files) $(src_files)
 	@rm -f pdf.tmp
 	@touch pdf.tmp
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) latex
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(builddir)/latex
 	$(MAKE) -C latex all-pdf
 	-gzip -9 < latex/CouchDB.pdf > latex/CouchDB.pdf.gz
 	@mv -f pdf.tmp $@
@@ -214,7 +214,7 @@ $(html_files): html.stamp
 html.stamp: $(image_files) $(src_files)
 	@rm -f html.tmp
 	@touch html.tmp
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(builddir)/html
 	@mv -f html.tmp $@
 
 dvi:
@@ -244,9 +244,13 @@ install-html:
 # @@ figure out how to move conf.py up a dir
 # http://sphinx.pocoo.org/glossary.html#term-configuration-directory
 
+DISTCLEANFILES = \
+    texinfo.stamp \
+    pdf.stamp \
+    html.stamp
+
 # @@ check that maintainer-clean works for help2man
-maintainer-clean-local:
-	rmdir ../src/_static
+distclean-local:
 	rm -fr doctrees
 	rm -fr html
 	rm -fr latex

http://git-wip-us.apache.org/repos/asf/couchdb/blob/59a23f1f/share/doc/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/conf.py b/share/doc/conf.py
new file mode 100644
index 0000000..b0bf6f3
--- /dev/null
+++ b/share/doc/conf.py
@@ -0,0 +1,72 @@
+## Licensed under the Apache License, Version 2.0 (the "License"); you may not
+## use this file except in compliance with the License. You may obtain a copy of
+## the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+## License for the specific language governing permissions and limitations under
+## the License.
+
+# http://sphinx.pocoo.org/config.html
+
+import sys, os
+
+extensions = ["sphinx.ext.todo"]
+
+source_suffix = ".rst"
+
+master_doc = "index"
+
+nitpicky = True
+
+project = "@@"
+
+copyright = "@@"
+
+version = "@@"
+
+release = "@@"
+
+highlight_language = "json"
+
+pygments_style = "sphinx"
+
+# @@ design CouchDB theme
+
+# @@ check out http://sphinx.pocoo.org/theming.html
+
+html_theme = "default"
+
+html_short_title = "@@"
+
+html_logo = ""
+
+html_favicon = ""
+
+html_use_opensearch = ""
+
+text_newlines = "native"
+
+latex_documents = [(
+	"index",
+	"CouchDB.tex",
+	"",
+	"",
+	"manual",
+	True
+)]
+
+texinfo_documents = [(
+	"index",
+	"CouchDB",
+	"",
+	"",
+	"dir_entry",
+	"description",
+	"category",
+	"manual",
+	True
+)]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb/blob/59a23f1f/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
deleted file mode 100644
index b0bf6f3..0000000
--- a/share/doc/src/conf.py
+++ /dev/null
@@ -1,72 +0,0 @@
-## Licensed under the Apache License, Version 2.0 (the "License"); you may not
-## use this file except in compliance with the License. You may obtain a copy of
-## the License at
-##
-##   http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-## License for the specific language governing permissions and limitations under
-## the License.
-
-# http://sphinx.pocoo.org/config.html
-
-import sys, os
-
-extensions = ["sphinx.ext.todo"]
-
-source_suffix = ".rst"
-
-master_doc = "index"
-
-nitpicky = True
-
-project = "@@"
-
-copyright = "@@"
-
-version = "@@"
-
-release = "@@"
-
-highlight_language = "json"
-
-pygments_style = "sphinx"
-
-# @@ design CouchDB theme
-
-# @@ check out http://sphinx.pocoo.org/theming.html
-
-html_theme = "default"
-
-html_short_title = "@@"
-
-html_logo = ""
-
-html_favicon = ""
-
-html_use_opensearch = ""
-
-text_newlines = "native"
-
-latex_documents = [(
-	"index",
-	"CouchDB.tex",
-	"",
-	"",
-	"manual",
-	True
-)]
-
-texinfo_documents = [(
-	"index",
-	"CouchDB",
-	"",
-	"",
-	"dir_entry",
-	"description",
-	"category",
-	"manual",
-	True
-)]
\ No newline at end of file