enable new llvm-config on Windows and update changelog

CHANGELOG

@@ -1,3 +1,8 @@
+2013-02-XX   0.11.0:
+--------------------
+  * fix Python 3 support on Windows
+
+
 2013-02-01   0.10.2:
 --------------------
   * change default to link dynamically to LLVM use:

llvm-config-win.py

@@ -1,108 +0,0 @@
-import re
-import sys
-from distutils.spawn import find_executable
-from os.path import abspath, dirname, isfile, join
-from subprocess import Popen, PIPE
-
-
-def find_llvm_tblgen():
-    path = find_executable('llvm-tblgen')
-    if path is None:
-        sys.exit('Error: could not locate llvm-tblgen')
-    return path
-
-def find_llvm_prefix():
-    return abspath(dirname(dirname(find_llvm_tblgen())))
-
-def get_llvm_version():
-    args = [find_llvm_tblgen(), '--version']
-    p = Popen(args, stdout=PIPE, stderr=PIPE)
-    stdout, stderr = p.communicate()
-    if stderr:
-        raise Exception("%r stderr is:\n%s" % (args, stderr.decode()))
-    out = stdout.decode().strip()
-    pat = re.compile(r'llvm\s+version\s+(\d+\.\d+\S*)', re.I)
-    m = pat.search(out)
-    if m is None:
-        sys.exit('Error: could not parse version in:' + out)
-    return m.group(1)
-
-def main():
-    try:
-        option = sys.argv[1]
-    except IndexError:
-        sys.exit('Error: option missing')
-
-    if option == '--version':
-        print(get_llvm_version())
-
-    elif option == '--libs':
-        # NOTE: instead of actually looking at the components requested,
-        #       we just print out a bunch of libs
-        for lib in """
-LLVMAnalysis
-LLVMAsmParser
-LLVMAsmPrinter
-LLVMBitReader
-LLVMBitWriter
-LLVMCodeGen
-LLVMCore
-LLVMExecutionEngine
-LLVMInstCombine
-LLVMInstrumentation
-LLVMInterpreter
-LLVMipa
-LLVMipo
-LLVMJIT
-LLVMLinker
-LLVMMC
-LLVMMCParser
-LLVMObject
-LLVMRuntimeDyld
-LLVMScalarOpts
-LLVMSelectionDAG
-LLVMSupport
-LLVMTarget
-LLVMTransformUtils
-LLVMVectorize
-LLVMX86AsmParser
-LLVMX86AsmPrinter
-LLVMX86CodeGen
-LLVMX86Desc
-LLVMX86Info
-LLVMX86Utils
-Advapi32
-Shell32
-""".split():
-            print('-l%s' % lib)
-        if isfile(join(find_llvm_prefix(), 'lib', 'LLVMPTXCodeGen.lib')):
-            print('-lLLVMPTXAsmPrinter')
-            print('-lLLVMPTXCodeGen')
-            print('-lLLVMPTXDesc')
-            print('-lLLVMPTXInfo')
-        elif isfile(join(find_llvm_prefix(), 'lib', 'LLVMNVPTXCodeGen.lib')):
-            print('-lLLVMNVPTXAsmPrinter')
-            print('-lLLVMNVPTXCodeGen')
-            print('-lLLVMNVPTXDesc')
-            print('-lLLVMNVPTXInfo')
-
-    elif option == '--includedir':
-        incdir = join(find_llvm_prefix(), 'include')
-        path = join(incdir, 'llvm' , 'BasicBlock.h')
-        if not isfile(path):
-            sys.exit('Error: no file: %r' % path)
-        print(incdir)
-
-    elif option == '--libdir':
-        libdir = join(find_llvm_prefix(), 'lib')
-        path = join(libdir, 'LLVMCore.lib')
-        if not isfile(path):
-            sys.exit('Error: no file: %r' % path)
-        print(libdir)
-
-    else:
-        sys.exit('Unrecognized llvm-config option %r' % option)
-
-
-if __name__ == '__main__':
-    main()

llvm-config-win32.py

@@ -1,24 +1,43 @@
+import re
 import sys
