Updates to the build system.

Linking against the library works, but importing spidermonkey kills the Python
VM because of an unresolved symbol. Can't figure out if this is just OS X's
build of libmozjs or if I'm missing a flag.

[#12]

Author: Paul Davis

setup.py

@@ -24,6 +24,7 @@
 # libc = ctypes.CDLL("libc.dylib")
 # libc.siginterrupt(signal.SIGCHLD, 0)
 
+import glob
 import os
 import subprocess as sp
 import sys
@@ -33,77 +34,118 @@
 from setuptools import setup, Extension
 
 DEBUG = "--debug" in sys.argv
-
-def find_sources(extensions=[".c", ".cpp"]):
-    ret = []
-    for dpath, dnames, fnames in os.walk("./spidermonkey"):
-        for fname in fnames:
-            if os.path.splitext(fname)[1] in extensions:
-                ret.append(os.path.join(dpath, fname))
-    return ret
-
-def nspr_config():
-    pipe = sp.Popen("nspr-config --cflags --libs",
+USE_SYSTEM_LIB = "--system-library" in sys.argv
+
+def find_sources(extensions=(".c", ".cpp")):
+    if USE_SYSTEM_LIB:
+        return [
+            fname
+            for ext in extensions
+            for fname in glob.glob("spidermonkey/*" + ext)
+        ]
+    else:
+        return [
+            os.path.join(dpath, fname)
+            for (dpath, dnames, fnames) in os.walk("./spidermonkey")
+            for fname in fnames
+            if fname.endswith(extensions)
+        ]
+
+def pkg_config(pkg_name, config=None):
+    pipe = sp.Popen("pkg-config --cflags --libs %s" % pkg_name,
                         shell=True, stdout=sp.PIPE, stderr=sp.PIPE)
     (stdout, stderr) = pipe.communicate()
     if pipe.wait() != 0:
-        raise RuntimeError("Failed to get nspr config.")
-    bits = stdout.split()
-    ret = {
-        "include_dirs": [],
-        "library_dirs": [],
-        "libraries": [],
-        "extra_compile_args": [],
-        "extra_link_args": []
-    }
-    prfx = {
+        raise RuntimeError("No package configuration found for: %s" % pkg_name)
+    if config is None:
+        config = {
+            "include_dirs": [],
+            "library_dirs": [],
+            "libraries": [],
+            "extra_compile_args": [],
+            "extra_link_args": []
+        }
+    prefixes = {
         "-I": ("include_dirs", 2),
         "-L": ("library_dirs", 2),
         "-l": ("libraries", 2),
+        "-D": ("extra_compile_args", 0),
         "-Wl": ("extra_link_args", 0)
     }
-    for b in bits:
-        for p in prfx:
-            if b.startswith(p):
-                name, trim = prfx[p]
-                ret[name].append(b[trim:])
-    return ret
+    for flag in stdout.split():
+        for prefix in prefixes:
+            if not flag.startswith(prefix):
+                continue
+            # Hack for xulrunner
+            if flag.endswith("/stable"):
+                flag = flag[:-6] + "unstable"
+            name, trim = prefixes[prefix]
+            config[name].append(flag[trim:])
+    return config
+
+def nspr_config(config=None):
+    return pkg_config("nspr", config)
+
+def js_config(config=None):
+    config = pkg_config("mozilla-js", config)
+    if "-DJS_THREADSAFE" not in config["extra_compile_args"]:
+        raise SystemError("Unable to link against a library that was "
+            "compiled without -DJS_THREADSAFE");
+    return config
 
 def platform_config():
     sysname = os.uname()[0]
     machine = os.uname()[-1]
-   
-    config = nspr_config()
-    config["include_dirs"].append("spidermonkey/%s-%s" % (sysname, machine))
-    config["extra_compile_args"].extend([
-        "-DJS_THREADSAFE",
-        "-DPOSIX_SOURCE",
-        "-D_BSD_SOURCE",
-        "-Wno-strict-prototypes"
-    ])
+
+    # If we're linking against a system library it should give
+    # us all the information we need.
+    if USE_SYSTEM_LIB:
+        return js_config()
+    
+    # Build our configuration
+    config = {
+        "extra_compile_args": [
+            "-DJS_THREADSAFE",
+            "-DPOSIX_SOURCE",
+            "-D_BSD_SOURCE",
+            "-Wno-strict-prototypes" # Disable copius JS warnings
+        ],
+        "include_dirs": [
+            "spidermonkey/libjs",
+            "spidermonkey/%s-%s" % (sysname, machine)
+        ],
+        "library_dirs": [],
+        "libraries": [],
+        "extra_link_args": []
+    }
+
+    # Debug builds are useful for finding errors in
+    # the request counting semantics for Spidermonkey
     if DEBUG:
         config["extra_compile_args"].extend([
             "-UNDEBG",
             "-DDEBUG",
             "-DJS_PARANOID_REQUEST"
         ])
 
-
     if sysname in ["Linux", "FreeBSD"]:
         config["extra_compile_args"].extend([
             "-DHAVE_VA_COPY",
             "-DVA_COPY=va_copy"
-            ])
+        ])
 
+    # Currently no suppot for Win32, patches welcome.
     if sysname in ["Darwin", "Linux", "FreeBSD"]:
         config["extra_compile_args"].append("-DXP_UNIX")
     else:
         raise RuntimeError("Unknown system name: %s" % sysname)
 
-    return config
+    return nspr_config(config=config)
 
 Distribution.global_options.append(("debug", None,
-                    "Build a DEBUG version of spidermonkey"))
+                    "Build a DEBUG version of spidermonkey."))
+Distribution.global_options.append(("system-library", None,
+                    "Link against an installed system library."))
 
 setup(
     name = "python-spidermonkey",

spidermonkey/context.c

@@ -10,8 +10,8 @@
 
 #include <time.h> // After spidermonkey.h so after Python.h
 
-#include "libjs/jsobj.h"
-#include "libjs/jscntxt.h"
+#include <jsobj.h>
+#include <jscntxt.h>
 
 JSBool
 get_prop(JSContext* jscx, JSObject* jsobj, jsval key, jsval* rval)

spidermonkey/jsobject.c

@@ -7,7 +7,7 @@
  */
 
 #include "spidermonkey.h"
-#include "libjs/jsobj.h"
+#include <jsobj.h>
 
 PyObject*
 make_object(PyTypeObject* type, Context* cx, jsval val)

spidermonkey/pyobject.c

@@ -7,7 +7,7 @@
  */
 
 #include "spidermonkey.h"
-#include "libjs/jsobj.h"
+#include <jsobj.h>
 
 /*
     This is a fairly unsafe operation in so much as

spidermonkey/runtime.h

@@ -12,7 +12,7 @@
 #include <Python.h>
 #include "structmember.h"
 
-#include "libjs/jsapi.h"
+#include <jsapi.h>
 
 typedef struct {
     PyObject_HEAD

spidermonkey/spidermonkey.h

@@ -12,7 +12,7 @@
 #include <Python.h>
 #include "structmember.h"
 
-#include "libjs/jsapi.h"
+#include <jsapi.h>
 
 #include "runtime.h"
 #include "context.h"