mdwsetup.py (pkg_config): Rearrange and reformat.

[runlisp] / mdwsetup.py

diff --git a/mdwsetup.py b/mdwsetup.py
index 6acbdb6f45eeef5d61723d936f01202654fcefe9..45772fb6f3a70a7ecff1040501747973f650a62a 100644 (file)
--- a/mdwsetup.py
+++ b/mdwsetup.py
@@ -76,12 +76,10 @@ def progoutput(command):
   kid = SUB.Popen(command, stdout = SUB.PIPE)
   out = kid.stdout.readline()
   junk = kid.stdout.read()
   kid = SUB.Popen(command, stdout = SUB.PIPE)
   out = kid.stdout.readline()
   junk = kid.stdout.read()

-  if junk != '':
-    raise ValueError, \
-          "Child process `%s' produced unspected output %r" % (command, junk)
+  if junk != '': raise ValueError \
+    ("Child process `%s' produced unspected output %r" % (command, junk))

   rc = kid.wait()
   rc = kid.wait()

-  if rc != 0:
-    raise SubprocessFailure, (command, rc)
+  if rc != 0: raise SubprocessFailure(command, rc)

   return out.rstrip('\n')
 
 ###--------------------------------------------------------------------------
   return out.rstrip('\n')
 
 ###--------------------------------------------------------------------------


@@ -99,22 +97,21 @@ def pkg_config(pkg, version):
   library-directory names are in LIBDIRS; and the library names themselves
   are in LIBS.
   """
   library-directory names are in LIBDIRS; and the library names themselves
   are in LIBS.
   """

-  spec = '%s >= %s' % (pkg, version)
+

   def weird(what, word):
   def weird(what, word):

-    raise ValueError, \
-          "Unexpected `%s' item `%s' from package `%s'" % (what, word, pkg)
+    raise ValueError \
+      ("Unexpected `%s' item `%s' from package `%s'" % (what, word, pkg))
+
+  spec = '%s >= %s' % (pkg, version)
+

   for word in progoutput(['pkg-config', '--cflags', spec]).split():
   for word in progoutput(['pkg-config', '--cflags', spec]).split():

-    if word.startswith('-I'):
-      INCLUDEDIRS.append(word[2:])
-    else:
-      weird('--cflags', word)
+    if word.startswith('-I'): INCLUDEDIRS.append(word[2:])
+    else: weird('--cflags', word)
+

   for word in progoutput(['pkg-config', '--libs', spec]).split():
   for word in progoutput(['pkg-config', '--libs', spec]).split():

-    if word.startswith('-L'):
-      LIBDIRS.append(word[2:])
-    elif word.startswith('-l'):
-      LIBS.append(word[2:])
-    else:
-      weird('--libs', word)
+    if word.startswith('-L'): LIBDIRS.append(word[2:])
+    elif word.startswith('-l'): LIBS.append(word[2:])
+    else: weird('--libs', word)

 
 ###--------------------------------------------------------------------------
 ### Substituting variables in files.
 
 ###--------------------------------------------------------------------------
 ### Substituting variables in files.


@@ -181,7 +178,7 @@ class Generate (BaseGenFile):
     temp = me.target + '.new'
     with open(temp, 'w') as ft:
       rc = SUB.call([SYS.executable, me.sources[0]], stdout = ft)
     temp = me.target + '.new'
     with open(temp, 'w') as ft:
       rc = SUB.call([SYS.executable, me.sources[0]], stdout = ft)

-    if rc != 0: raise SubprocessFailure, (me.sources[0], rc)
+    if rc != 0: raise SubprocessFailure(me.sources[0], rc << 8)

     OS.rename(temp, me.target)
 
 ## Backward compatibility.
     OS.rename(temp, me.target)
 
 ## Backward compatibility.