X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-book.py;h=73b1cd9464006a9628bd5e288c0b4b03d2b29909;hb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;hp=6d424a18521c289991723363c7f04381dc8e042c;hpb=aefc5a4057a0a61f1d7e4411cc1c5061d9aea6b7;p=lilypond.git

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 6d424a1852..73b1cd9464 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -112,7 +112,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2012',
+''' % ( _ ('Copyright (c) %s by') % '2001--2015',
         '\n  '.join (authors),
         _ ("Distributed under terms of the GNU General Public License."),
         _ ("It comes with NO WARRANTY.")))
@@ -277,6 +277,11 @@ if 'bindir' in globals () and bindir:
 if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary):
     lilypond_binary = 'lilypond'
 
+# Need to shell-quote, issue 3468
+
+import pipes
+lilypond_binary = pipes.quote (lilypond_binary)
+
 global_options = None
 
 
@@ -412,7 +417,7 @@ def process_snippets (cmd, snippets,
     logfile = name.replace('.ly', '')
     file (name, 'wb').write (contents)
 
-    system_in_directory (' '.join ([cmd, ly.mkarg (name)]),
+    system_in_directory (' '.join ([cmd, ly.mkarg (name.replace (os.path.sep, '/'))]),
                          lily_output_dir,
                          logfile)
 
@@ -438,7 +443,10 @@ def split_output_files(directory):
     Return value is a set of strings.
     """
     files = []
-    for subdir in glob.glob (os.path.join (directory, '[a-f0-9][a-f0-9]')):
+    def globquote(x):
+        return re.sub ("[][*?]", r"[\g<0>]", x)
+    for subdir in glob.glob (os.path.join (globquote (directory),
+                                           '[a-f0-9][a-f0-9]')):
         base_subdir = os.path.split (subdir)[1]
         sub_files = [os.path.join (base_subdir, name)
                      for name in os.listdir (subdir)]
@@ -613,12 +621,25 @@ def do_file (input_filename, included=False):
         progress (_ ("Removing `%s'") % output_filename)
         raise BookSnippet.CompileError
 
+def adjust_include_path (path, outpath):
+    """Rewrite an include path relative to the dir where lilypond is launched.
+    Always use forward slashes since this is what lilypond expects."""
+    path = os.path.expanduser (path)
+    path = os.path.expandvars (path)
+    path = os.path.normpath (path)
+    if os.path.isabs (outpath):
+        return os.path.abspath (path).replace (os.path.sep, '/')
+    if os.path.isabs (path):
+        return path.replace (os.path.sep, '/')
+    return os.path.join (inverse_relpath (original_dir, outpath), path).replace (os.path.sep, '/')
+
 def inverse_relpath (path, relpath):
     """Given two paths, the second relative to the first,
-    return the first path relative to the second."""
+    return the first path relative to the second.
+    Always use forward slashes since this is what lilypond expects."""
     if os.path.isabs (relpath):
-        return os.path.abspath (path)
-    relparts = []
+        return os.path.abspath (path).replace (os.path.sep, '/')
+    relparts = ['']
     parts = os.path.normpath (path).split (os.path.sep)
     for part in os.path.normpath (relpath).split (os.path.sep):
         if part == '..':
@@ -627,7 +648,7 @@ def inverse_relpath (path, relpath):
         else:
             relparts.append ('..')
             parts.append (part)
-    return os.path.sep.join (relparts[::-1])
+    return '/'.join (relparts[::-1])
 
 def do_options ():
     global global_options
@@ -640,13 +661,17 @@ def do_options ():
 
     if global_options.lily_output_dir:
         global_options.lily_output_dir = os.path.expanduser (global_options.lily_output_dir)
+        for i, path in enumerate(global_options.include_path):
+            global_options.include_path[i] = adjust_include_path (path, global_options.lily_output_dir)
         global_options.include_path.insert (0, inverse_relpath (original_dir, global_options.lily_output_dir))
 
-    if global_options.output_dir:
+    elif global_options.output_dir:
         global_options.output_dir = os.path.expanduser (global_options.output_dir)
+        for i, path in enumerate(global_options.include_path):
+            global_options.include_path[i] = adjust_include_path (path, global_options.output_dir)
         global_options.include_path.insert (0, inverse_relpath (original_dir, global_options.output_dir))
 
-    global_options.include_path.insert (0, ".")
+    global_options.include_path.insert (0, "./")
 
     # Load the python packages (containing e.g. custom formatter classes)
     # passed on the command line
@@ -693,10 +718,6 @@ def main ():
 
     if global_options.process_cmd:
         includes = global_options.include_path
-        if global_options.lily_output_dir:
-            # This must be first, so lilypond prefers to read .ly
-            # files in the other lybookdb dir.
-            includes = [global_options.lily_output_dir] + includes
         global_options.process_cmd += ' '.join ([' -I %s' % ly.mkarg (p)
                                                  for p in includes])