@@ -220,10 +220,14 @@ static char* keywords[] = { "bundle", "module_globals", "functionInfo", "skip_un PyObjC_HANDLER PyObjCErr_FromObjC(localException); - NS_VALUERETURN(NULL, PyObject*); + cfBundle = NULL; PyObjC_ENDHANDLER + if (cfBundle == NULL && PyErr_Occurred()) { + return NULL; + } + if (cfBundle == NULL) { PyErr_Format(PyObjCExc_Error, "Cannot convert NSBundle to CFBundle"); pyobjc/pyobjc-core/Modules/objc/bundle-variables.m @@ -243,6 +243,10 @@ PyTypeObject PyObjC_VarList_Type = { 0, /* tp_subclasses */ 0, /* tp_weaklist */ 0 /* tp_del */ +#if PY_VERSION_HEX >= 0x02060000 + , 0 /* tp_version_tag */ +#endif + }; PyObject* pyobjc/pyobjc-core/Modules/objc/varlist.m @@ -150,6 +150,11 @@ CFLAGS=[ if not os.path.exists('/usr/include/objc/runtime.h'): CFLAGS.append('-DNO_OBJC2_RUNTIME') +else: + # Force compilation with the local SDK, compilation of PyObC will result in + # a binary that runs on other releases of the OS without using a particular SDK. + CFLAGS.extend(['-isysroot', '/']) + OBJC_LDFLAGS = frameworks('CoreFoundation', 'Foundation', 'Carbon') pyobjc/pyobjc-core/setup.py bfb8ac99b29f64ca166824aeafca93b13e37621d ronaldoussoren ronaldoussoren@f55f28a5-9edb-0310-a011-a803cfcd5d25 http://github.com/orestis/pyobjc/commit/4c774378183521c4ddbaaf31f5f910b412449a46 4c774378183521c4ddbaaf31f5f910b412449a46 2009-05-14T02:05:45-07:00 2009-05-14T02:05:45-07:00 * small changes to make it possible to build using the python.org python distribution (finally...) * varlist.m: patch to get rid of a compile-time warning with Python 2.6. There are some other (harmless) warnings at the moment, I'm planning to fix them later on using the same kind of patch. In an ideal world we should be able to compile using -Werror. git-svn-id: http://svn.red-bean.com/pyobjc/trunk@2219 f55f28a5-9edb-0310-a011-a803cfcd5d25 fd4bae060abda4e6760d77c3e8ac1a7ce1ee26d3 ronaldoussoren ronaldoussoren@f55f28a5-9edb-0310-a011-a803cfcd5d25