Re: Issue 5864: improve Rational infinity initialization (issue 577710043 by nine.fierce.ball...@gmail.com)
LGTM https://codereview.appspot.com/577710043/
Issue 5862: Prefer astyle 3.1 and update clang-format options (issue 551640043 by nine.fierce.ball...@gmail.com)
Reviewers: ,
Message:
It's worth emphasizing this: even with these improvements to the
clang-format configuration, those who use clang-format will introduce a
truckload of differences from the traditional indentation.
Description:
https://sourceforge.net/p/testlilyissues/issues/5862/
Prefer astyle 3.1 and update clang-format options
Change the preferred version of astyle from 2.04 to 3.1.
In a separate commit, add a few clang-format options to reduce
(slightly) the extent of changes that a subsequent fixcc.py makes.
Test procedure:
1. clang-format everything (version 9.0.0)
2. git commit
3. fixcc.py everything (astyle version 3.1)
4. git diff | wc -l
BASELINE LINES
master@786c3669ff08804465a89013d349fc745fd783c9 19702
BENEFICIAL OPTIONS (TESTED INDIVIDUALLY) LINES
ConstructorInitializerIndentWidth: 2 19062
ContinuationIndentWidth: 215018
SpaceAfterCStyleCast: true19540
[Tested together] 14171
OTHER OPTIONS (TESTED INDIVIDUALLY) LINES
AlignEscapedNewlines: Left19702
AlignOperands: false 20760
AllowShortFunctionsOnASingleLine: InlineOnly 19708
AlwaysBreakTemplateDeclarations: MultiLine19702
BinPackArguments: false 21588
BinPackParameters: false 20557
BreakBeforeTernaryOperators: true 19702
BreakConstructorInitializers: BeforeColon 19702
BreakInheritanceList: BeforeColon 19702
ColumnLimit: 80 19702
SortIncludes: false 19702
SpaceAfterTemplateKeyword: false 19702
Please review this at https://codereview.appspot.com/551640043/
Affected files (+4, -1 lines):
M .clang-format
M scripts/auxiliar/fixcc.py
Index: .clang-format
diff --git a/.clang-format b/.clang-format
index
db078d01eacd53ae8c1da39186048641d12be7bf..126312d446f4dfbba9e2b162ac08572b60914324
100644
--- a/.clang-format
+++ b/.clang-format
@@ -7,6 +7,9 @@ Language:Cpp
AlwaysBreakAfterReturnType: TopLevelDefinitions
BreakBeforeBinaryOperators: All
BreakBeforeBraces: GNU
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
+SpaceAfterCStyleCast: true
SpaceBeforeParens: Always
ReflowComments: false
...
Index: scripts/auxiliar/fixcc.py
diff --git a/scripts/auxiliar/fixcc.py b/scripts/auxiliar/fixcc.py
index
abb5272bc921e8ba496005556f5028272b312935..0c4324234e079b750e9fba07fa92cb05ffe3001d
100755
--- a/scripts/auxiliar/fixcc.py
+++ b/scripts/auxiliar/fixcc.py
@@ -38,7 +38,7 @@ GLOBAL_CXX = 'GC++'
CXX = 'C++'
verbose_p = 0
indent_p = 1
-PREFERRED_ASTYLE_VERSION = "Artistic Style Version 2.04"
+PREFERRED_ASTYLE_VERSION = "Artistic Style Version 3.1"
rules = {
Re: website issue
On Wed, 25 Mar 2020 at 20:06, David Nalesnik wrote: > > I'm getting some spurious characters at > http://lilypond.org/manuals.html. Screenshot attached. looks python2 vs python3 related: b'' is how python3 prints byte strings (which were the default string type in python2, but not in python3).
website issue
I'm getting some spurious characters at http://lilypond.org/manuals.html. Screenshot attached. Here's some of the page source: bLearning: a must-read gentle introduction to LilyPond. (details of Learning) Thanks, David
Re: why was this pushed?
Han-Wen Nienhuys writes: > On Wed, Mar 25, 2020 at 7:40 PM Carl Sorensen wrote: >> >> We don't push until the status becomes Push. Countdown is a last >> chance for reviewers to comment. > > Sorry, I saw Valentin had pushed his, so I assumed this was OK. But it was an issue by someone else. Pushing changes of someone else prematurely when they have not explicitly asked for it bereaves even the original author of the ability to reconsider. It's somewhat different taking that responsibility for changes by oneself in circumstances warranting expedited action (like when other important changes depend on it). But doing so without updating issue status and without giving some feedback with regard to the reasons for urgency is, if nothing else, quite impolite towards the people who have to pick up the bits afterwards and sort them into place. -- David Kastrup
Re: why was this pushed?
On Wed, Mar 25, 2020 at 7:40 PM Carl Sorensen wrote: > > We don't push until the status becomes Push. Countdown is a last chance for > reviewers to comment. Sorry, I saw Valentin had pushed his, so I assumed this was OK. Note that it was marked countdown for push by today. > Thanks, > > Carl > > > On 3/25/20, 12:06 PM, "lilypond-devel on behalf of Han-Wen Nienhuys" > hanw...@gmail.com> wrote: > > This was marked as Countdown in your Monday mail. > > On Wed, Mar 25, 2020 at 5:55 PM James Lowe wrote: > > > > Added vowel transitions for lyrics master staging > > authorDavid Stephen Grant > > Wed, 25 Mar 2020 09:27:43 + (10:27 +0100) > > committerHan-Wen Nienhuys > > Wed, 25 Mar 2020 09:27:43 + (10:27 +0100) > > commitb7034e683d47b1e9bb11e5464a7e514912a0d9ba > > > > --- > > > > I don't see any where that it was OK to do so. > > > > James > > > > > > > > > -- > Han-Wen Nienhuys - hanw...@gmail.com - http://www.xs4all.nl/~hanwen > > > -- Han-Wen Nienhuys - hanw...@gmail.com - http://www.xs4all.nl/~hanwen
Re: why was this pushed?
We don't push until the status becomes Push. Countdown is a last chance for reviewers to comment. Thanks, Carl On 3/25/20, 12:06 PM, "lilypond-devel on behalf of Han-Wen Nienhuys" wrote: This was marked as Countdown in your Monday mail. On Wed, Mar 25, 2020 at 5:55 PM James Lowe wrote: > > Added vowel transitions for lyrics master staging > authorDavid Stephen Grant > Wed, 25 Mar 2020 09:27:43 + (10:27 +0100) > committerHan-Wen Nienhuys > Wed, 25 Mar 2020 09:27:43 + (10:27 +0100) > commitb7034e683d47b1e9bb11e5464a7e514912a0d9ba > > --- > > I don't see any where that it was OK to do so. > > James > > > -- Han-Wen Nienhuys - hanw...@gmail.com - http://www.xs4all.nl/~hanwen
Re: why was this pushed?
This was marked as Countdown in your Monday mail. On Wed, Mar 25, 2020 at 5:55 PM James Lowe wrote: > > Added vowel transitions for lyrics master staging > authorDavid Stephen Grant > Wed, 25 Mar 2020 09:27:43 + (10:27 +0100) > committerHan-Wen Nienhuys > Wed, 25 Mar 2020 09:27:43 + (10:27 +0100) > commitb7034e683d47b1e9bb11e5464a7e514912a0d9ba > > --- > > I don't see any where that it was OK to do so. > > James > > > -- Han-Wen Nienhuys - hanw...@gmail.com - http://www.xs4all.nl/~hanwen
Re: PATCHES - Countdown for March 25th
Han-wen,
If you're going to push patches before the countdown annoncement email,
have the good grace to update the tracker.
James
On 25/03/2020 15:34, pkx1...@posteo.net wrote:
Hello,
Here is the current patch countdown list. The next countdown will be on
March 27th
A quick synopsis of all patches currently in the review process can be
found here:
http://philholmes.net/lilypond/allura/
***
Push:
5860 Remove unused file - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5860
http://codereview.appspot.com/571900048
5858 Cleanup flower/ makefile - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5858
http://codereview.appspot.com/577700045
5857 Inline elisp stepmake templates. - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5857
http://codereview.appspot.com/563780044
5856 Run find -name \*.scm -exec scripts/auxiliar/fixscm.sh {} + -
David Kastrup
https://sourceforge.net/p/testlilyissues/issues/5856
http://codereview.appspot.com/555490045
5855 Stop installing TFM and Type1 fonts. - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5855
http://codereview.appspot.com/577700043
5854 Remove trailing whitespace {python,scm,lily,scripts}. - Han-Wen
Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5854
http://codereview.appspot.com/547810043
5853 Cleanup python/ build rules. - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5853
http://codereview.appspot.com/549740043
5851 .dir-locals.el: no indent-tabs-mode in shell-script-mode - David
Kastrup
https://sourceforge.net/p/testlilyissues/issues/5851
http://codereview.appspot.com/575840047
5850 Remove input/regression/test-output-distance.ly - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5850
http://codereview.appspot.com/575850043
5849 aclocal.m4: Support GUILE_CONFIG, document GUILE_FLAVOR - David
Kastrup
https://sourceforge.net/p/testlilyissues/issues/5849
http://codereview.appspot.com/575860044
5844 scripts/build/scan-mf-deps: script to generate MF dependencies -
Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5844
http://codereview.appspot.com/553700043
Countdown:
5862 Prefer astyle 3.1 and update clang-format options - Dan Eble
https://sourceforge.net/p/testlilyissues/issues/5862
http://codereview.appspot.com/551640043
5859 Inline scm stepmake templates - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5859
http://codereview.appspot.com/575870044
Review:
5863 Use python3 in website.make - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5863
http://codereview.appspot.com/581880043
5861 Trim unused toplevel targets. - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5861
http://codereview.appspot.com/547810069
5036 128 beaming output not producing output as expected (?) - Torsten
Hammerle
https://sourceforge.net/p/testlilyissues/issues/5036
http://codereview.appspot.com/559700043
New:
5852 Inline executable-* stepmake templates in lily/GNUmakefile -
Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5852
http://codereview.appspot.com/577690043
5836 Added vowel transitions for lyrics - David Grant
https://sourceforge.net/p/testlilyissues/issues/5836
http://codereview.appspot.com/565750043
Waiting:
5811 mf: use python scripting for generating Emmentaler fonts -
Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5811
http://codereview.appspot.com/553580043
5771 remove unnecessary (descend-to-context ... 'Score) - Dan Eble
https://sourceforge.net/p/testlilyissues/issues/5771
http://codereview.appspot.com/557440043
5740 Add \post to defer context actions to end of time step - Dan Eble
https://sourceforge.net/p/testlilyissues/issues/5740
http://codereview.appspot.com/581600043
***
Regards,
James
why was this pushed?
Added vowel transitions for lyrics master staging author David Stephen Grant Wed, 25 Mar 2020 09:27:43 + (10:27 +0100) committer Han-Wen Nienhuys Wed, 25 Mar 2020 09:27:43 + (10:27 +0100) commit b7034e683d47b1e9bb11e5464a7e514912a0d9ba --- I don't see any where that it was OK to do so. James
Re: AU-1.2 Relocation
> I wonder if "bindir/.." shouldn't be "../bindir" (my parents being up > in the genealogy). Nope, as others have already confirmed :-) Werner
Re: AU-1.2 Relocation
Am 25.03.20 um 17:19 schrieb Jean-Charles Malahieude:
Hi Werner,
On my way to updating the French documentation, I read in running.itely
(1st item of Relocation algorithm)
"Compute the directory where the currently executed
@command{lilypond} binary is located. Let's call this
@code{bindir}. Set (internal) environment variable
@code{INSTALLER_PREFIX} to @file{@var{bindir}/..} (i.e., the
parent directory of @code{bindir})."
I wonder if "bindir/.." shouldn't be "../bindir" (my parents being up in
the genealogy).
The parent directory of bindir is bindir/..
../bindir would be a sibling (called bindir) of the working directory.
Re: AU-1.2 Relocation
bindir/.. is the parent directory of bindir
../bindir is the directory bindir that is a child of the parent of the current
directory.
Carl
On 3/25/20, 10:27 AM, "lilypond-devel on behalf of Jean-Charles Malahieude"
wrote:
Hi Werner,
On my way to updating the French documentation, I read in running.itely
(1st item of Relocation algorithm)
"Compute the directory where the currently executed
@command{lilypond} binary is located. Let's call this
@code{bindir}. Set (internal) environment variable
@code{INSTALLER_PREFIX} to @file{@var{bindir}/..} (i.e., the
parent directory of @code{bindir})."
I wonder if "bindir/.." shouldn't be "../bindir" (my parents being up in
the genealogy).
Would you mind confirming my assumption?
If "../bindir" is the right spelling, I'll change it on Translation's
branch and it will be merged into staging afterwards.
Cheers,
--
Jean-Charles
AU-1.2 Relocation
Hi Werner,
On my way to updating the French documentation, I read in running.itely
(1st item of Relocation algorithm)
"Compute the directory where the currently executed
@command{lilypond} binary is located. Let's call this
@code{bindir}. Set (internal) environment variable
@code{INSTALLER_PREFIX} to @file{@var{bindir}/..} (i.e., the
parent directory of @code{bindir})."
I wonder if "bindir/.." shouldn't be "../bindir" (my parents being up in
the genealogy).
Would you mind confirming my assumption?
If "../bindir" is the right spelling, I'll change it on Translation's
branch and it will be merged into staging afterwards.
Cheers,
--
Jean-Charles
PATCHES - Countdown for March 25th
Hello,
Here is the current patch countdown list. The next countdown will be on
March 27th
A quick synopsis of all patches currently in the review process can be
found here:
http://philholmes.net/lilypond/allura/
***
Push:
5860 Remove unused file - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5860
http://codereview.appspot.com/571900048
5858 Cleanup flower/ makefile - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5858
http://codereview.appspot.com/577700045
5857 Inline elisp stepmake templates. - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5857
http://codereview.appspot.com/563780044
5856 Run find -name \*.scm -exec scripts/auxiliar/fixscm.sh {} + - David
Kastrup
https://sourceforge.net/p/testlilyissues/issues/5856
http://codereview.appspot.com/555490045
5855 Stop installing TFM and Type1 fonts. - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5855
http://codereview.appspot.com/577700043
5854 Remove trailing whitespace {python,scm,lily,scripts}. - Han-Wen
Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5854
http://codereview.appspot.com/547810043
5853 Cleanup python/ build rules. - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5853
http://codereview.appspot.com/549740043
5851 .dir-locals.el: no indent-tabs-mode in shell-script-mode - David
Kastrup
https://sourceforge.net/p/testlilyissues/issues/5851
http://codereview.appspot.com/575840047
5850 Remove input/regression/test-output-distance.ly - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5850
http://codereview.appspot.com/575850043
5849 aclocal.m4: Support GUILE_CONFIG, document GUILE_FLAVOR - David Kastrup
https://sourceforge.net/p/testlilyissues/issues/5849
http://codereview.appspot.com/575860044
5844 scripts/build/scan-mf-deps: script to generate MF dependencies -
Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5844
http://codereview.appspot.com/553700043
Countdown:
5862 Prefer astyle 3.1 and update clang-format options - Dan Eble
https://sourceforge.net/p/testlilyissues/issues/5862
http://codereview.appspot.com/551640043
5859 Inline scm stepmake templates - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5859
http://codereview.appspot.com/575870044
Review:
5863 Use python3 in website.make - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5863
http://codereview.appspot.com/581880043
5861 Trim unused toplevel targets. - Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5861
http://codereview.appspot.com/547810069
5036 128 beaming output not producing output as expected (?) - Torsten
Hammerle
https://sourceforge.net/p/testlilyissues/issues/5036
http://codereview.appspot.com/559700043
New:
5852 Inline executable-* stepmake templates in lily/GNUmakefile -
Han-Wen Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5852
http://codereview.appspot.com/577690043
5836 Added vowel transitions for lyrics - David Grant
https://sourceforge.net/p/testlilyissues/issues/5836
http://codereview.appspot.com/565750043
Waiting:
5811 mf: use python scripting for generating Emmentaler fonts - Han-Wen
Nienhuys
https://sourceforge.net/p/testlilyissues/issues/5811
http://codereview.appspot.com/553580043
5771 remove unnecessary (descend-to-context ... 'Score) - Dan Eble
https://sourceforge.net/p/testlilyissues/issues/5771
http://codereview.appspot.com/557440043
5740 Add \post to defer context actions to end of time step - Dan Eble
https://sourceforge.net/p/testlilyissues/issues/5740
http://codereview.appspot.com/581600043
***
Regards,
James
Re: Trim unused toplevel targets. (issue 547810069 by hanw...@gmail.com)
hanw...@gmail.com writes: > Reviewers: lemzwerg, > > Message: > On 2020/03/22 05:51:34, lemzwerg wrote: >> LGTM >> >> https://codereview.appspot.com/547810069/diff/575870045/GNUmakefile.in >> File GNUmakefile.in (right): >> >> > https://codereview.appspot.com/547810069/diff/575870045/GNUmakefile.in#newcode26 >> GNUmakefile.in:26: RELEASE_FILES = RELEASE-COMMIT >> Many GNU packages auto-generate a ChangeLog file from the git commit > messages. >> Shall we do something similar? > > What is the ChangeLog used for these days? Checking what changes are relevant for the distributed version. > Many GNU packages haven't been with the times. Git is now 14 years old. > I people want to know what changed, they can read the man page to > git-log. That assumes that they don't have an official and versioned distribution of LilyPond (or of some fork of it) but rather a clone of the repository corresponding to their version of Git. The GPL does not guarantee that modified source comes with full repository access to back it. Merely the _current_ corresponding source. That's the reason "many GNU packages auto-generate a ChangeLog file from the git commit messages". The decision to do that has been made after considerable discussion and the respective tools have been developed. It's not like decision and implementation of such a policy would happen in a vacuum and be unprecedented, so the cost of implementing such a policy would be considerably more moderate than if we had to do it from scratch. -- David Kastrup
Re: Patchy email
On 3/25/20, Werner LEMBERG wrote: > Oops, I gave wrong advice, sorry. You’re not the one to blame; I was the one who jumped the gun. > Please do > s/@example/@samp/ > and re-commit. Done. Aand this is why we have a patch reviewing process. Lesson learned. (Again.) V.
Re: Added transition lines for lyrics (issue 565750043 by davidgrant...@gmail.com)
Patch description in the issue tracker has been updated.
https://codereview.appspot.com/565750043/diff/569570043/lily/vowel-transition.cc
File lily/vowel-transition.cc (right):
https://codereview.appspot.com/565750043/diff/569570043/lily/vowel-transition.cc#newcode37
lily/vowel-transition.cc:37: SCM num_length = me->get_property
("minimum-length");
On 2020/03/24 21:46:30, hanwenn wrote:
> num suggests a number.
>
> minimum_length ?
Done.
https://codereview.appspot.com/565750043/diff/569570043/lily/vowel-transition.cc#newcode137
lily/vowel-transition.cc:137: w += -d * r->item_drul_[d]->extent
(r->item_drul_[d], X_AXIS)[-d];
On 2020/03/24 21:46:29, hanwenn wrote:
> this still looks strange, but if it's problem, it'll be contained
within the
> vowel-transition code, which is acceptable.
Acknowledged, thanks.
https://codereview.appspot.com/565750043/
Re: Inline executable-* stepmake templates in lily/GNUmakefile (issue 577690043 by hanw...@gmail.com)
> > What's the reason this isn't called `LOADLIBS`? > > you should ask the GNU project. Aah, indeed, thanks. Well, `LOADLIBES` is deprecated, and the new name is `LDLIBS`. So maybe use `LDLIBS`? https://codereview.appspot.com/577690043/
Re: Trim unused toplevel targets. (issue 547810069 by hanw...@gmail.com)
https://codereview.appspot.com/547810069/
Re: Trim unused toplevel targets. (issue 547810069 by hanw...@gmail.com)
Reviewers: lemzwerg, Message: On 2020/03/22 05:51:34, lemzwerg wrote: > LGTM > > https://codereview.appspot.com/547810069/diff/575870045/GNUmakefile.in > File GNUmakefile.in (right): > > https://codereview.appspot.com/547810069/diff/575870045/GNUmakefile.in#newcode26 > GNUmakefile.in:26: RELEASE_FILES = RELEASE-COMMIT > Many GNU packages auto-generate a ChangeLog file from the git commit messages. > Shall we do something similar? What is the ChangeLog used for these days? Many GNU packages haven't been with the times. Git is now 14 years old. I people want to know what changed, they can read the man page to git-log. Description: Trim unused toplevel targets. Please review this at https://codereview.appspot.com/547810069/ Affected files (+3, -15 lines): M GNUmakefile.in Index: GNUmakefile.in diff --git a/GNUmakefile.in b/GNUmakefile.in index 42b62683302441b1fbcb14a8b0a8433397e86d4d..850bd8b5f0d3e4b37cb8b9977c10da369c0f2c53 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -23,7 +23,7 @@ TOPDOC_FILES = AUTHORS INSTALL README NEWS TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES))) IN_FILES := $(call src-wildcard,*.in) -RELEASE_FILES = ChangeLog RELEASE-COMMIT +RELEASE_FILES = RELEASE-COMMIT RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%) OUT_DIST_FILES += $(RELEASE_OUT_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) @@ -78,15 +78,10 @@ $(outdir)/VERSION: $(config_make) VERSION -mkdir -p $(outdir) echo $(TOPLEVEL_VERSION) > $@ -$(outdir)/ChangeLog: $(outdir)/VERSION - $(call ly_progress,Making,$@,) - @echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > $@ - -$(outdir)/RELEASE-COMMIT: # FIXME: any file in $(top-src-dir)/.git/ we can depend on and be sure RELEASE-COMMIT is up to date? +$(outdir)/RELEASE-COMMIT: $(call ly_progress,Making,$@,) git --git-dir=$(top-src-dir)/.git show HEAD | head -100 > $@ -# junk me as soon as RELEASE-COMMIT FIXME: has been addressed refresh-release-files: test -d $(top-src-dir)/.git && rm -f $(RELEASE_OUT_FILES) $(MAKE) $(RELEASE_OUT_FILES) @@ -97,10 +92,7 @@ python-modules: top-doc: python-modules -local-clean: local-clean-ChangeLog local-clean-filelist - -local-clean-ChangeLog: - rm -f ChangeLog +local-clean: local-clean-filelist info: $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true @@ -195,10 +187,6 @@ tree-share = $(tree-prefix)/share tree-share-prefix = $(tree-share)/lilypond/current tree-lib-prefix = $(tree-lib)/lilypond/current -C_DIRS = flower lily -c-clean: - $(foreach i, $(C_DIRS), $(MAKE) -C $(i) clean &&) true - src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh doc-clean: snippets-clean $(tree-share-prefix)/lilypond-force
Re: Inline executable-* stepmake templates in lily/GNUmakefile (issue 577690043 by hanw...@gmail.com)
Reviewers: lemzwerg, https://codereview.appspot.com/577690043/diff/581870043/lily/GNUmakefile File lily/GNUmakefile (right): https://codereview.appspot.com/577690043/diff/581870043/lily/GNUmakefile#newcode15 lily/GNUmakefile:15: LOADLIBES = $(FLOWER_LIB) $(CONFIG_LIBS) On 2020/03/21 05:53:15, lemzwerg wrote: > What's the reason this isn't called `LOADLIBS`? you should ask the GNU project. https://cs.bazel.build/search?q=LOADLIBES+f%3Aakef=1350 https://codereview.appspot.com/577690043/diff/581870043/lily/GNUmakefile#newcode18 lily/GNUmakefile:18: EXECUTABLES = $(notdir $(EXECUTABLE)) On 2020/03/21 05:53:15, lemzwerg wrote: > This is a funny name, too. AFAICS, this is just a single name, right? Done. https://codereview.appspot.com/577690043/diff/581870043/lily/GNUmakefile#newcode28 lily/GNUmakefile:28: $(foreach a, $(EXECUTABLES), \ On 2020/03/21 05:53:15, lemzwerg wrote: > Since `EXECUTABLES` is a single name, we don't need a loop. > > And what happened with `SEXECUTABLES`? I removed it. I think SEXECUTABLES stands for Script Executables, which we don't have here. Description: Inline executable-* stepmake templates in lily/GNUmakefile Please review this at https://codereview.appspot.com/577690043/ Affected files (+34, -47 lines): M lily/GNUmakefile D stepmake/stepmake/executable-rules.make D stepmake/stepmake/executable-targets.make D stepmake/stepmake/executable-vars.make Index: stepmake/stepmake/executable-rules.make diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make deleted file mode 100644 index 63c04a869b5966fa7a124a87687fe7a46053a145.. --- a/stepmake/stepmake/executable-rules.make +++ /dev/null @@ -1,14 +0,0 @@ - -define MODULE_LIB_template \ -$(1)/$(outdir)/library.a : \ - $(MAKE) -C $(1) -endef - -$(foreach a, $(MODULE_LIBS), $(eval $(call MODULE_LIB_template,$(a - -$(O_FILES): $(outdir)/config.hh - -$(EXECUTABLE): $(O_FILES) $(outdir)/version.hh $(MODULE_LIBS:%=%/$(outdir)/library.a) - $(call ly_progress,Making,$@,) - $(foreach a, $(MODULE_LIBS), $(MAKE) -C $(a) && ) true - $(CXX) $(ALL_CXXFLAGS) -o $@ $(O_FILES) $(LOADLIBES) $(ALL_LDFLAGS) Index: stepmake/stepmake/executable-targets.make diff --git a/stepmake/stepmake/executable-targets.make b/stepmake/stepmake/executable-targets.make deleted file mode 100644 index 7afa1db57964a4ba2a08ac933e2c3371816dd6fa.. --- a/stepmake/stepmake/executable-targets.make +++ /dev/null @@ -1,21 +0,0 @@ -default: $(EXECUTABLE) - -exe: $(EXECUTABLE) - -local-install: installexe - -local-uninstall: uninstallexe - -installexe: all - -$(INSTALLPY) -d $(DESTDIR)$(bindir) - $(foreach a, $(EXECUTABLES), \ - $(INSTALLPY) -m 755 $(outdir)/$(a) \ - $(DESTDIR)$(bindir)/$(program_prefix)$(a)$(program_suffix) && ) true - $(INSTALLPY) -c -m 755 $(addprefix $(outdir)/, $(SEXECUTABLES)) $(DESTDIR)$(bindir) - -uninstallexe: - $(foreach a, $(EXECUTABLES), rm -f \ - $(DESTDIR)$(bindir)/$(program_prefix)$(a)$(program_suffix) && ) true - $(foreach a, $(SEXECUTABLES), rm -f $(DESTDIR)$(bindir)/$(a) &&) true - - Index: stepmake/stepmake/executable-vars.make diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make deleted file mode 100644 index c064c6408004357d218e4496aa1d191cceb428f6.. --- a/stepmake/stepmake/executable-vars.make +++ /dev/null @@ -1,7 +0,0 @@ -MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS))) -LOADLIBES = $(MODULE_LIBES) $(CONFIG_LIBS) - -EXECUTABLE = $(outdir)/$(NAME) -EXECUTABLES = $(notdir $(EXECUTABLE)) - - Index: lily/GNUmakefile diff --git a/lily/GNUmakefile b/lily/GNUmakefile index bdae4ee441e1b33a5b37b12e4592b8e9c0ac5312..89d55275862e4f147b751b144e2b3acfa673bacc 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -6,12 +6,44 @@ NAME = lilypond MODULE_LIBS=$(depth)/flower MODULE_INCLUDES= $(depth)/flower/include - HELP2MAN_EXECS = lilypond -STEPMAKE_TEMPLATES=c++ executable po help2man +STEPMAKE_TEMPLATES=c++ po help2man include $(depth)/make/stepmake.make +FLOWER_LIB = $(depth)/flower/$(outdir)/library.a +LOADLIBES = $(FLOWER_LIB) $(CONFIG_LIBS) + +EXECUTABLE = $(outdir)/$(NAME) +EXECUTABLES = $(notdir $(EXECUTABLE)) + +default: $(EXECUTABLE) + +local-install: installexe + +local-uninstall: uninstallexe + +installexe: all + -$(INSTALLPY) -d $(DESTDIR)$(bindir) + $(foreach a, $(EXECUTABLES), \ + $(INSTALLPY) -m 755 $(outdir)/$(a) \ + $(DESTDIR)$(bindir)/$(program_prefix)$(a)$(program_suffix) && ) true + +uninstallexe: + $(foreach a, $(EXECUTABLES), rm -f \ + $(DESTDIR)$(bindir)/$(program_prefix)$(a)$(program_suffix) && ) true + +$(O_FILES): $(outdir)/config.hh + +$(FLOWER_LIB): + $(MAKE) -C $(dirname $@) +
