@@ -18,8 +18,6 @@ import wxpyfeatures from distutils.core import Extension from path import path -RELEASE_GIL = False # causes the GIL to be released before every call (slow?) -TRACE_STATEMENTS = False # emit tracing statements in all functions VERBOSE = True @@ -62,83 +60,3 @@ def manage_cache(gendir): sipconfig.inform('%d file%s changed.' % (changed_count, 's' if changed_count != 1 else '')) - -class wxpy_build_ext(sipdistutils.build_ext): - def generate_args_file(self, args): - argsfile = path(self.build_temp) / 'sipargs.txt' - - argtext = [] - for opt, arg in zip(args[::2], args[1::2]): - argtext.append(' '.join([opt, arg])) - argtext = '\n'.join(argtext) - - if not argsfile.exists() or argsfile.text() != argtext: - argsfile.write_bytes(argtext) - - return str(argsfile) - - def _sip_compile(self, sip_bin, source, sbf): - features = wxpyfeatures.emit_features_file('src/features.sip') - feature_args = itertools.chain(*(('-x', feature) - for feature, enabled in features.iteritems() if not enabled)) - - argsfile = self.generate_args_file([ - "-c", self.build_temp, - '-I', wxpyconfig.wxpy_dir / 'src', - "-b", sbf, - '-t', wxpyconfig.sip_platform] + - list(feature_args) + - list(getattr(self, 'extra_sip_includes', [])) - ) - - sip_args = [sip_bin] - - if RELEASE_GIL: - sip_args.append('-g') - if TRACE_STATEMENTS: - sip_args.append('-r') - - sip_args.extend(['-z', argsfile, source]) - self.spawn(sip_args) - - def swig_sources (self, sources, extension=None): - sources = sipdistutils.build_ext.swig_sources(self, sources, extension) - - sipconfig.inform('build_temp is %s' % self.build_temp) - manage_cache(self.build_temp) - - return sources - -def make_sip_ext(name, iface_files, include = None, libs = [], cargs = None): - cxxflags = [f for f in wxpyconfig.cxxflags if not f.startswith('-O')] - - cargs = (cargs if cargs is not None else []) + list(wxpyconfig.cxxflags) + ['-DWXPY=1'] - - - - includes = [] - if include is not None: - if isinstance(include, basestring): include = [include] - for inc in include: - includes.extend(['-I', inc]) - cargs.append('-I%s' % inc) - - largs = list(wxpyconfig.lflags) - largs.extend(libs) - - ext = Extension(name, iface_files, extra_compile_args = cargs, extra_link_args = largs) - ext.extra_sip_includes = includes - - if os.name == 'nt': - # HACK! disutils wants to include /DNDEBUG but we - # are using __WXDEBUG__, which needs it - from distutils.msvc9compiler import MSVCCompiler - old_initialize = MSVCCompiler.initialize - def new_initialize(self, plat_name=None): - res = old_initialize(self, plat_name) - if '/DNDEBUG' in self.compile_options: - self.compile_options.remove('/DNDEBUG') - return res - MSVCCompiler.initialize = new_initialize - - return ext wxpysetup.py cb110c35a3a428f46870adb8232be1cb8d94fce9 Kevin Watters kevinwatters@gmail.com http://github.com/kevinw/wxpy/commit/151cad51e9f6829d1d7610f472d2575a89efe870 151cad51e9f6829d1d7610f472d2575a89efe870 2008-08-11T15:42:53-07:00 2008-08-11T15:42:53-07:00 Removed old code. f193f56e9c9d4877f2eda37d1c45dd5766166bc7 Kevin Watters kevinwatters@gmail.com