sphinx: jit: port libgccjit to shared Sphinx

gcc/jit/ChangeLog: * Make-lang.in: * docs/cp/index.rst: Moved to... * doc/cp/index.rst: ...here. * docs/cp/intro/index.rst: Moved to... * doc/cp/intro/index.rst: ...here. * docs/cp/intro/tutorial01.rst: Moved to... * doc/cp/intro/tutorial01.rst: ...here. * docs/cp/intro/tutorial02.rst: Moved to... * doc/cp/intro/tutorial02.rst: ...here. * docs/cp/intro/tutorial03.rst: Moved to... * doc/cp/intro/tutorial03.rst: ...here. * docs/cp/intro/tutorial04.rst: Moved to... * doc/cp/intro/tutorial04.rst: ...here. * docs/cp/topics/asm.rst: Moved to... * doc/cp/topics/asm.rst: ...here. * docs/cp/topics/compilation.rst: Moved to... * doc/cp/topics/compilation.rst: ...here. * docs/cp/topics/contexts.rst: Moved to... * doc/cp/topics/contexts.rst: ...here. * docs/cp/topics/expressions.rst: Moved to... * doc/cp/topics/expressions.rst: ...here. * docs/cp/topics/functions.rst: Moved to... * doc/cp/topics/functions.rst: ...here. * docs/cp/topics/index.rst: Moved to... * doc/cp/topics/index.rst: ...here. * docs/cp/topics/locations.rst: Moved to... * doc/cp/topics/locations.rst: ...here. * docs/cp/topics/objects.rst: Moved to... * doc/cp/topics/objects.rst: ...here. * docs/cp/topics/types.rst: Moved to... * doc/cp/topics/types.rst: ...here. * docs/examples/emit-alphabet.bf: Moved to... * doc/examples/emit-alphabet.bf: ...here. * docs/examples/tut01-hello-world.c: Moved to... * doc/examples/tut01-hello-world.c: ...here. * docs/examples/tut01-hello-world.cc: Moved to... * doc/examples/tut01-hello-world.cc: ...here. * docs/examples/tut02-square.c: Moved to... * doc/examples/tut02-square.c: ...here. * docs/examples/tut02-square.cc: Moved to... * doc/examples/tut02-square.cc: ...here. * docs/examples/tut03-sum-of-squares.c: Moved to... * doc/examples/tut03-sum-of-squares.c: ...here. * docs/examples/tut03-sum-of-squares.cc: Moved to... * doc/examples/tut03-sum-of-squares.cc: ...here. * docs/examples/tut04-toyvm/Makefile: Moved to... * doc/examples/tut04-toyvm/Makefile: ...here. * docs/examples/tut04-toyvm/factorial.toy: Moved to... * doc/examples/tut04-toyvm/factorial.toy: ...here. * docs/examples/tut04-toyvm/fibonacci.toy: Moved to... * doc/examples/tut04-toyvm/fibonacci.toy: ...here. * docs/examples/tut04-toyvm/toyvm.c: Moved to... * doc/examples/tut04-toyvm/toyvm.c: ...here. * docs/examples/tut04-toyvm/toyvm.cc: Moved to... * doc/examples/tut04-toyvm/toyvm.cc: ...here. * docs/examples/tut05-bf.c: Moved to... * doc/examples/tut05-bf.c: ...here. * docs/index.rst: Moved to... * doc/index.rst: ...here. * docs/internals/index.rst: Moved to... * doc/internals/index.rst: ...here. * docs/internals/test-hello-world.exe.log.txt: Moved to... * doc/internals/test-hello-world.exe.log.txt: ...here. * docs/_build/texinfo/libgccjit-figures/factorial.png: Moved to... * doc/intro/factorial.png: ...here. * docs/intro/index.rst: Moved to... * doc/intro/index.rst: ...here. * docs/_build/texinfo/libgccjit-figures/sum-of-squares.png: Moved to... * doc/intro/sum-of-squares.png: ...here. * docs/intro/tutorial01.rst: Moved to... * doc/intro/tutorial01.rst: ...here. * docs/intro/tutorial02.rst: Moved to... * doc/intro/tutorial02.rst: ...here. * docs/intro/tutorial03.rst: Moved to... * doc/intro/tutorial03.rst: ...here. * docs/intro/tutorial04.rst: Moved to... * doc/intro/tutorial04.rst: ...here. * docs/intro/tutorial05.rst: Moved to... * doc/intro/tutorial05.rst: ...here. * docs/topics/asm.rst: Moved to... * doc/topics/asm.rst: ...here. * docs/topics/compatibility.rst: Moved to... * doc/topics/compatibility.rst: ...here. * docs/topics/compilation.rst: Moved to... * doc/topics/compilation.rst: ...here. * docs/topics/contexts.rst: Moved to... * doc/topics/contexts.rst: ...here. * docs/topics/expressions.rst: Moved to... * doc/topics/expressions.rst: ...here. * docs/topics/function-pointers.rst: Moved to... * doc/topics/function-pointers.rst: ...here. * docs/topics/functions.rst: Moved to... * doc/topics/functions.rst: ...here. * docs/topics/index.rst: Moved to... * doc/topics/index.rst: ...here. * docs/topics/locations.rst: Moved to... * doc/topics/locations.rst: ...here. * docs/topics/objects.rst: Moved to... * doc/topics/objects.rst: ...here. * docs/topics/performance.rst: Moved to... * doc/topics/performance.rst: ...here. * docs/topics/types.rst: Moved to... * doc/topics/types.rst: ...here. * docs/Makefile: Removed. * docs/_build/texinfo/Makefile: Removed. * docs/_build/texinfo/libgccjit-figures/factorial1.png: Removed. * docs/_build/texinfo/libgccjit-figures/sum-of-squares1.png: Removed. * docs/_build/texinfo/libgccjit.texi: Removed. * docs/conf.py: Removed. * docs/intro/factorial.png: Removed. * docs/intro/sum-of-squares.png: Removed. * doc/conf.py: New file.

