Reviewers: Graham Percival, John Mandereau, Reinhold,
Message:
Please review
Description:
Reduces langdefs.py warnings in doc build
Doesn't quite get rid of them - one to sort. This has been interesting
to fix. There were 2 issues - building the regtests before building the
docs meant that the translations weren't available, and this threw about
20 warnings. I've swapped their order in the makefile with no apparent
other problem. Building the manuals threw about 10 warnings. However,
it doesn't appear possible to build the translations before the manuals
because of a dependency. To that end, I've added an environment
variable to the call to lilypond-book, and suppressed the warning when
this variable is set.
Please review this at http://codereview.appspot.com/6487046/
Affected files:
M GNUmakefile.in
M make/ly-rules.make
M python/langdefs.py
Index: GNUmakefile.in
diff --git a/GNUmakefile.in b/GNUmakefile.in
index
ceeb410a618e67277c398da9827b4d051d0aa6a0..4e6135d5d54386f8aca2b24324c5c782ca9763a4
100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -8,8 +8,8 @@ SUBDIRS = python scripts \
tex ps scm \
po \
elisp vim \
- input \
- $(documentation-dir)
+ $(documentation-dir) \
+ input
## this convoluted construction is necessary, since we don't know the
Index: make/ly-rules.make
diff --git a/make/ly-rules.make b/make/ly-rules.make
index
954626f6bcacc5f54db067aff178dea5aa623bd3..e33a23235d04afd05c5ef9a588909d19f6793c11
100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -23,7 +23,7 @@ $(eval $(firstword $(TEXI_FILES_FROM_TELY)):\
# don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
# it is not, for --srcdir builds
$(outdir)/%.texi: %.tely $(outdir)/version.itexi
$(DOCUMENTATION_LOCALE_TARGET) $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
- LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK)
$(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS)
$(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir)
--format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS)
--redirect-lilypond-output $<
+ LILYPOND_VERSION=$(TOPLEVEL_VERSION) NO_GETTEXT="TRUE" $(PYTHON)
$(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES)
--process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)'
--output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS)
--redirect-lilypond-output $<
$(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi
$(DOCUMENTATION_LOCALE_TARGET) $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
Index: python/langdefs.py
diff --git a/python/langdefs.py b/python/langdefs.py
index
d3d6c07813083a7f224e3f9db42662f2487c704e..0518da04ad14fcbca1a9ac59dfa77d7752353015
100644
--- a/python/langdefs.py
+++ b/python/langdefs.py
@@ -98,5 +98,6 @@ else:
translation[l.code] = t.gettext
except:
if os.environ.has_key ('LYDOC_LOCALEDIR'):
- sys.stderr.write ('langdefs.py: warning: lilypond-doc gettext
domain not found.\n')
+ if not os.environ.has_key ('NO_GETTEXT'):
+ sys.stderr.write ('langdefs.py: warning: lilypond-doc
gettext domain not found.\n')
translation = dict ([(l.code, lambda x: x) for l in LANGUAGES])
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel