Convert tabs to spaces

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-04-04 23:24:01 +00:00
parent e65b007a40
commit ba91908eec

64
wscript
View File

@@ -39,54 +39,54 @@ def options(opt):
def configure(conf):
if sys.platform == 'win32':
conf.env['MSVC_VERSIONS'] = ['msvc 9.0']
conf.env['MSVC_TARGETS'] = ['x86']
conf.load('msvc python')
conf.env['MSVC_VERSIONS'] = ['msvc 9.0']
conf.env['MSVC_TARGETS'] = ['x86']
conf.load('msvc python')
pass
else:
conf.load('compiler_cc compiler_cxx python')
if conf.options.python:
conf.env.PYTHON = [conf.options.python]
conf.env.PYTHON = [conf.options.python]
conf.check_python_headers()
conf.check_python_version(minver=(2,7,0))
# fetch and save the debug option
conf.env.debug = conf.options.debug
# Ensure that the headers in siplib and Phoenix's src dir can be found
conf.env.INCLUDES_WXPY = ['sip/siplib', 'src']
if sys.platform == 'win32':
# Windows/MSVC specific stuff
cfg.finishSetup(debug=conf.env.debug)
conf.env.INCLUDES_WX = cfg.includes
conf.env.DEFINES_WX = cfg.wafDefines
conf.env.DEFINES_WX = cfg.wafDefines
conf.env.CFLAGS_WX = cfg.cflags
conf.env.CXXFLAGS_WX = cfg.cflags
conf.env.LIBPATH_WX = cfg.libdirs
conf.env.LIB_WX = cfg.libs
conf.env.LIBFLAGS_WX = cfg.lflags
conf.env.LIBPATH_WX = cfg.libdirs
conf.env.LIB_WX = cfg.libs
conf.env.LIBFLAGS_WX = cfg.lflags
_copyEnvGroup(conf.env, '_WX', '_WXADV')
conf.env.LIB_WXADV += cfg.makeLibName('adv')
else:
# Configuration stuff for non-Windows ports using wx-config
# Check wx-config exists and fetch some values from it
conf.env.wx_config = conf.options.wx_config
conf.check_cfg(path=conf.options.wx_config, package='',
args='--cxxflags --libs core,net',
args='--cxxflags --libs core,net',
uselib_store='WX', mandatory=True)
# Run it again with different libs options to get different
# sets of flags stored to use with varous extension modules below.
conf.check_cfg(path=conf.options.wx_config, package='',
args='--cxxflags --libs adv,core,net',
uselib_store='WXADV', mandatory=True)
conf.check_cfg(path=conf.options.wx_config, package='',
args='--cxxflags --libs adv,core,net',
uselib_store='WXADV', mandatory=True)
# NOTE: This assumes that if the platform is not win32 (from
@@ -110,7 +110,7 @@ def configure(conf):
# Add basic debug info for all builds
conf.env.CFLAGS_WXPY.append('-g')
conf.env.CXXFLAGS_WXPY.append('-g')
# And if --debug is set turn on more detailed debug info and turn off optimization
if conf.env.debug:
conf.env.CFLAGS_WXPY.extend(['-ggdb', '-O0'])
@@ -130,15 +130,15 @@ def configure(conf):
conf.env.CC = cfg.CC.split()
if cfg.CXX:
conf.env.CXX = cfg.CXX.split()
# Some Mac-specific stuff
if sys.platform == 'darwin':
conf.env.MACOSX_DEPLOYMENT_TARGET = "10.4" # should we bump this to 10.5?
if conf.options.mac_arch:
conf.env.ARCH_WXPY = conf.options.mac_arch.split(',')
#import pprint
#pprint.pprint( [(k, conf.env[k]) for k in conf.env.keys()] )
@@ -152,7 +152,7 @@ def build(bld):
# found.
thisdir = os.path.abspath(".")
sys.path.insert(0, thisdir)
from distutils.file_util import copy_file
from distutils.dir_util import mkpath
from distutils.dep_util import newer, newer_group
@@ -164,7 +164,7 @@ def build(bld):
mkpath('license')
for filename in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
copy_file(opj(cfg.WXDIR, 'docs', filename), opj('license',filename), update=1, verbose=1)
# create the package's __version__ module
open(opj(cfg.PKGDIR, '__version__.py'), 'w').write(
"# This file was generated by Phoenix's wscript.\n\n"
@@ -182,8 +182,8 @@ def build(bld):
# copy __init__.py
copy_file('src/__init__.py', cfg.PKGDIR, update=1, verbose=1)
# Create the build tasks for each of our extension modules.
siplib = bld(
features = 'c cxx cshlib cxxshlib pyext',
@@ -211,8 +211,8 @@ def build(bld):
uselib = 'WX WXPY',
)
makeExtCopyRule(bld, '_core')
etg = loadETG('etg/_adv.py')
dataview = bld(
features = 'c cxx cxxshlib pyext',
@@ -231,7 +231,7 @@ def build(bld):
uselib = 'WXADV WXPY',
)
makeExtCopyRule(bld, '_dataview')
#-----------------------------------------------------------------------------
# helpers
@@ -278,5 +278,5 @@ def _copyEnvGroup(env, srcPostfix, destPostfix):
if key.endswith(srcPostfix):
newKey = key[:-len(srcPostfix)] + destPostfix
env[newKey] = copy.copy(env[key])
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------