[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-api] branch master updated (7117f8e -> ee1bff3)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-api] branch master updated (7117f8e -> ee1bff3) |
|
Date: |
Wed, 31 May 2017 16:26:01 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a change to branch master
in repository api.
from 7117f8e still fixing copy-pasted content
new 6edadef restoring old Makefile, we compile only in one place
new ee1bff3 move content away to proper repos, plus killing obsolete stuff
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 157 +++++++--------------
api/api-bank.rst => api-bank.rst | 0
api/api-common.rst => api-common.rst | 0
api/api-error.rst => api-error.rst | 0
api/api-exchange.rst => api-exchange.rst | 0
api/api-merchant.rst => api-merchant.rst | 0
api/conf.py => conf.py | 0
.../exts => exts}/__pycache__/tsref.cpython-35.pyc | Bin
{api/exts => exts}/tsref.py | 0
exts/tsref.pyc | Bin 0 -> 8461 bytes
docs/global-licensing.rst => global-licensing.rst | 0
api/index.rst => index.rst | 11 +-
api/wireformats.rst => wireformats.rst | 0
13 files changed, 60 insertions(+), 108 deletions(-)
rename api/api-bank.rst => api-bank.rst (100%)
rename api/api-common.rst => api-common.rst (100%)
rename api/api-error.rst => api-error.rst (100%)
rename api/api-exchange.rst => api-exchange.rst (100%)
rename api/api-merchant.rst => api-merchant.rst (100%)
rename api/conf.py => conf.py (100%)
rename {api/exts => exts}/__pycache__/tsref.cpython-35.pyc (100%)
rename {api/exts => exts}/tsref.py (100%)
create mode 100644 exts/tsref.pyc
copy docs/global-licensing.rst => global-licensing.rst (100%)
rename api/index.rst => index.rst (95%)
rename api/wireformats.rst => wireformats.rst (100%)
diff --git a/Makefile b/Makefile
index 9155d68..f09f2a0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,7 @@
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
-APIBUILDDIR = api/_build
-DOCSBUILDDIR = docs/_build
+BUILDDIR = _build
# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
@@ -16,7 +15,7 @@ endif
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS = -d $(PWD)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS)
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
@@ -48,189 +47,133 @@ help:
@echo " doctest to run all doctests embedded in the documentation
(if enabled)"
clean:
- rm -rf $(DOCSBUILDDIR)/*
- rm -rf $(APIBUILDDIR)/*
+ rm -rf $(BUILDDIR)/*
# The html-linked builder does not support caching, so we
# remove all cached state first.
html:
- $(SPHINXBUILD) docs/ -b html-linked $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b html-linked $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b html-linked $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
- @echo "Build finished. The HTML pages are in $(APIBUILDDIR)/html."
- @echo "Build finished. The HTML pages are in $(DOCSBUILDDIR)/html."
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
dirhtml:
- $(SPHINXBUILD) docs/ -b dirhtml $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b dirhtml $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
- @echo "Build finished. The HTML pages are in $(APIBUILDDIR)/dirhtml."
- @echo "Build finished. The HTML pages are in $(DOCSBUILDDIR)/dirhtml."
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
singlehtml:
- $(SPHINXBUILD) docs/ -b singlehtml $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b singlehtml $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
- @echo "Build finished. The HTML page is in $(DOCSBUILDDIR)/singlehtml."
- @echo "Build finished. The HTML page is in $(APIBUILDDIR)/singlehtml."
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
pickle:
- $(SPHINXBUILD) api/ -b pickle $(ALLSPHINXOPTS) $(APIBUILDDIR)
- $(SPHINXBUILD) docs/ -b pickle $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."
json:
- $(SPHINXBUILD) docs/ -b json $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b json $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."
htmlhelp:
- $(SPHINXBUILD) docs/ -b htmlhelp $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b htmlhelp $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
- ".hhp project file in $(DOCSBUILDDIR)/htmlhelp."
- @echo "Build finished; now you can run HTML Help Workshop with the" \
- ".hhp project file in $(APIBUILDDIR)/htmlhelp."
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
qthelp:
- $(SPHINXBUILD) docs/ -b qthelp $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b qthelp $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the"
\
- ".qhcp project file in $(DOCSBUILDDIR)/qthelp, like this:"
- @echo "Build finished; now you can run "qcollectiongenerator" with the"
\
- ".qhcp project file in $(APIBUILDDIR)/qthelp, like this:"
- @echo "# qcollectiongenerator $(APIBUILDDIR)/qthelp/neuro.qhcp"
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/neuro.qhcp"
@echo "To view the help file:"
- @echo "# assistant -collectionFile $(APIBUILDDIR)/qthelp/neuro.qhc"
- @echo "# qcollectiongenerator $(DOCSBUILDDIR)/qthelp/neuro.qhcp"
- @echo "To view the help file:"
- @echo "# assistant -collectionFile $(DOCSBUILDDIR)/qthelp/neuro.qhc"
-
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/neuro.qhc"
devhelp:
- $(SPHINXBUILD) api/ -b devhelp $(ALLSPHINXOPTS) $(APIBUILDDIR)
- $(SPHINXBUILD) docs/ -b devhelp $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/neuro"
- @echo "# ln -s $(APIBUILDDIR)/devhelp $$HOME/.local/share/devhelp/neuro"
- @echo "# ln -s $(DOCSBUILDDIR)/devhelp
$$HOME/.local/share/devhelp/neuro"
+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/neuro"
@echo "# devhelp"
epub:
- $(SPHINXBUILD) api/ -b epub $(ALLSPHINXOPTS) $(APIBUILDDIR)
- $(SPHINXBUILD) docs/ -b epub $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo
- @echo "Build finished. The epub file is in $(APIBUILDDIR)/epub."
- @echo "Build finished. The epub file is in $(DOCSBUILDDIR)/epub."
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
latex:
- $(SPHINXBUILD) api/ -b latex $(ALLSPHINXOPTS) $(APIBUILDDIR)
- $(SPHINXBUILD) docs/ -b latex $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
- @echo "Build finished; the LaTeX files are in $(APIBUILDDIR)/latex."
- @echo "Build finished; the LaTeX files are in $(DOCSBUILDDIR)/latex."
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."
latexpdf:
- $(SPHINXBUILD) api/ -b latex $(ALLSPHINXOPTS) $(APIBUILDDIR)
- $(SPHINXBUILD) docs/ -b latex $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
- $(MAKE) -C $(DOCSBUILDDIR)/latex all-pdf
- $(MAKE) -C $(APIBUILDDIR)/latex all-pdf
- @echo "pdflatex finished; the PDF files are in $(APIBUILDDIR)/latex."
- @echo "pdflatex finished; the PDF files are in $(DOCSBUILDDIR)/latex."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
latexpdfja:
- $(SPHINXBUILD) docs/ -b latex $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b latex $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through platex and dvipdfmx..."
- $(MAKE) -C $(APIBUILDDIR)/latex all-pdf-ja
- $(MAKE) -C $(DOCSBUILDDIR)/latex all-pdf-ja
- @echo "pdflatex finished; the PDF files are in $(DOCSBUILDDIR)/latex."
- @echo "pdflatex finished; the PDF files are in $(APIBUILDDIR)/latex."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
text:
- $(SPHINXBUILD) docs/ -b text $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b text $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@echo
- @echo "Build finished. The text files are in $(DOCSBUILDDIR)/text."
- @echo "Build finished. The text files are in $(APIBUILDDIR)/text."
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
man:
- $(SPHINXBUILD) docs/ -b man $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b man $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@echo
- @echo "Build finished. The manual pages are in $(DOCSBUILDDIR)/man."
- @echo "Build finished. The manual pages are in $(APIBUILDDIR)/man."
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
texinfo:
- $(SPHINXBUILD) docs/ -b texinfo $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b texinfo $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo
- @echo "Build finished. The Texinfo files are in
$(DOCSBUILDDIR)/texinfo."
- @echo "Build finished. The Texinfo files are in $(APIBUILDDIR)/texinfo."
+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
@echo "Run \`make' in that directory to run these through makeinfo" \
"(use \`make info' here to do that automatically)."
info:
- $(SPHINXBUILD) docs/ -b texinfo $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b texinfo $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
- make -C $(DOCSBUILDDIR)/texinfo info
- make -C $(APIBUILDDIR)/texinfo info
- @echo "makeinfo finished; the Info files are in
$(DOCSBUILDDIR)/texinfo."
- @echo "makeinfo finished; the Info files are in $(APIBUILDDIR)/texinfo."
+ make -C $(BUILDDIR)/texinfo info
+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
gettext:
- $(SPHINXBUILD) docs/ -b gettext $(I18NSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b gettext $(I18NSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
@echo
- @echo "Build finished. The message catalogs are in
$(DOCSBUILDDIR)/locale."
- @echo "Build finished. The message catalogs are in
$(APIBUILDDIR)/locale."
+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
changes:
- $(SPHINXBUILD) docs/ -b changes $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b changes $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
- @echo "The overview file is in $(DOCSBUILDDIR)/changes."
- @echo "The overview file is in $(APIBUILDDIR)/changes."
+ @echo "The overview file is in $(BUILDDIR)/changes."
linkcheck:
- $(SPHINXBUILD) docs/ -b linkcheck $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b linkcheck $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
- "or in $(APIBUILDDIR)/linkcheck/output.txt."
- @echo "Link check complete; look for any errors in the above output " \
- "or in $(DOCSBUILDDIR)/linkcheck/output.txt."
-
+ "or in $(BUILDDIR)/linkcheck/output.txt."
doctest:
- $(SPHINXBUILD) docs/ -b doctest $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b doctest $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
- "results in $(APIBUILDDIR)/doctest/output.txt."
- @echo "Testing of doctests in the sources finished, look at the " \
- "results in $(DOCSBUILDDIR)/doctest/output.txt."
-
+ "results in $(BUILDDIR)/doctest/output.txt."
xml:
- $(SPHINXBUILD) docs/ -b xml $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
- $(SPHINXBUILD) api/ -b xml $(ALLSPHINXOPTS) $(APIBUILDDIR)
+ $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
@echo
- @echo "Build finished. The XML files are in $(DOCSBUILDDIR)/xml."
- @echo "Build finished. The XML files are in $(APIBUILDDIR)/xml."
+ @echo "Build finished. The XML files are in $(BUILDDIR)/xml."
pseudoxml:
- $(SPHINXBUILD) api/ -b pseudoxml $(ALLSPHINXOPTS) $(APIBUILDDIR)
- $(SPHINXBUILD) docs/ -b pseudoxml $(ALLSPHINXOPTS) $(DOCSBUILDDIR)
+ $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
@echo
- @echo "Build finished. The pseudo-XML files are in
$(DOCSBUILDDIR)/pseudoxml."
- @echo "Build finished. The pseudo-XML files are in
$(APIBUILDDIR)/pseudoxml."
+ @echo "Build finished. The pseudo-XML files are in
$(BUILDDIR)/pseudoxml."
diff --git a/api/api-bank.rst b/api-bank.rst
similarity index 100%
rename from api/api-bank.rst
rename to api-bank.rst
diff --git a/api/api-common.rst b/api-common.rst
similarity index 100%
rename from api/api-common.rst
rename to api-common.rst
diff --git a/api/api-error.rst b/api-error.rst
similarity index 100%
rename from api/api-error.rst
rename to api-error.rst
diff --git a/api/api-exchange.rst b/api-exchange.rst
similarity index 100%
rename from api/api-exchange.rst
rename to api-exchange.rst
diff --git a/api/api-merchant.rst b/api-merchant.rst
similarity index 100%
rename from api/api-merchant.rst
rename to api-merchant.rst
diff --git a/api/conf.py b/conf.py
similarity index 100%
rename from api/conf.py
rename to conf.py
diff --git a/api/exts/__pycache__/tsref.cpython-35.pyc
b/exts/__pycache__/tsref.cpython-35.pyc
similarity index 100%
rename from api/exts/__pycache__/tsref.cpython-35.pyc
rename to exts/__pycache__/tsref.cpython-35.pyc
diff --git a/api/exts/tsref.py b/exts/tsref.py
similarity index 100%
rename from api/exts/tsref.py
rename to exts/tsref.py
diff --git a/exts/tsref.pyc b/exts/tsref.pyc
new file mode 100644
index 0000000..152acaf
Binary files /dev/null and b/exts/tsref.pyc differ
diff --git a/docs/global-licensing.rst b/global-licensing.rst
similarity index 100%
copy from docs/global-licensing.rst
copy to global-licensing.rst
diff --git a/api/index.rst b/index.rst
similarity index 95%
rename from api/index.rst
rename to index.rst
index 9e49818..ff65b79 100644
--- a/api/index.rst
+++ b/index.rst
@@ -16,6 +16,7 @@
@author Florian Dold
@author Benedikt Muller
@author Sree Harsha Totakura
+ @author Marcello Stanisci
GNU Taler Documentation
=======================
@@ -56,5 +57,13 @@ interfaces between the core components of Taler.
api-exchange
api-merchant
api-bank
-
wireformats
+
+---------
+Licensing
+---------
+
+.. toctree::
+ :maxdepth: 2
+
+ global-licensing
diff --git a/api/wireformats.rst b/wireformats.rst
similarity index 100%
rename from api/wireformats.rst
rename to wireformats.rst
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-api] branch master updated (7117f8e -> ee1bff3),
gnunet <=