-import os
+from distutils.spawn import find_executable
+from os.path import abspath, dirname, isfile, join
+from subprocess import Popen, PIPE
 
 
-def find_path_of(filename, envvar='PATH'):
+def find_llvm_tblgen():
-    """Finds the path from $PATH where the file exists, returns None if not found."""
+    path = find_executable('llvm-tblgen')
-    pathlist = os.getenv(envvar).split(os.pathsep)
+    if path is None:
-    for path in pathlist:
+        sys.exit('Error: could not locate llvm-tblgen')
-        if os.path.exists(os.path.join(path, filename)):
+    return path
-            return os.path.abspath(path)
-    return None
 
 
-if sys.argv[1] == '--version':
+def find_llvm_prefix():
-    cmd = 'llvm-tblgen --version'
+    return abspath(dirname(dirname(find_llvm_tblgen())))
-    # Hardcoded extraction, only tested on llvm 3.1
+
-    result = os.popen(cmd).read().split('\n')[1].strip().split(' ')[2]
+
-    print(result)
+def ensure_file(path):
-elif sys.argv[1] == '--libs':
+    if not isfile(path):
+        sys.exit('Error: no file: %r' % path)
+
+
+def get_llvm_version():
+    args = [find_llvm_tblgen(), '--version']
+    p = Popen(args, stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    if stderr:
+        raise Exception("%r stderr is:\n%s" % (args, stderr.decode()))
+    out = stdout.decode().strip()
+    pat = re.compile(r'llvm\s+version\s+(\d+\.\d+\S*)', re.I)
+    m = pat.search(out)
+    if m is None:
+        sys.exit('Error: could not parse version in:' + out)
+    return m.group(1)
+
+
+def libs_options():
     # NOTE: instead of actually looking at the components requested,
-    #       we just spit out a bunch of libs
+    #       we just print out a bunch of libs
     for lib in """
 LLVMAnalysis
 LLVMAsmParser
@@ -55,32 +74,45 @@ Advapi32
 Shell32
 """.split():
         print('-l%s' % lib)
-    llvmbin = find_path_of('llvm-tblgen.exe')
+
-    if os.path.exists(os.path.join(llvmbin, '../lib/LLVMPTXCodeGen.lib')):
+    if isfile(join(find_llvm_prefix(), 'lib', 'LLVMPTXCodeGen.lib')):
         print('-lLLVMPTXAsmPrinter')
         print('-lLLVMPTXCodeGen')
         print('-lLLVMPTXDesc')
         print('-lLLVMPTXInfo')
-    elif os.path.exists(os.path.join(llvmbin, '../lib/LLVMNVPTXCodeGen.lib')):
+
+    elif isfile(join(find_llvm_prefix(), 'lib', 'LLVMNVPTXCodeGen.lib')):
         print('-lLLVMNVPTXAsmPrinter')
         print('-lLLVMNVPTXCodeGen')
         print('-lLLVMNVPTXDesc')
         print('-lLLVMNVPTXInfo')
-elif sys.argv[1] == '--includedir':
+
-    llvmbin = find_path_of('llvm-tblgen.exe')
+
-    if llvmbin is None:
+def main():
-        raise RuntimeError('Could not find LLVM')
+    try:
-    incdir = os.path.abspath(os.path.join(llvmbin, '../include'))
+        option = sys.argv[1]
-    if not os.path.exists(os.path.join(incdir, 'llvm/BasicBlock.h')):
+    except IndexError:
-        raise RuntimeError('Could not find LLVM include dir')
+        sys.exit('Error: option missing')
-    print(incdir)
+
-elif sys.argv[1] == '--libdir':
+    if option == '--version':
-    llvmbin = find_path_of('llvm-tblgen.exe')
+        print(get_llvm_version())
-    if llvmbin is None:
+
-        raise RuntimeError('Could not find LLVM')
+    elif option == '--libs':
-    libdir = os.path.abspath(os.path.join(llvmbin, '../lib'))
+        libs_options()
-    if not os.path.exists(os.path.join(libdir, 'LLVMCore.lib')):
+
-        raise RuntimeError('Could not find LLVM lib dir')
+    elif option == '--includedir':
-    print(libdir)
+        incdir = join(find_llvm_prefix(), 'include')
-else:
+        ensure_file(join(incdir, 'llvm' , 'BasicBlock.h'))
-    raise RuntimeError('Unrecognized llvm-config command %s' % sys.argv[1])
+        print(incdir)
+
+    elif option == '--libdir':
+        libdir = join(find_llvm_prefix(), 'lib')
+        ensure_file(join(libdir, 'LLVMCore.lib'))
+        print(libdir)
+
+    else:
+        sys.exit('Unrecognized llvm-config option %r' % option)
+
+
+if __name__ == '__main__':
+    main()