Merge with master

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index 56e7b1bceee671fcac23f5ebfa08ef389e227a83..686993e5d87165b69c131aa33e7b1ca141eb22b8 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -69,12 +69,11 @@ def command_name (cmd):
     cmd = re.match ('([\(\)]*)([^\\\ ]*)', cmd).group (2)
     return os.path.basename (cmd)
 
-def system (cmd,
-            ignore_error=False,
-            progress_p=True,
-            be_verbose=False,
-            log_file=None):
-    
+def subprocess_system (cmd,
+                       ignore_error=False,
+                       progress_p=True,
+                       be_verbose=False,
+                       log_file=None):
     import subprocess
 
     show_progress= progress_p 
@@ -124,6 +123,42 @@ def system (cmd,
 
     return abs (retval)
 
+def ossystem_system (cmd,
+                     ignore_error=False,
+                     progress_p=True,
+                     be_verbose=False,
+                     log_file=None):
+
+
+    name = command_name (cmd)
+    if be_verbose:
+       show_progress = 1
+       progress (_ ("Invoking `%s\'") % cmd)
+    else:
+       progress ( _("Running %s...") % name)
+
+    retval = os.system (cmd)
+    if retval:
+       print >>sys.stderr, 'command failed:', cmd
+       if retval < 0:
+           print >>sys.stderr, "Child was terminated by signal", -retval
+       elif retval > 0:
+           print >>sys.stderr, "Child returned", retval
+
+       if ignore_error:
+           print >>sys.stderr, "Error ignored"
+       else:
+           sys.exit (1)
+
+    return abs (retval)
+
+
+system = subprocess_system
+if sys.platform == 'mingw32':
+    
+    ## subprocess x-compile doesn't work.
+    system = ossystem_system
+
 def strip_extension (f, ext):
     (p, e) = os.path.splitext (f)
     if e == ext:
@@ -165,7 +200,7 @@ class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
                               metavar)
 
     def format_usage(self, usage):
-        return _("Usage: %s\n") % usage
+        return _("Usage: %s") % usage + '\n'
 
     def format_description(self, description):
        return description