Documentation: Add dependency notation.texi -> internals.texi (issue 557720043 by jonas.hahnfeld@gmail.com)

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Documentation: Add dependency notation.texi -> internals.texi (issue 557720043 by jonas.hahnfeld@gmail.com)

jonas.hahnfeld
Reviewers: ,

Message:
If nobody disagrees, I'd like to push this rather sooner than later
because James is already hitting it:
https://sourceforge.net/p/testlilyissues/issues/5923/#a84a

For testing, I did
 $ make doc-clean
 $ make -C Documentation/ out=www out-www/notation.texi
which fails without this patch.

Description:
Documentation: Add dependency notation.texi -> internals.texi

notation.tely includes, via notation/notation-appendices.itely, many
generated files (like markup-commands.tely). These are the result of
processing ly/generate-documentation.ly for internals.texi

Please review this at https://codereview.appspot.com/557720043/

Affected files (+7, -10 lines):
  M Documentation/GNUmakefile


Index: Documentation/GNUmakefile
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 070c3fdf51036ead951aff578fc51d39bac34a4d..b26fcf3929f96234a501e2528f1af22cc13bffa5 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -290,26 +290,23 @@ $(outdir)/%.php: %.php
  $(call ly_progress,Making,$@,(hard link))
  ln -f $< $@
 
-## notation.texi deps
-$(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
- $(MAKE) -C $(top-src-dir)/mf
-
-$(outdir)/contributor.texi: $(outdir)/ly-grammar.txt
-
 ## Rules for the automatically generated documentation
 $(outdir)/ly-grammar.txt: $(top-src-dir)/lily/parser.yy
  $(call ly_progress,Making,$@,< yy)
  cd $(outdir) && $(BISON) -v $<
  $(buildscript-dir)/yyout2grammar $(outdir)/parser.output $@
 
-# There used to be a dependency on a dummy target, to force a rebuild
-# of internals every time.  however, this triggers
-# compilation during install, which is a bad thing (tm).
-
 $(outdir)/internals.texi: $(LILYPOND_BINARY) $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
  $(call ly_progress,Making,$@,)
  cd $(outdir) && $(buildscript-dir)/run-and-check "$(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation" "generate-documentation.log"
 
+## Dependencies on the automatically generated documentation
+$(outdir)/contributor.texi: $(outdir)/ly-grammar.txt
+# notation.tely includes, via notation/notation-appendices.itely, many
+# generated files (like markup-commands.tely). These are the result of
+# processing ly/generate-documentation.ly for internals.texi (see above).
+$(outdir)/notation.texi: $(outdir)/internals.texi
+
 ###############################################
 #  Documentation and translations maintenance #
 ###############################################



Reply | Threaded
Open this post in threaded view
|

Re: Documentation: Add dependency notation.texi -> internals.texi (issue 557720043 by jonas.hahnfeld@gmail.com)

v.villenave
On 2020/04/21 07:29:27, hahnjo wrote:
> If nobody disagrees, I'd like to push this rather sooner than later

LGTM! ("We" should have thought of it even sooner.)

V.

https://codereview.appspot.com/557720043/

Reply | Threaded
Open this post in threaded view
|

Re: Documentation: Add dependency notation.texi -> internals.texi (issue 557720043 by jonas.hahnfeld@gmail.com)

Dev mailing list
In reply to this post by jonas.hahnfeld
LGTM


https://codereview.appspot.com/557720043/diff/581940043/Documentation/GNUmakefile
File Documentation/GNUmakefile (right):

https://codereview.appspot.com/557720043/diff/581940043/Documentation/GNUmakefile#newcode304
Documentation/GNUmakefile:304: $(outdir)/contributor.texi:
$(outdir)/ly-grammar.txt
Please add an empty line here.

https://codereview.appspot.com/557720043/

Reply | Threaded
Open this post in threaded view
|

Re: Documentation: Add dependency notation.texi -> internals.texi (issue 557720043 by jonas.hahnfeld@gmail.com)

jonas.hahnfeld
In reply to this post by jonas.hahnfeld
On 2020/04/21 08:48:54, lemzwerg wrote:
> LGTM
>
>
https://codereview.appspot.com/557720043/diff/581940043/Documentation/GNUmakefile
> File Documentation/GNUmakefile (right):
>
>
https://codereview.appspot.com/557720043/diff/581940043/Documentation/GNUmakefile#newcode304
> Documentation/GNUmakefile:304: $(outdir)/contributor.texi:
> $(outdir)/ly-grammar.txt
> Please add an empty line here.

Done before pushing

commit 338f83af6e9014042cf7266e82e8cfa852e89ebb
Author:     Jonas Hahnfeld <[hidden email]>
AuthorDate: Tue Apr 21 09:21:40 2020 +0200
Commit:     Jonas Hahnfeld <[hidden email]>
CommitDate: Tue Apr 21 11:04:55 2020 +0200

    Documentation: Add dependency notation.texi -> internals.texi
   
    notation.tely includes, via notation/notation-appendices.itely, many
    generated files (like markup-commands.tely). These are the result of
    processing ly/generate-documentation.ly for internals.texi

https://codereview.appspot.com/557720043/