fix library path

Author: jerch

README.md

@@ -1,7 +1,14 @@
 # python-tinycc
 
-Module to use the Tiny C Compiler for inline C in Python.
-Tested with Ubuntu 14 (x86_64), WinXP (x86) and Raspbian (Raspberry Pi 3, ARMv7).
+Module to use the Tiny C Compiler for inlining C Code in Python.
+
+Tested with:
+
+* CPython 2.7.6 and PyPy 2.2.1 Linux (both 64bit on x86_64, Ubuntu 14)
+* CPython 2.7.5 Windows (32bit on x86, Windows XP)
+* CPython 2.7.8 Windows (32bit on x86_64, Windows 10)
+* CPython 2.7.9 and PyPy 4.0.1 Linux (both 32bit on ARMv7 emulated, Raspberry Pi 3, Raspbian Jessie armhf)
+* CPython 2.7.3 Linux (32bit ARMv7, Wandboard, Ubuntu 12 armel)
 
 
 ### Get the Tiny C Compiler
@@ -77,6 +84,7 @@ Example with inline code:
 See the example files for more usage ideas.
 
 ### TODO
+* rework error handling
 * Testing
 * Python 3 support
 * PyPI package

tinycc.py

@@ -73,8 +73,9 @@
     ctypes.c_void_p: 'void *'
 })
 
-TCCPATH = os.path.abspath('./linux/lib/tcc')
-TCCLIB = os.path.abspath('./linux/lib/libtcc.so')
+MODULEDIR = os.path.dirname(__file__)
+TCCPATH = os.path.join(MODULEDIR, './linux/lib/tcc')
+TCCLIB = os.path.join(MODULEDIR, './linux/lib/libtcc.so')
 OUTPUT_TYPES = {
     'memory': 1,
     'exe'   : 2,
@@ -84,8 +85,8 @@
 WINDOWS = False
 if sys.platform == 'win32':
     WINDOWS = True
-    TCCPATH = os.path.abspath('win32')
-    TCCLIB = os.path.abspath('win32\libtcc.dll')
+    TCCPATH = os.path.join(MODULEDIR, 'win32')
+    TCCLIB = os.path.join(MODULEDIR, 'win32\libtcc.dll')
 
 
 # tcc error function type
@@ -411,6 +412,8 @@ def _set_output(self, output):
 
     def _error(self):
         def cb(_, msg):
+            # TODO: better error msg handling
+            print 'tcc:', msg
             self.error_message = msg
         self._error_function = ERROR_FUNC(cb)
         return self._error_function
@@ -614,13 +617,7 @@ def run(self, arguments):
         argc = len(arguments)
         argv = (ctypes.POINTER(ctypes.c_char) * argc)()
         argv[:] = [ctypes.create_string_buffer(s) for s in arguments]
-        result = self.tcc.lib.tcc_run(self.ctx, argc, argv)
-        if self.error_message:
-            msg = self.error_message
-            self.error_message = ''
-            raise TccException('\nrun error\n' + msg)
-        self._run = True
-        return result
+        return self.tcc.lib.tcc_run(self.ctx, argc, argv)
 
 
 class TinyCC(object):