see if travis likes this?

Author: ianamason

.travis.yml

@@ -13,19 +13,19 @@ python:
 install:
   - sudo apt-get update
   - sudo apt-get install -y python-pip
-  - export LLVM_VERSION=3.4
-  - sudo apt-get install  -y llvm-${LLVM_VERSION} clang-${LLVM_VERSION} libapr1-dev libaprutil1-dev
-  - sudo apt-get install  -y dragonegg llvm-${LLVM_VERSION} llvm-gcc-4.7
+  - sudo apt-get install  -y llvm-3.5 clang-3.5 libapr1-dev libaprutil1-dev
+  # dragonegg uses 3.3
+  - sudo apt-get install  -y llvm-3.3 llvm-gcc-4.7
   - sudo pip install -e .
   - export WLLVM_HOME=`pwd`
   - export APACHE_VER=2.4.18
 
 
 # command to run tests
 script:
-  # build apache with clang (i.e. httpd-2.4.12) 
+  # build apache with clang
   - ${WLLVM_HOME}/.travis/apache_clang.sh
-  # build apache with gcc and dragonegg (i.e. httpd-2.4.12) 
+  # build apache with gcc and dragonegg
   - ${WLLVM_HOME}/.travis/apache_dragonegg.sh
 
 

.travis/apache_dragonegg.sh

@@ -4,7 +4,7 @@ set -e
 
 export dragonegg_disable_version_check=true
 
-export PATH=/usr/lib/llvm-${LLVM_VERSION}/bin:${PATH}
+export PATH=/usr/lib/llvm-3.3/bin:${PATH}
 export LLVM_COMPILER=dragonegg
 export LLVM_GCC_PREFIX=llvm-
 export LLVM_DRAGONEGG_PLUGIN=/usr/lib/gcc/x86_64-linux-gnu/4.7/plugin/dragonegg.so

setup.py

@@ -24,19 +24,21 @@
     author='Ian A. Mason, Tristan Ravitch, Dan Liew, Bruno Dutertre, ...',
     author_email='iam@csl.sri.com',
 
+
+    include_package_data=True,
+    
     packages=find_packages(exclude=['test', 'doc' ]),
 
     entry_points = {
         'console_scripts': [
+            'wllvm-as = wllvm.as:main',
             'wllvm = wllvm.wllvm:main',
             'wllvm++ = wllvm.wllvmpp:main',
             'wllvm-sanity-checker = wllvm.sanity:main',
             'extract-bc = wllvm.extractor:main',
         ],
     },
 
-
-    
     license='MIT',
 
     classifiers=[

wllvm/as

@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+"""
+This is the assembler phase.  
+
+This variant is only invoked during
+the second compilation where we are building bitcode.  The compiler
+has already been instructed to generate LLVM IR; the compiler then
+tries to assemble it into an object file.  The standard assembler
+doesn't understand LLVM bitcode, so we interpose and use the llvm-as
+command to build a bitcode file.  We leave the bitcode in place, but
+record its full absolute path in the corresponding object file
+(which was created in the first compilation phase by the real
+compiler).  We'll link this together at a later stage.
+"""
+
+from __future__ import absolute_import
+import sys
+import os
+
+from subprocess import *
+
+from wllvm.utils import *
+
+from wllvm.popenwrapper import Popen
+
+import logging
+logging.basicConfig()
+
+class BCFilter(ArgumentListFilter):
+    def __init__(self, arglist):
+        self.bcName = None
+        self.outFileName = None
+        localCallbacks = { '-o' : (1, BCFilter.outFileCallback) }
+        super(BCFilter, self).__init__(arglist, exactMatches=localCallbacks)
+
+    def outFileCallback(self, flag, name):
+        self.outFileName = name
+
+def main():
+        
+    argFilter = BCFilter(sys.argv[1:])
+    # Since this is just the assembler, there should only ever be one file
+    try:
+        [infile] = argFilter.inputFiles
+    except ValueError:
+        logging.debug('Input file argument not detected, assuming stdin.')
+        infile = "-"
+
+    # set llvm-as
+    llvmAssembler='llvm-as'
+    if os.getenv(llvmCompilerPathEnv):
+        llvmAssembler = os.path.join(os.getenv(llvmCompilerPathEnv), llvmAssembler)
+
+    # Now compile this llvm assembly file into a bitcode file.  The output
+    # filename is the same as the object with a .bc appended
+    try:
+        (dirs, filename) = os.path.split(argFilter.outFileName)
+    except AttributeError as e:
+        logging.error('Output file argument not found.\nException message: ' + str(e))
+        sys.exit(1)
+
+    fakeAssembler = [llvmAssembler, infile, '-o', argFilter.outFileName]
+
+    asmProc = Popen(fakeAssembler)
+    realRet = asmProc.wait()
+
+    if realRet != 0:
+        logging.error('llvm-as failed')
+        sys.exit(realRet)
+
+    sys.exit(realRet)
+
+    
+if __name__ == '__main__':
+    sys.exit(main())

wllvm/as.py

@@ -10,11 +10,14 @@
 import re
 import sys
 import tempfile
+
+
 from .popenwrapper import Popen
 
 fullSelfPath = os.path.realpath(__file__)
 prefix = os.path.dirname(fullSelfPath)
 driverDir = prefix
+asDir = os.path.abspath(os.path.join(driverDir, '..', 'dragonegg_as')
 
 
 # Environmental variable for path to compiler tools (clang/llvm-link etc..)
@@ -600,8 +603,8 @@ def getBitcodeCompiler(self):
         cc = self.getCompiler()
         # We use '-B' to tell gcc where to look for an assembler.
         # When we build LLVM bitcode we do not want to use the GNU assembler,
-        # instead we want gcc to use our own assembler (see driver/as).
-        cmd = cc + ['-B', driverDir, '-fplugin={0}'.format(pth), '-fplugin-arg-dragonegg-emit-ir']
+        # instead we want gcc to use our own assembler (see as.py).
+        cmd = cc + ['-B', asDir, '-fplugin={0}'.format(pth), '-fplugin-arg-dragonegg-emit-ir']
         _logger.debug(cmd)
         return cmd
 

wllvm/utils.py

@@ -9,11 +9,12 @@
 1.0.0   - 8/2/2016 initial birth as a pip package.
 1.0.1   - 8/2/2016 the rst gets a make over, and doc strings 
           became more pervasive.
-
+1.0.2   - 8/2/2016 dragonegg issues. trying to include a polite 'as' wrapper
+          (i.e. not a  console_script called as).
 
 
 
 
 """
-wllvm_version='1.0.1'
+wllvm_version='1.0.2'