From 03f79cd4492c3ef03d4a79d16eb898aaee32cd1c Mon Sep 17 00:00:00 2001 From: Phil Holmes Date: Thu, 5 May 2011 13:25:24 +0100 Subject: [PATCH] Build updates to get rid of website warnings --- make/website.make | 2 + scripts/build/extract_texi_filenames.py | 22 +++++++++-- scripts/build/website-known-missing-files.txt | 39 +++++++++++++++++++ 3 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 scripts/build/website-known-missing-files.txt diff --git a/make/website.make b/make/website.make index e05aa8ff9d..5c0528aec9 100644 --- a/make/website.make +++ b/make/website.make @@ -68,6 +68,7 @@ website-xrefs: website-version -I $(top-src-dir)/Documentation \ -I $(top-src-dir)/Documentation/"$$l" \ -I $(OUT) -o $(OUT) --split=node \ + --known-missing-files=$(top-src-dir)/scripts/build/website-known-missing-files.txt \ $(top-src-dir)/Documentation/"$$l"/web.texi ;\ for m in $(MANUALS); do \ n=`echo "$$m" | sed 's/Documentation/Documentation\/'$$l'/'` ; \ @@ -78,6 +79,7 @@ website-xrefs: website-version -I $(top-src-dir)/Documentation \ -I $(top-src-dir)/Documentation/"$$l" \ -I $(top-src-dir)/Documentation/"$$l"/"$$d" \ + --known-missing-files=$(top-src-dir)/scripts/build/website-known-missing-files.txt \ -I $(OUT) -o $(OUT) "$$n" ; \ fi ; \ done; \ diff --git a/scripts/build/extract_texi_filenames.py b/scripts/build/extract_texi_filenames.py index fda8fc1d61..fcb464d53d 100644 --- a/scripts/build/extract_texi_filenames.py +++ b/scripts/build/extract_texi_filenames.py @@ -37,7 +37,8 @@ import getopt options_list, files = getopt.getopt (sys.argv[1:],'o:s:hI:m:', ['output=', 'split=', 'help', 'include=', - 'master-map-file=']) + 'master-map-file=', + 'known-missing-files=']) help_text = r"""Usage: %(program_name)s [OPTIONS]... TEXIFILE... Extract files names for texinfo (sub)sections from the texinfo files. @@ -49,6 +50,8 @@ Options: -o, --output=DIRECTORY write .xref-map files to DIRECTORY -s, --split=MODE split manual according to MODE. Possible values are section and custom (default) + --known-missing-files a filename which has a list of files known + to be missing for this make """ def help (text): @@ -59,6 +62,8 @@ outdir = '.' split = "custom" include_path = ['.',] master_map_file = '' +known_missing_files = [] +known_missing_files_file = '' initial_map = {} for opt in options_list: o = opt[0] @@ -77,9 +82,18 @@ for opt in options_list: elif o == '-m' or o == '--master-map-file': if os.path.isfile (a): master_map_file = a + elif o == '--known-missing-files': + if os.path.isfile (a): + known_missing_files_file = a + else: + print 'Missing files list file not found: ', a else: raise Exception ('unknown option: ' + o) +if known_missing_files_file: + missing_files = open (known_missing_files_file, 'r') + known_missing_files = missing_files.read().splitlines() + missing_files.close() if not os.path.isdir (outdir): if os.path.exists (outdir): @@ -104,8 +118,10 @@ def expand_includes (m, filename): filepath = os.path.join (directory, include_name) if os.path.exists (filepath): return extract_sections (filepath)[1] - print 'No such file: ' + include_name - print 'Search path: ' + ':'.join (include_path) + if not (include_name in known_missing_files): + # Not found + print 'No such file: ' + include_name + print 'Search path: ' + ':'.join (include_path) return '' lang_re = re.compile (r'^@documentlanguage (.+)', re.M) diff --git a/scripts/build/website-known-missing-files.txt b/scripts/build/website-known-missing-files.txt new file mode 100644 index 0000000000..4f4cd85bb0 --- /dev/null +++ b/scripts/build/website-known-missing-files.txt @@ -0,0 +1,39 @@ +ancient-notation.itely +chords.itely +colorado.itexi +computer-notation.itexi +context-properties.tely +contexts-and-engravers.itely +editorial-annotations.itely +engravingbib.itexi +expressive-marks.itely +fretted-strings.itely +identifiers.tely +keyboards.itely +layout-properties.tely +learning/scheme-tutorial.itely +learning/working.itely +markup-commands.tely +markup-list-commands.tely +midi.itely +notation/programming-interface.itely +others-did.itexi +paper-and-layout.itely +percussion.itely +pitches.itely +repeats.itely +rhythms.itely +scheme-functions.tely +simultaneous-notes.itely +spacing.itely +staff-notation.itely +template.itely +text.itely +titles.itely +tweaks-and-overrides.itely +type-predicates.tely +unfretted-strings.itely +vocal-music.itely +we-wrote.itexi +winds.itely +world-music.itely -- 2.39.2