couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [47/50] git commit: More tweaks
Date Sun, 18 Nov 2012 16:56:24 GMT
More tweaks


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

Branch: refs/heads/docs
Commit: ef644570b1f1f307d8177f315b24cded12e4d039
Parents: 2316ec3
Author: Noah Slater <nslater@apache.org>
Authored: Sat Oct 6 13:57:05 2012 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Nov 18 00:15:29 2012 +0000

----------------------------------------------------------------------
 .gitignore                  |    2 +-
 share/doc/build/Makefile.am |   89 +++++++++++++++++---------------------
 share/doc/src/conf.py       |   14 ++++++-
 3 files changed, 54 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ef644570/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 45f92d0..a899d58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,7 @@ libtool
 share/doc/build/doctrees
 share/doc/build/html
 share/doc/build/latex
-share/doc/build/text
+share/doc/build/texinfo
 share/server/main-coffee.js
 share/server/main.js
 src/couch_mrview/ebin/

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ef644570/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index c205bb1..cea525e 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -29,7 +29,11 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 EXTRA_DIST = \
     html/.buildinfo
 
-html_files = \
+info_DATA = texinfo/CouchDB.info
+
+dist_localdoc_DATA = latex/CouchDB.pdf.gz
+
+nobase_dist_localdoc_DATA = \
     html/_images/futon-createdb.png \
     html/_images/futon-editdoc.png \
     html/_images/futon-editeddoc.png \
@@ -110,44 +114,11 @@ html_files = \
     html/searchindex.js \
     html/ssl.html
 
-pdf_files = latex/CouchDB.pdf.gz
-
-text_files = \
-    api/authn.txt \
-    api/configuration.txt \
-    api/database.txt \
-    api/dbmaint.txt \
-    api/design.txt \
-    api/documents.txt \
-    api/local.txt \
-    api/misc.txt \
-    api/reference.txt \
-    api-basics.txt \
-    changes.txt \
-    commonjs.txt \
-    config_reference.txt \
-    configuring.txt \
-    ddocs.txt \
-    errors.txt \
-    http-proxying.txt \
-    index.txt \
-    intro.txt \
-    json-structure.txt \
-    os-daemons.txt \
-    range.txt \
-    release.txt \
-    replication.txt \
-    ssl.txt \
-
-nobase_dist_localdoc_DATA = \
-	$(html_files) \
-	$(text_files) \
+$(info_files): info
 
-dist_localdoc_DATA = $(pdf_files)
+$(pdf_files): pdf
 
-$(html_files): sphinx-html
-
-$(pdf_files): sphinx-pdf
+$(html_files): html
 
 # @@ convert both targets to use stamp files
 # http://www.gnu.org/software/automake/manual/html_node/Multiple-Outputs.html
@@ -157,24 +128,39 @@ $(pdf_files): sphinx-pdf
 # @@ figure out if we should distribute the PDF in the dist dir
 
 # @@ seems to get called twice during the build
-.PHONY: sphinx-html
-sphinx-html: ../src/_static
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html
+# @@ use stamp files, this gets called twice during install too
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) texinfo
+	make -C $texinfo info
 
-.PHONY: sphinx-pdf
-sphinx-pdf:
+dvi:
+	@echo "This target is not supported."
+ps:
+	@echo "This target is not supported."
+
+pdf:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) latex
 	$(MAKE) -C latex all-pdf
 	-gzip -9 < latex/CouchDB.pdf > latex/CouchDB.pdf.gz
 
-.PHONY: sphinx-text
-sphinx-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) text
+html: ../src/_static
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html
 
-.PHONY: sphinx-info
-sphinx-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) texinfo
-	make -C texinfo info
+install-info:
+	@echo "This target is not supported. Please use `install'."
+
+install-dvi:
+	@echo "This target is not supported."
+
+install-ps:
+	@echo "This target is not supported."
+
+install-pdf:
+	@echo "This target is not supported. Please use `install'."
+
+install-html:
+	@echo "This target is not supported. Please use `install'."
 
 # @@ figure out how to remove this _static dir
 ../src/_static:
@@ -198,3 +184,8 @@ maintainer-clean-local:
 
 # @@ tweak conf.py
 # http://sphinx.pocoo.org/config.html
+
+# "make dvi" fails
+# "make ps" fails
+
+# @@ fix package name which turns out as "apache-couchdb"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ef644570/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 7199dde..b0bf6f3 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -48,6 +48,8 @@ html_favicon = ""
 
 html_use_opensearch = ""
 
+text_newlines = "native"
+
 latex_documents = [(
 	"index",
 	"CouchDB.tex",
@@ -57,4 +59,14 @@ latex_documents = [(
 	True
 )]
 
-text_newlines = "native"
+texinfo_documents = [(
+	"index",
+	"CouchDB",
+	"",
+	"",
+	"dir_entry",
+	"description",
+	"category",
+	"manual",
+	True
+)]
\ No newline at end of file


Mime
View raw message