This commit was manufactured by cvs2svn to create tag 'wxPy_2_6_4_0'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_6_4_0@44989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
@@ -17,8 +17,8 @@ import sys, os
|
||||
# The full contents of the wx.build.config module used to be located
|
||||
# here in setup.py. They were split into a separate module so it will
|
||||
# be installed with wxPython and can then be used by the build scripts
|
||||
# of other extension modules that wich to be wxPython compatible. The
|
||||
# split is still fairly new and hasn't been tested by building
|
||||
# of other extension modules that wish to be wxPython compatible.
|
||||
# The split is still fairly new and hasn't been tested by building
|
||||
# third-party extensions yet, so expect some things to still shift
|
||||
# back and forth, and also more stuff in config.py will get converted
|
||||
# to functions, etc.
|
||||
@@ -31,11 +31,12 @@ import sys, os
|
||||
|
||||
# To fully support external builds, we need to have a build options
|
||||
# file that is created whenever a new wxPython build is performed.
|
||||
# We happen to be doing that in this script, so make sure to remove
|
||||
# the build_options.py file, so that config.py will recreate it.
|
||||
# We happen to be doing that here in this script, so make sure to
|
||||
# remove the build_options.py file, so that config.py will recreate it.
|
||||
|
||||
if os.path.exists("build_options.py"):
|
||||
os.remove("build_options.py")
|
||||
for bo_name in ["build_options.py", "build_options.pyc"]:
|
||||
if os.path.exists(bo_name):
|
||||
os.remove(bo_name)
|
||||
|
||||
sys.setup_is_main = __name__ == "__main__" # an icky hack!
|
||||
from config import *
|
||||
@@ -75,6 +76,32 @@ RELEASE_NUMBER = RELEASE_VERSION # for compatibility
|
||||
CLEANUP.append('wx/__version__.py')
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Write the SWIG version to a header file
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
if USE_SWIG:
|
||||
try:
|
||||
# It may come on either stdout or stderr, depending on the
|
||||
# version, so read both.
|
||||
i, o, e = os.popen3(SWIG + ' -version', 't')
|
||||
stext = o.read() + e.read()
|
||||
import re
|
||||
match = re.search(r'[0-9]+\.[0-9]+\.[0-9]+$', stext, re.MULTILINE)
|
||||
if not match:
|
||||
raise 'NotFound'
|
||||
SVER = match.group(0)
|
||||
open('include/wx/wxPython/swigver.h', 'w').write('''\
|
||||
// This file was generated by setup.py
|
||||
|
||||
#define wxPy_SWIG_VERSION "SWIG-%s"
|
||||
''' % SVER)
|
||||
msg('Using SWIG-' + SVER)
|
||||
|
||||
except:
|
||||
msg('\nUnable to get SWIG version number\n')
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# patch distutils if it can't cope with the "classifiers" or
|
||||
# "download_url" keywords
|
||||
@@ -368,8 +395,8 @@ wxpExtensions.append(ext)
|
||||
|
||||
|
||||
mediaLibs = libs[:]
|
||||
if not MONOLITHIC and os.name == 'nt':
|
||||
mediaLibs.append(makeLibName('media')[0])
|
||||
if not MONOLITHIC:
|
||||
mediaLibs += makeLibName('media')
|
||||
swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
|
||||
USE_SWIG, swig_force, swig_args, swig_deps)
|
||||
ext = Extension('_media', swig_sources,
|
||||
@@ -450,10 +477,13 @@ if BUILD_GLCANVAS:
|
||||
USE_SWIG, swig_force, swig_args, swig_deps)
|
||||
|
||||
gl_libs = []
|
||||
gl_libdirs = libdirs[:]
|
||||
if os.name == 'posix':
|
||||
gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
|
||||
gl_lflags = gl_config.split() + lflags
|
||||
gl_libs = libs
|
||||
gl_lflags = gl_config.split()
|
||||
gl_lflags = adjustLFLAGS(gl_lflags, gl_libdirs, gl_libs)
|
||||
|
||||
|
||||
else:
|
||||
gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
|
||||
gl_lflags = lflags
|
||||
@@ -464,7 +494,7 @@ if BUILD_GLCANVAS:
|
||||
include_dirs = includes + CONTRIBS_INC,
|
||||
define_macros = defines,
|
||||
|
||||
library_dirs = libdirs,
|
||||
library_dirs = gl_libdirs,
|
||||
libraries = gl_libs,
|
||||
|
||||
extra_compile_args = cflags,
|
||||
@@ -758,7 +788,7 @@ else:
|
||||
|
||||
|
||||
if INSTALL_MULTIVERSION:
|
||||
EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS)
|
||||
EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS, shortVer=not EP_FULL_VER)
|
||||
open("src/wx.pth", "w").write(EXTRA_PATH)
|
||||
CLEANUP.append("src/wx.pth")
|
||||
else:
|
||||
@@ -796,6 +826,8 @@ if __name__ == "__main__":
|
||||
'wx',
|
||||
'wx.build',
|
||||
'wx.lib',
|
||||
'wx.lib.analogclock',
|
||||
'wx.lib.analogclock.lib_setup',
|
||||
'wx.lib.colourchooser',
|
||||
'wx.lib.editor',
|
||||
'wx.lib.floatcanvas',
|
||||
@@ -827,6 +859,21 @@ if __name__ == "__main__":
|
||||
},
|
||||
)
|
||||
|
||||
setup(name = 'wxaddons',
|
||||
version = VERSION,
|
||||
description = DESCRIPTION,
|
||||
long_description = LONG_DESCRIPTION,
|
||||
author = AUTHOR,
|
||||
author_email = AUTHOR_EMAIL,
|
||||
url = URL,
|
||||
download_url = DOWNLOAD_URL,
|
||||
license = LICENSE,
|
||||
platforms = PLATFORMS,
|
||||
classifiers = filter(None, CLASSIFIERS.split("\n")),
|
||||
keywords = KEYWORDS,
|
||||
|
||||
packages = ['wxaddons']
|
||||
)
|
||||
|
||||
if INSTALL_MULTIVERSION:
|
||||
setup(name = 'wxPython-common',
|
||||
|
||||
Reference in New Issue
Block a user