major structural pipification over, debugging ahead.

Author: ianamason

LICENSE

@@ -1,3 +1,4 @@
+Copyright (c) 2013-2016 Ian A. Mason, Tristan Ravitch, Bruno Dutertre
 Copyright (c) 2011-2013 Tristan Ravitch
 Copyright (c) 2013 Ben Liblit, Daniel Liew
 

README.md

@@ -92,8 +92,10 @@ Building a bitcode module with clang
     # Produces pkg-config.bc
     extract-bc pkg-config
 
-A gentler set of instructions on building apache can be found
-[here.](https://github.com/SRI-CSL/whole-program-llvm/blob/master/tutorial.md)
+A gentler set of instructions on building apache in a vagrant Ubuntu 14.04 can be found
+[here,](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial.md) and
+for Ubuntu 16.04
+[here.](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial-ubuntu-16.04.md)
 
 Building a bitcode module with dragonegg
 ========================================
@@ -129,7 +131,7 @@ Building an Operating System
 ============================
 
 To see how to build freeBSD 10.0 from scratch check out this 
-[guide.](../master/README-freeBSD.md)
+[guide.](../master/doc/tutorial-freeBSD.md)
 
 
 Configuring without building bitcode

sanity/__init__.py

@@ -22,7 +22,11 @@ that contains a section called __llvm_bc.
 """
 
 import sys
-from driver.extraction import *
 
-if __name__ == '__main__':
-    sys.exit(extraction(sys.argv))
+sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
+
+from wllvm.extraction import *
+
+def main():
+    return extraction(sys.argv)
+

extract-bc renamed to wllvm/extract-bc

@@ -16,6 +16,12 @@
 prefix = os.path.dirname(fullSelfPath)
 driverDir = prefix
 
+# Freeping Creaturism:
+#
+# this is the all important version number used by pip.
+#
+#
+wllvm_version='1.0.0.dev0'
 
 
 # Environmental variable for path to compiler tools (clang/llvm-link etc..)

wllvm/utils.py

@@ -12,13 +12,21 @@ linked into a library or executable.
 
 import sys
 import os
-from driver.utils import *
-import driver.logconfig
 
-cmd = list(sys.argv)
-cmd = cmd[1:]
+sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
 
-builder = getBuilder(cmd, False)
-buildObject(builder)
-if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
-    buildAndAttachBitcode(builder)
+
+from wllvm.utils import *
+import wllvm.logconfig
+
+
+def main():
+    cmd = list(sys.argv)
+    cmd = cmd[1:]
+
+    builder = getBuilder(cmd, False)
+    buildObject(builder)
+    if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
+        buildAndAttachBitcode(builder)
+
+    return 0

pwllvm renamed to wllvm/wllvm

@@ -10,8 +10,11 @@ into a library or executable.
 
 import sys
 import os
-from driver.utils import *
-import driver.logconfig
+
+sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
+
+from wllvm.utils import *
+import wllvm.logconfig
 
 cmd = list(sys.argv)
 cmd = cmd[1:]

pwllvm++ renamed to wllvm/wllvm++

@@ -7,14 +7,14 @@ Hopefully never dumping a python stack trace.
 """
 
 import sys
-from sanity.checker import *
 
-def main(args):
-    return Checker().check()
+sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
+
+from wllvm.checker import *
 
+def main():
+    return Checker().check()
 
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))