spidermonkey/Linux-i686/jsautocfg.h spidermonkey/Linux-i686/jsautokw.h @@ -1,6 +1,10 @@ +import glob import sys import traceback -sys.path.insert(0, "./build/lib.macosx-10.4-i386-2.5/") + +libdirs = glob.glob("./build/lib*") +if len(libdirs) > 0: + sys.path.insert(0, libdirs[0]) def raises(fn, *args, **kwargs): try: go.py @@ -7,6 +7,7 @@ Javascript Perl module, in turn based on Mozilla's 'PerlConnect' Perl binding. """, import os +import subprocess as sp import sys import ez_setup ez_setup.use_setuptools() @@ -20,27 +21,38 @@ def find_sources(extensions=[".c", ".cpp"]): ret.append(os.path.join(dpath, fname)) return ret +def nspr_config(): + pipe = sp.Popen("nspr-config --cflags --libs", + 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": []} + prfx = {"-I": "include_dirs", "-L": "library_dirs", "-l": "libraries"} + for b in bits: + ret[prfx[b[:2]]].append(b[2:]) + return ret + def platform_config(): sysname = os.uname()[0] machine = os.uname()[-1] - - configs = { - "Darwin": { - "extra_compile_args": [ - "-DXP_UNIX", - "-DJS_THREADSAFE", - "-DPOSIX_SOURCE", - "-D_BSD_SOURCE", - "-Wno-strict-prototypes" - ], - "include_dirs": [ - "spidermonkey/%s-%s" % (sysname, machine), - "/opt/local/include/nspr" - ], - "libraries": ["nspr4"] - } - } - return configs[os.uname()[0]] + + config = nspr_config() + config["include_dirs"].append("spidermonkey/%s-%s" % (sysname, machine)) + config["extra_compile_args"] = [ + "-DJS_THREADSAFE", + "-DPOSIX_SOURCE", + "-D_BSD_SOURCE", + "-Wno-strict-prototypes" + ] + + if sysname in ["Darwin", "Linux"]: + config["extra_compile_args"].append("-DXP_UNIX") + else: + raise RuntimeError("Unknown system name: %s" % sysname) + + return config setup( name = "python-spidermonkey", setup.py @@ -2,7 +2,7 @@ URL=http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz -CFG=spidermonkey/`uname -s`-`uname -p` +CFG=spidermonkey/`uname -s`-`uname -m` DEST=spidermonkey/libjs CWD=`pwd` TMP=tmp update-libjs.sh 4b71904af8334061cc891cdd543ae3aa9a4b954f Paul Davis davisp@puny.(none) http://github.com/davisp/python-spidermonkey/commit/3b4988ad691c01f5c848cb40a6162e2c3ffddcc3 3b4988ad691c01f5c848cb40a6162e2c3ffddcc3 2009-02-27T19:49:12-08:00 2009-02-27T19:49:12-08:00 Builds on linux. Distracted by BSG. More tomorrow. 6a4808592f99e0a67f5f56a2cfa75f305b045b29 Paul Davis davisp@puny.(none)