Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-08 04:50:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Since we're running the etg scripts and sip from build.py then we don't need the distutils hacks needed to run them from setup.py. Deactivate the and just use normal distutils stuff on the generated C++ files.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-09-13 05:47:13 +00:00
parent 4ecd33b8ce
commit 2d4e4b7ca2
4 changed files with 101 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
setup.py
View File

@@ -17,7 +17,8 @@ from distutils.dir_util import mkpath
from distutils.dep_util import newer, newer_group
from distutils.spawn import spawn
from buildtools.config import Config, msg, opj, loadETG
from buildtools.config import Config, msg, opj, loadETG, \
getEtgSipCppFiles, getEtgSipHeaders
import buildtools.distutils_hacks as hacks
@@ -138,12 +139,11 @@ extensions.append(
))
etg = loadETG('etg/_core.py')
etgDepends = etg.DEPENDS + etg.OTHERDEPS
ext = Extension('_core',
#['src/core_utils.cpp'] +
etg.ETGFILES + rc_file,
depends = etgDepends,
ext = Extension('_core', getEtgSipCppFiles(etg) + rc_file,
depends = getEtgSipHeaders(etg),
include_dirs = cfg.includes,
define_macros = cfg.defines,
library_dirs = cfg.libdirs,
@@ -155,6 +155,23 @@ extensions.append(ext)
cfg.CLEANUP.append(opj(cfg.PKGDIR, 'core.py'))
#etg = loadETG('etg/_core.py')
#etgDepends = etg.DEPENDS + etg.OTHERDEPS
#ext = Extension('_core',
##['src/core_utils.cpp'] +
#etg.ETGFILES + rc_file,
#depends = etgDepends,
#include_dirs = cfg.includes,
#define_macros = cfg.defines,
#library_dirs = cfg.libdirs,
#libraries = cfg.libs,
#extra_compile_args = cfg.cflags,
#extra_link_args = cfg.lflags,
#)
#extensions.append(ext)
#cfg.CLEANUP.append(opj(cfg.PKGDIR, 'core.py'))
#----------------------------------------------------------------------
if __name__ == '__main__':
@@ -177,7 +194,7 @@ if __name__ == '__main__':
ext_modules = extensions,
options = { 'build' : BUILD_OPTIONS,
'build_ext' : {'sip_opts' : cfg.SIPOPTS },
#**'build_ext' : {'sip_opts' : cfg.SIPOPTS },
},
scripts = SCRIPTS,
@@ -189,7 +206,7 @@ if __name__ == '__main__':
'install_data' : hacks.wx_smart_install_data,
'install_headers' : hacks.wx_install_headers,
'clean' : hacks.wx_extra_clean,
'build_ext' : hacks.etgsip_build_ext,
#**'build_ext' : hacks.etgsip_build_ext,
},
)