[Getfem-commits] (no subject)

[Tetsuo Koyama]

branch: devel-tetsuo-VersionUp-sphinx
commit 154e7a6779c19ec28fed8c064038fee1ba8576c1
Author: Tetsuo Koyama <address@hidden>
Date:   Sat Feb 9 17:22:55 2019 +0900

    add requirement.txt for installation
---
 doc/sphinx/Makefile.am      | 29 ++---------------------------
 doc/sphinx/requirements.txt | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index e05cb68..e4be687 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -20,7 +20,6 @@
 
 # You can set these variables from the command line.
 PYTHON        = python
-SPHINXROOT    = http://svn.python.org/projects
 LANGUAGE      = en
 SPHINXOPTS    = -D language=$(LANGUAGE)
 SPHINXBUILD   = sphinx-build
@@ -52,33 +51,9 @@ help:
        @echo "  upload    to make HTML and LATEX docs and upload it to 
Savannah.org"
 
 checkout:
-       @if [ ! -d tools ]; then \
-         echo "Checking out tools..."; \
-         svn checkout $(SPHINXROOT)/python/trunk/Doc/tools tools; \
-       fi
-       @if [ ! -d tools/sphinx ]; then \
-         echo "Checking out Sphinx..."; \
-         svn checkout $(SPHINXROOT)/external/Sphinx-1.2/sphinx tools/sphinx; \
-       fi
-       @if [ ! -d tools/docutils ]; then \
-         echo "Checking out Docutils..."; \
-         svn checkout $(SPHINXROOT)/external/docutils-0.11/docutils 
tools/docutils; \
-       fi
-       @if [ ! -d tools/jinja2 ]; then \
-         echo "Checking out Jinja..."; \
-         svn checkout $(SPHINXROOT)/external/Jinja-2.3.1/jinja2 tools/jinja2; \
-       fi
-       @if [ ! -d tools/pygments ]; then \
-         echo "Checking out Pygments..."; \
-         svn checkout $(SPHINXROOT)/external/Pygments-1.6/pygments 
tools/pygments; \
-       fi
+       pip install -r requirements.txt
 
 update: checkout
-       svn update tools
-       svn update tools/sphinx
-       svn update tools/docutils
-       svn update tools/jinja2
-       svn update tools/pygments
 
 images:
        -cd $(srcdir)/source/userdoc/images/; make png
@@ -93,7 +68,7 @@ build: $(srcdir)/source/matlab/cmdref.rst 
$(srcdir)/source/python/cmdref.rst $(s
        echo # rm -fr build/$(BUILDER)/*.png
        mkdir -p build/$(BUILDER) build/doctrees
        echo # PYTHONPATH=../../interface/src/python 
LD_PRELOAD=../../src/.libs/libgetfem.so $(SPHINXBUILD) $(ALLSPHINXOPTS)
-       PYTHONPATH=sphinx-build $(SPHINXBUILD) $(ALLSPHINXOPTS)
+       $(SPHINXBUILD) $(ALLSPHINXOPTS)
        @echo
 
 view:
diff --git a/doc/sphinx/requirements.txt b/doc/sphinx/requirements.txt
new file mode 100644
index 0000000..ac30280
--- /dev/null
+++ b/doc/sphinx/requirements.txt
@@ -0,0 +1,24 @@
+#  Copyright (C) 2019-2019 Tetsuo Koyama
+#
+#  This file is a part of GetFEM++
+#
+#  GetFEM++  is  free software;  you  can  redistribute  it  and/or modify it
+#  under  the  terms  of the  GNU  Lesser General Public License as published
+#  by  the  Free Software Foundation;  either version 3 of the License,  or
+#  (at your option) any later version along with the GCC Runtime Library
+#  Exception either version 3.1 or (at your option) any later version.
+#  This program  is  distributed  in  the  hope  that it will be useful,  but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#  or  FITNESS  FOR  A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#  License and GCC Runtime Library Exception for more details.
+#  You  should  have received a copy of the GNU Lesser General Public License
+#  along  with  this program;  if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#  pip requirement.txt file for Sphinx documentation
+
+sphinx == 1.8.4
+docutils == 0.11
+jinja2 == 2.3.1
+pygments == 1.6
+