sphinx: jit: port libgccjit to shared Sphinx
94246daa · Martin Liska · 54ca4eef · 94246daa · 94246daa · 94246daa
Commit 94246daa authored 2 years ago by Martin Liska
--- a/gcc/jit/Make-lang.in
+++ b/gcc/jit/Make-lang.in
@@ -233,39 +233,31 @@ jit.rest.encap:

 # These targets redirect HTML creation and installation to either
 # jit.sphinx.(install-)html or jit.texinfo.(install-)html.
-jit.html: jit.$(doc_build_sys).html
+jit.html: doc/libgccjit/html/html/index.html
 jit.install-html: jit.$(doc_build_sys).install-html

 # For now, use texinfo for pdf, since the sphinx latex toolchain currently
 # fails for me deep inside pdflatex (see notes below)
-jit.pdf: jit.texinfo.pdf
+jit.pdf: doc/libgccjit/pdf/latex/libgccjit.pdf
 jit.install-pdf: jit.texinfo.install-pdf

-# Hooks for building docs using texinfo
-JIT_TEXI_FILES = $(srcdir)/jit/docs/_build/texinfo/libgccjit.texi
+jit.info: doc/libgccjit/info/texinfo/libgccjit.info

-jit.info: doc/libgccjit.info
-doc/libgccjit.info: $(JIT_TEXI_FILES)
-	if test "x$(BUILD_INFO)" = xinfo; then \
-	  rm -f doc/libgccjit.info*; \
-	  $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
-		-I $(gcc_docdir)/include -o $@ $<; \
+doc/libgccjit/info/texinfo/libgccjit.info: $(SPHINX_FILES)
+	+ if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \
+	  make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/info; \
 	else true; fi

 jit.install-info: $(DESTDIR)$(infodir)/libgccjit.info

