]> git.donarmstrong.com Git - lilypond.git/commitdiff
Build updates to get rid of website warnings
authorPhil Holmes <mail@philholmes.net>
Thu, 5 May 2011 12:25:24 +0000 (13:25 +0100)
committerTrevor Daniels <t.daniels@treda.co.uk>
Mon, 9 May 2011 08:39:43 +0000 (09:39 +0100)
make/website.make
scripts/build/extract_texi_filenames.py
scripts/build/website-known-missing-files.txt [new file with mode: 0644]

index e05aa8ff9d9f770b34b9d2a9a77c949f4de54834..5c0528aec9b94834a5c4cc14565392af37611ce7 100644 (file)
@@ -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; \
index fda8fc1d6168854a39016ab2ad6f8b889dff55e6..fcb464d53d07b4ef7a99cfaccce2a0d1d1ea7cab 100644 (file)
@@ -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 (file)
index 0000000..4f4cd85
--- /dev/null
@@ -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