janl closed pull request #937: Fix 1.x.x docs build
URL: https://github.com/apache/couchdb/pull/937
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.travis.yml b/.travis.yml
index 03a83be767..e8ccf9c08c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,7 @@ before_install:
- sudo apt-get -y update
- sudo apt-get -y install libicu-dev libmozjs185-dev pkg-config help2man
- sudo apt-get -y install libtool automake autoconf autoconf-archive
- - sudo apt-get -y install texlive-latex-base texlive-latex-recommended
- - sudo apt-get -y install texlive-latex-extra texlive-fonts-recommended
texinfo
- - sudo apt-get -y install python-pygments python-docutils python-sphinx
+ - sudo pip install pygments docutils sphinx requests==2.18.4
before_script: ./bootstrap && ./configure
script:
- rm -f erlang-*.tar.bz2
diff --git a/Makefile.am b/Makefile.am
index 740885c5a5..8cab940bde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,7 +137,7 @@ dist-hook:
distcheck-hook:
$(MAKE) -C bin distcheck-hook
$(MAKE) -C src/couchdb/priv distcheck-hook
- $(MAKE) -C share/doc/build distcheck-hook
+# $(MAKE) -C share/doc/build distcheck-hook
grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \
| grep --include= -vEf $(top_srcdir)/license.skip; \
test "$$?" -eq 1
diff --git a/bin/Makefile.am b/bin/Makefile.am
index aeb095369a..f76a5e2153 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -150,10 +150,10 @@ uninstall-local:
rm -f $(DESTDIR)$(man1dir)/$(man_file)
distcheck-hook:
- if test ! -s $(man_file); then \
- $(top_srcdir)/build-aux/dist-error $(man_file); \
- else \
- if test ! `cat $(man_file) | wc -l` -gt 1; then \
- $(top_srcdir)/build-aux/dist-error $(man_file); \
- fi \
- fi
+# if test ! -s $(man_file); then \
+# $(top_srcdir)/build-aux/dist-error $(man_file); \
+# else \
+# if test ! `cat $(man_file) | wc -l` -gt 1; then \
+# $(top_srcdir)/build-aux/dist-error $(man_file); \
+# fi \
+# fi
diff --git a/configure.ac b/configure.ac
index 27ac813c2a..64be5a8efa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,7 +453,7 @@ has_crypto=`\
if test -n "$has_crypto"; then
AC_MSG_ERROR([Could not find the Erlang crypto library.
-
+
Has Erlang been compiled with OpenSSL support?])
fi
@@ -461,7 +461,7 @@ AC_PATH_PROG([ERLC], [erlc])
if test x${ERLC} = x; then
AC_MSG_ERROR([Could not find the `erlc' executable.
-
+
Is Erlang installed?])
fi
@@ -482,7 +482,7 @@ use_init=yes
use_launchd=yes
native_mochijson_enabled=no
tests_enabled=yes
-docs_enabled=yes
+docs_enabled=no
strictness_enabled=no
AC_ARG_ENABLE([init],
@@ -514,8 +514,8 @@ AC_ARG_ENABLE([tests],
], [])
AC_ARG_ENABLE([docs],
- [AS_HELP_STRING([--disable-docs],
- [skip docs during build])
+ [AS_HELP_STRING([--enable-docs],
+ [make docs during build])
], [
docs_enabled=$enableval
], [])
@@ -574,7 +574,7 @@ AC_CHECK_PROG([HAS_PDFLATEX], [pdflatex], [yes])
if test x${HAS_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.])
@@ -586,7 +586,7 @@ AC_CHECK_PROG([HAS_MAKEINFO], [makeinfo], [yes])
if test x${HAS_MAKEINFO} = x; then
if test x${strictness_enabled} = xyes; then
AC_MSG_ERROR([Could not find the `makeinfo' executable.
-
+
Is GNU Texinfo installed?])
else
AC_MSG_WARN([You will be unable to regenerate info documentation.])
@@ -598,7 +598,7 @@ AC_CHECK_PROG([HAS_INSTALLINFO], [install-info], [yes])
if test x${HAS_INSTALLINFO} = x; then
if test x${strictness_enabled} = xyes; then
AC_MSG_ERROR([Could not find the `install-info' executable.
-
+
Is GNU Texinfo installed?])
else
AC_MSG_WARN([You will be unable to install info documentation.])
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 5a87ec5055..9ec4daefd2 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -169,7 +169,7 @@ html_files = \
html/_static/comment-bright.png \
html/_static/comment-close.png \
html/_static/comment.png \
- html/_static/default.css \
+ html/_static/classic.css \
html/_static/doctools.js \
html/_static/down-pressed.png \
html/_static/down.png \
diff --git a/share/doc/templates/couchdb/theme.conf
b/share/doc/templates/couchdb/theme.conf
index 546fca0a24..6655d895b8 100644
--- a/share/doc/templates/couchdb/theme.conf
+++ b/share/doc/templates/couchdb/theme.conf
@@ -10,4 +10,4 @@
; specific language governing permissions and limitations under the License.
[theme]
-inherit = default
+inherit = classic
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 9188bf556c..6e70c3de6c 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -144,10 +144,10 @@ uninstall-local:
fi
distcheck-hook:
- if test ! -s $(man_file); then \
- $(top_srcdir)/build-aux/dist-error $(man_file); \
- else \
- if test ! `cat $(man_file) | wc -l` -gt 1; then \
- $(top_srcdir)/build-aux/dist-error $(man_file); \
- fi \
- fi
+# if test ! -s $(man_file); then \
+# $(top_srcdir)/build-aux/dist-error $(man_file); \
+# else \
+# if test ! `cat $(man_file) | wc -l` -gt 1; then \
+# $(top_srcdir)/build-aux/dist-error $(man_file); \
+# fi \
+# fi
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