-jit.dvi: doc/libgccjit.dvi
-doc/libgccjit.dvi: $(JIT_TEXI_FILES)
-	$(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+$(DESTDIR)$(infodir)/libgccjit.info: doc/libgccjit/info/texinfo/libgccjit.info installdirs
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@

-jit.texinfo.html: $(build_htmldir)/jit/index.html
+doc/libgccjit/html/html/index.html: $(SPHINX_FILES)
+	+ make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/html

-$(build_htmldir)/jit/index.html: $(srcdir)/jit/docs/_build/texinfo/libgccjit.texi
-	$(mkinstalldirs) $(@D)
-	rm -f $(@D)/*
-	$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/jit -o $(@D) $<
-
-jit.texinfo.install-html: jit.texinfo.html
+jit.texinfo.install-html: doc/libgccjit/html/html/index.html
 	@$(NORMAL_INSTALL)
 	test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)"
 	@for p in $(build_htmldir)/jit; do \
@@ -282,10 +274,9 @@ jit.texinfo.install-html: jit.texinfo.html
 	  fi; \
 	done

-jit.texinfo.pdf: doc/libgccjit.pdf

-doc/libgccjit.pdf: $(JIT_TEXI_FILES)
-	$(TEXI2PDF) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+doc/libgccjit/pdf/latex/libgccjit.pdf: $(SPHINX_FILES)
+	+ make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/pdf

 jit.texinfo.install-pdf: doc/libgccjit.pdf
 	@$(NORMAL_INSTALL)
@@ -342,7 +333,10 @@ jit.srcextra:

 jit.tags:

-jit.man:
+jit.man: doc/libgccjit/man/man/libgccjit.1
+
+doc/libgccjit/man/man/libgccjit.1: $(SPHINX_FILES)
+	+ make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/man

 jit.srcman:

@@ -397,7 +391,13 @@ jit.install-common: installdirs jit.install-headers
 endif
 endif

-jit.install-man:
+jit.install-man: $(DESTDIR)$(man1dir)/libgccjit$(man1ext)
+
+$(DESTDIR)$(man1dir)/libgccjit$(man1ext): doc/libgccjit/man/man/libgccjit.1 \
+		installdirs
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@
+	-chmod a-x $@

 jit.install-plugin:


--- a/gcc/jit/doc/conf.py
+++ b/gcc/jit/doc/conf.py
+# Configuration file for the Sphinx documentation builder.
+
+import sys
+sys.path.append('../../..//doc')
+
+from baseconf import *
+
+name = 'libgccjit'
+project = 'libgccjit'
+copyright = '1987-%s Free Software Foundation, Inc.' % YEAR
+authors = 'David Malcolm'
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+latex_documents = [
+  ('index', f'{name}.tex', project, authors, 'manual'),
+]
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', name, project, [authors], 1),
+]
+
+texinfo_documents = [
+  ('index', name, project, authors, None, None, None, True)
+]
+
+set_common(name, globals())
--- a/gcc/jit/docs/cp/index.rst
+++ b/gcc/jit/docs/cp/index.rst
--- a/gcc/jit/docs/cp/intro/index.rst
+++ b/gcc/jit/docs/cp/intro/index.rst
--- a/gcc/jit/docs/cp/intro/tutorial01.rst
+++ b/gcc/jit/docs/cp/intro/tutorial01.rst
--- a/gcc/jit/docs/cp/intro/tutorial02.rst
+++ b/gcc/jit/docs/cp/intro/tutorial02.rst
--- a/gcc/jit/docs/cp/intro/tutorial03.rst
+++ b/gcc/jit/docs/cp/intro/tutorial03.rst
@@ -111,7 +111,7 @@ an assignment: a value that can be computed somehow, and assigned
 *to* a storage area (such as a variable).  It has a specific
 :type:`gccjit::type`.

-Anothe important class is :type:`gccjit::lvalue`.
+Another important class is :type:`gccjit::lvalue`.
 A :type:`gccjit::lvalue`. is something that can of the *left*-hand
 side of an assignment: a storage area (such as a variable).


--- a/gcc/jit/docs/cp/intro/tutorial04.rst
+++ b/gcc/jit/docs/cp/intro/tutorial04.rst
--- a/gcc/jit/docs/cp/topics/asm.rst
+++ b/gcc/jit/docs/cp/topics/asm.rst
--- a/gcc/jit/docs/cp/topics/compilation.rst
+++ b/gcc/jit/docs/cp/topics/compilation.rst
--- a/gcc/jit/docs/cp/topics/contexts.rst
+++ b/gcc/jit/docs/cp/topics/contexts.rst
--- a/gcc/jit/docs/cp/topics/expressions.rst
+++ b/gcc/jit/docs/cp/topics/expressions.rst
--- a/gcc/jit/docs/cp/topics/functions.rst
+++ b/gcc/jit/docs/cp/topics/functions.rst
--- a/gcc/jit/docs/cp/topics/index.rst
+++ b/gcc/jit/docs/cp/topics/index.rst
--- a/gcc/jit/docs/cp/topics/locations.rst
+++ b/gcc/jit/docs/cp/topics/locations.rst
--- a/gcc/jit/docs/cp/topics/objects.rst
+++ b/gcc/jit/docs/cp/topics/objects.rst
--- a/gcc/jit/docs/cp/topics/types.rst
+++ b/gcc/jit/docs/cp/topics/types.rst
--- a/gcc/jit/docs/examples/emit-alphabet.bf
+++ b/gcc/jit/docs/examples/emit-alphabet.bf
--- a/gcc/jit/docs/examples/tut01-hello-world.c
+++ b/gcc/jit/docs/examples/tut01-hello-world.c
--- a/gcc/jit/docs/examples/tut01-hello-world.cc
+++ b/gcc/jit/docs/examples/tut01-hello-world.cc