This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] BRIG frontend: request for a global review


Hi!

On Tue, 24 Jan 2017 15:30:34 -0500, David Malcolm <dmalcolm@redhat.com> wrote:
> On Tue, 2017-01-24 at 13:52 +0100, Martin Jambor wrote:
> > [...] I have just
> > committed the BRIG FE as revision 244867.

In a build with that enabled, I just happened to "make html" in "gcc/",
and ran into:

    [...]
    makeinfo --split-size=5000000 --html -I [...]/source-gcc/gcc/doc -I [...]/source-gcc/gcc/doc/include \
            -I [...]/source-gcc/gcc/brig -o [...]/build-gcc/gcc/HTML/gcc-8.0.0/brig
    makeinfo: missing file argument.
    Try `makeinfo --help' for more information.
    [...]/source-gcc/gcc/brig/Make-lang.in:117: recipe for target '[...]/build-gcc/gcc/HTML/gcc-8.0.0/brig/index.html' failed
    make: *** [[...]/build-gcc/gcc/HTML/gcc-8.0.0/brig/index.html] Error 255

> A deps issue for the docs I noticed when glancing through the commit:
> 
> diff --git a/gcc/brig/Make-lang.in b/gcc/brig/Make-lang.in
> new file mode 100644 (file)
> index 0000000..b85b1b0
> --- /dev/null
> +++ b/gcc/brig/Make-lang.in
> 
> [...snip...]
> 
> +# Documentation.
> +
> +GO_TEXI_FILES = \
> +       brig/gccbrig.texi \
> +       $(gcc_docdir)/include/fdl.texi \
> +       $(gcc_docdir)/include/gpl_v3.texi \
> +       $(gcc_docdir)/include/gcc-common.texi \
> +       gcc-vers.texi
> 
> Presumably this should be BRIG_TEXI_FILES, rather than GO_TEXI_FILES?
> 
> +# doc/gccbrig.info: $(BRIG_TEXI_FILES)
> +#      if test "x$(BUILD_INFO)" = xinfo; then \
> +#        rm -f doc/gccbrig.info*; \
> +#        $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
> +#              -I $(gcc_docdir)/include -o $@ $<; \
> +#      else true; fi
> +
> +# doc/gccbrig.dvi: $(BRIG_TEXI_FILES)
> +#      $(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
> +
> +# doc/gccbrig.pdf: $(BRIG_TEXI_FILES)
> +#      $(TEXI2PDF) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
> +
> +$(build_htmldir)/brig/index.html: $(BRIG_TEXI_FILES)
> +       $(mkinstalldirs) $(@D)
> +       rm -f $(@D)/*
> +       $(TEXI2HTML) -I $(gcc_docdir) -I $(gcc_docdir)/include \
> +               -I $(srcdir)/brig -o $(@D) $<
> 
> ...for use in describing the deps of the above.

..., so that still needs to be fixed.  Alas, that won't help: the
"gccbrig.texi" file doesn't actually exist.  ;-)

As the intention surely must be to provide some kind of documentation
eventually, and to let me move forward, I "fixed" that (dummy file), and
also enabled some other documentation bits.  As obvious, committed to
trunk in r252893:

commit 61cfebc8aabe6bd1c2b045982943f5758ed81b8b
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Sun Sep 17 12:11:40 2017 +0000

    Fix gccbrig documentation build
    
            gcc/brig/
            * Make-lang.in (GO_TEXI_FILES): Rename to...
            (BRIG_TEXI_FILES): ... this.
            (doc/gccbrig.info, doc/gccbrig.dvi, doc/gccbrig.pdf, brig.info)
            (brig.srcinfo, brig.man, brig.srcman, brig.install-man)
            ($(DESTDIR)$(man1dir)/$(GCCBRIG_INSTALL_NAME)$(man1ext)):
            Uncomment/enable targets.
            (gccbrig.pod): New target.
            * gccbrig.texi: New file.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@252893 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/brig/ChangeLog    | 11 +++++++++++
 gcc/brig/Make-lang.in | 52 +++++++++++++++++++++++++++------------------------
 gcc/brig/gccbrig.texi |  5 +++++
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git gcc/brig/ChangeLog gcc/brig/ChangeLog
index 0804532..ebf31c4 100644
--- gcc/brig/ChangeLog
+++ gcc/brig/ChangeLog
@@ -1,3 +1,14 @@
+2017-09-17  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* Make-lang.in (GO_TEXI_FILES): Rename to...
+	(BRIG_TEXI_FILES): ... this.
+	(doc/gccbrig.info, doc/gccbrig.dvi, doc/gccbrig.pdf, brig.info)
+	(brig.srcinfo, brig.man, brig.srcman, brig.install-man)
+	($(DESTDIR)$(man1dir)/$(GCCBRIG_INSTALL_NAME)$(man1ext)):
+	Uncomment/enable targets.
+	(gccbrig.pod): New target.
+	* gccbrig.texi: New file.
+
 2017-08-04  Henry Linjamäki  <henry.linjamaki@parmance.com>
 
 	Fix PR 81713
diff --git gcc/brig/Make-lang.in gcc/brig/Make-lang.in
index d7566bf..23ddc03 100644
--- gcc/brig/Make-lang.in
+++ gcc/brig/Make-lang.in
@@ -93,25 +93,25 @@ brig1$(exeext): $(BRIG_OBJS) attribs.o $(BACKEND) $(LIBDEPS)
 
 # Documentation.
 
-GO_TEXI_FILES = \
+BRIG_TEXI_FILES = \
 	brig/gccbrig.texi \
 	$(gcc_docdir)/include/fdl.texi \
 	$(gcc_docdir)/include/gpl_v3.texi \
 	$(gcc_docdir)/include/gcc-common.texi \
 	gcc-vers.texi
 
-# doc/gccbrig.info: $(BRIG_TEXI_FILES)
-# 	if test "x$(BUILD_INFO)" = xinfo; then \
-# 	  rm -f doc/gccbrig.info*; \
-# 	  $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
-# 		-I $(gcc_docdir)/include -o $@ $<; \
-# 	else true; fi
+doc/gccbrig.info: $(BRIG_TEXI_FILES)
+	if test "x$(BUILD_INFO)" = xinfo; then \
+	  rm -f doc/gccbrig.info*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
+		-I $(gcc_docdir)/include -o $@ $<; \
+	else true; fi
 
-# doc/gccbrig.dvi: $(BRIG_TEXI_FILES)
-# 	$(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+doc/gccbrig.dvi: $(BRIG_TEXI_FILES)
+	$(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
 
-# doc/gccbrig.pdf: $(BRIG_TEXI_FILES)
-# 	$(TEXI2PDF) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
+doc/gccbrig.pdf: $(BRIG_TEXI_FILES)
+	$(TEXI2PDF) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
 
 $(build_htmldir)/brig/index.html: $(BRIG_TEXI_FILES)
 	$(mkinstalldirs) $(@D)
@@ -119,28 +119,32 @@ $(build_htmldir)/brig/index.html: $(BRIG_TEXI_FILES)
 	$(TEXI2HTML) -I $(gcc_docdir) -I $(gcc_docdir)/include \
 		-I $(srcdir)/brig -o $(@D) $<
 
+.INTERMEDIATE: gccbrig.pod
+
+gccbrig.pod: brig/gccbrig.texi
+	-$(TEXI2POD) -D gccbrig < $< > $@
+
 # Build hooks.
 
 brig.all.cross: gccbrig-cross$(exeext)
 brig.start.encap: gccbrig$(exeext)
 brig.rest.encap:
-#brig.info: doc/gccbrig.info
-brig.info:
+brig.info: doc/gccbrig.info
 brig.dvi: doc/gccbrig.dvi
 brig.pdf: doc/gccbrig.pdf
 brig.html: $(build_htmldir)/brig/index.html
-brig.srcinfo: #doc/gccbrig.info
-#	-cp -p $^ $(srcdir)/doc
+brig.srcinfo: doc/gccbrig.info
+	-cp -p $^ $(srcdir)/doc
 
 brig.srcextra:
 brig.tags: force
 	cd $(srcdir)/brig; \
 	etags -o TAGS.sub *.c *.h; \
 	etags --include TAGS.sub --include ../TAGS.sub
-brig.man:
 
-#brig.srcman: doc/gccbrig.1
-#	-cp -p $^ $(srcdir)/doc
+brig.man: doc/gccbrig.1
+brig.srcman: doc/gccbrig.1
+	-cp -p $^ $(srcdir)/doc
 
 lang_checks += check-brig
 
@@ -193,13 +197,13 @@ brig.install-html: $(build_htmldir)/brig
 	  fi; \
 	done
 
-brig.install-man: #$(DESTDIR)$(man1dir)/$(GCCBRIG_INSTALL_NAME)$(man1ext)
+brig.install-man: $(DESTDIR)$(man1dir)/$(GCCBRIG_INSTALL_NAME)$(man1ext)
 
-#$(DESTDIR)$(man1dir)/$(GCCBRIG_INSTALL_NAME)$(man1ext): doc/gccbrig.1 \
-#	installdirs
-#	-rm -f $@
-#	-$(INSTALL_DATA) $< $@
-#	-chmod a-x $@
+$(DESTDIR)$(man1dir)/$(GCCBRIG_INSTALL_NAME)$(man1ext): doc/gccbrig.1 \
+	installdirs
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@
+	-chmod a-x $@
 
 brig.uninstall:
 	rm -rf $(DESTDIR)$(bindir)/$(GCCBRIG_INSTALL_NAME)$(exeext)
diff --git gcc/brig/gccbrig.texi gcc/brig/gccbrig.texi
new file mode 100644
index 0000000..9636c00
--- /dev/null
+++ gcc/brig/gccbrig.texi
@@ -0,0 +1,5 @@
+\input texinfo @c -*-texinfo-*-
+@setfilename gccbrig.info
+@settitle The GNU BRIG Compiler
+
+@bye


Grüße
 Thomas



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]