X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fbuild%2Fwww_post.py;h=c62e02145a10001ce095d73b851be94d7f5e6a7d;hb=46e296f5381495ce30108aa981e549d61e55a009;hp=a9ab88cd3ecbc9f2af49a86ec971313fa51f7d4e;hpb=5a8fc08a0a818031de9b3fcf79c5a6528431fa07;p=lilypond.git

diff --git a/scripts/build/www_post.py b/scripts/build/www_post.py
index a9ab88cd3e..c62e02145a 100644
--- a/scripts/build/www_post.py
+++ b/scripts/build/www_post.py
@@ -41,15 +41,29 @@ dirs, symlinks, files = mirrortree.walk_tree (
     exclude_dirs = '(^|/)((' + \
         r'po|xref-maps|out|out-test|out-cov|.*?[.]t2d|\w*?-root)|^Documentation/(' + \
         '|'.join ([l.code for l in langdefs.LANGUAGES]) + '))(/|$)',
-    find_files = r'.*?\.(?:midi|html|pdf|png|jpe?g|txt|i?ly|signature|css|zip)$|VERSION',
+    find_files = r'.*?\.(?:midi|html|pdf|png|jpe?g|txt|i?ly|signature|css|zip|js|..\.idx|php)$|VERSION',
     exclude_files = r'lily-[0-9a-f]+.*\.(pdf|txt)')
+# extra files: info and tex output from lilypond-book regtests
+extra_files = mirrortree.walk_tree (
+    tree_roots = ['input/regression/lilypond-book'],
+    process_dirs = outdir,
+    exclude_dirs = r'(^|/)(out|out-test)(/|$)',
+    find_files = r'.+\.(info|tex)$',
+    exclude_files = r'lily-[0-9a-f]+.*\.tex')[2]
+files.extend(extra_files)
 
 # actual mirrorring stuff
 html_files = []
 hardlinked_files = []
+# These whitelisted files actually do contain the string
+# 'UNTRANSLATED NODE: IGNORE ME' for documentation purposes.
+whitelisted_files = [
+    'Documentation/out-www/contributor-big-page.html',
+    'Documentation/out-www/contributor/website-build.html',
+]
 for f in files:
     if f.endswith ('.html'):
-        if not 'UNTRANSLATED NODE: IGNORE ME' in open (f).read ():
+        if f in whitelisted_files or not 'UNTRANSLATED NODE: IGNORE ME' in open (f).read ():
             html_files.append (f)
     else:
         hardlinked_files.append (f)
@@ -64,14 +78,19 @@ strip_re = re.compile (outdir + '/')
 for t in targets:
     out_root = target_pattern % t
     strip_file_name[t] = lambda s: os.path.join (target_pattern % t, (strip_re.sub ('', s)))
-    os.mkdir (out_root)
-    map (os.mkdir, [os.path.join (out_root, d) for d in dirs])
+    if not os.path.exists (out_root):
+        os.mkdir (out_root)
+    for d in dirs:
+        new_dir = os.path.join (out_root, d)
+        if not os.path.exists (new_dir):
+            os.mkdir (new_dir)
     for f in hardlinked_files:
-        os.link (f, strip_file_name[t] (f))
+        if not os.path.isfile (strip_file_name[t] (f)):
+            os.link (f, strip_file_name[t] (f))
     for l in symlinks:
         p = mirrortree.new_link_path (os.path.normpath (os.readlink (l)), os.path.dirname (l), strip_re)
         dest = strip_file_name[t] (l)
-        if not os.path.exists (dest):
+        if not os.path.lexists (dest):
             os.symlink (p, dest)