Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-10 05:47:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'msvc14'

Browse Source
This commit is contained in:
Robin Dunn
2016-02-28 22:48:39 -08:00
parent 247ad1128d 73e5622e54
commit e07098db6d
5 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
buildbot/master.cfg
View File

@@ -89,11 +89,11 @@ c['schedulers'].append( SingleBranchScheduler(
change_filter=ChangeFilter(branch=phoenixGitBranch),
treeStableTimer=30,
builderNames=["build-win32-py27",
"build-win32-py33",
"build-win32-py34",
"build-win32-py35",
"build-win64-py27",
"build-win64-py33",
"build-win64-py34",
"build-win64-py35",
"build-osx-py27",
"build-osx-py34",
"build-osx-py35",
@@ -111,11 +111,11 @@ c['schedulers'].append( Nightly(
"dist-osx-py34",
"dist-osx-py35",
"dist-win32-py27",
"dist-win32-py33",
"dist-win32-py34",
"dist-win32-py35",
"dist-win64-py27",
"dist-win64-py33",
"dist-win64-py34",
"dist-win64-py35",
]))
c['schedulers'].append( Nightly(
@@ -128,11 +128,11 @@ c['schedulers'].append( Nightly(
c['schedulers'].append( ForceScheduler(
name='sched-force',
builderNames=["build-win32-py27",
"build-win32-py33",
"build-win32-py34",
"build-win32-py35",
"build-win64-py27",
"build-win64-py33",
"build-win64-py34",
"build-win64-py35",
"build-osx-py27",
"build-osx-py34",
"build-osx-py35",
@@ -142,11 +142,11 @@ c['schedulers'].append( ForceScheduler(
"dist-osx-py34",
"dist-osx-py35",
"dist-win32-py27",
"dist-win32-py33",
"dist-win32-py34",
"dist-win32-py35",
"dist-win64-py27",
"dist-win64-py33",
"dist-win64-py34",
"dist-win64-py35",
"build-docs",
]))
@@ -247,26 +247,26 @@ c['builders'] = [
slavenames=["win7-py27"],
factory=makeFactory('win32', pyVer='2.7')),
BuilderConfig(name="build-win32-py33",
slavenames=["win7-py27"],
factory=makeFactory('win32', pyVer='3.3')),
BuilderConfig(name="build-win32-py34",
slavenames=["win7-py27"],
factory=makeFactory('win32', pyVer='3.4')),
BuilderConfig(name="build-win32-py35",
slavenames=["win7-py27"],
factory=makeFactory('win32', pyVer='3.5')),
BuilderConfig(name="build-win64-py27",
slavenames=["win7-py27"],
factory=makeFactory('win64', pyVer='2.7')),
BuilderConfig(name="build-win64-py33",
slavenames=["win7-py27"],
factory=makeFactory('win64', pyVer='3.3')),
BuilderConfig(name="build-win64-py34",
slavenames=["win7-py27"],
factory=makeFactory('win64', pyVer='3.4')),
BuilderConfig(name="build-win64-py35",
slavenames=["win7-py27"],
factory=makeFactory('win64', pyVer='3.5')),
BuilderConfig(name="build-gtk-py27",
@@ -302,26 +302,26 @@ c['builders'] = [
slavenames=["win7-py27"],
factory=makeFactory('win32', 'dist', pyVer='2.7')),
BuilderConfig(name="dist-win32-py33",
slavenames=["win7-py27"],
factory=makeFactory('win32', 'dist', pyVer='3.3')),
BuilderConfig(name="dist-win32-py34",
slavenames=["win7-py27"],
factory=makeFactory('win32', 'dist', pyVer='3.4')),
BuilderConfig(name="dist-win32-py35",
slavenames=["win7-py27"],
factory=makeFactory('win32', 'dist', pyVer='3.5')),
BuilderConfig(name="dist-win64-py27",
slavenames=["win7-py27"],
factory=makeFactory('win64', 'dist', pyVer='2.7')),
BuilderConfig(name="dist-win64-py33",
slavenames=["win7-py27"],
factory=makeFactory('win64', 'dist', pyVer='3.3')),
BuilderConfig(name="dist-win64-py34",
slavenames=["win7-py27"],
factory=makeFactory('win64', 'dist', pyVer='3.4')),
BuilderConfig(name="dist-win64-py35",
slavenames=["win7-py27"],
factory=makeFactory('win64', 'dist', pyVer='3.5')),
]

2
buildtools/build_wxwidgets.py
View File

@@ -71,6 +71,8 @@ def getVisCVersion():
return '90'
if 'Version 16' in text:
return '100'
if 'Version 19' in text:
return '140'
# TODO: Add more tests to get the other versions...
else:
return 'FIXME'

5
buildtools/config.py
View File

@@ -787,9 +787,10 @@ def runcmd(cmd, getOutput=False, echoCmd=True, fatal=True):
output = None
if getOutput:
outputEncoding = 'cp1252' if sys.platform == 'win32' else 'utf-8'
output = sp.stdout.read()
if sys.version_info > (3,):
output = output.decode('utf-8') # TODO: is utf-8 okay here?
output = output.decode(outputEncoding)
output = output.rstrip()
rval = sp.wait()
@@ -850,6 +851,8 @@ def getVisCVersion():
return '90'
if 'Version 16' in text:
return '100'
if 'Version 19' in text:
return '140'
# TODO: Add more tests to get the other versions...
else:
return 'FIXME'

2
demo/Main.py
View File

@@ -2927,7 +2927,7 @@ class MyApp(wx.App, wx.lib.mixins.inspection.InspectionMixin):
def OnInit(self):
# Check runtime version
if LooseVersion(version.VERSION_STRING) >= LooseVersion(wx.VERSION_STRING):
if LooseVersion(version.VERSION_STRING) != LooseVersion(wx.VERSION_STRING):
wx.MessageBox(caption="Warning",
message="You're using version %s of wxPython, but this copy of the demo was written for version %s.\n"
"There may be some version incompatibilities..."

11
wscript
View File

@@ -68,12 +68,8 @@ def configure(conf):
# version. We have a chicken-egg problem here. The compiler needs to
# be selected before the Python stuff can be configured, but we need
# Python to know what version of the compiler to use.
# TODO: Fix this
msvc_version = '9.0' #conf.options.msvc_ver
if conf.options.python and ('33' in conf.options.python or
'34' in conf.options.python):
msvc_version = '10.0'
import distutils.msvc9compiler
msvc_version = str( distutils.msvc9compiler.get_build_version() )
conf.env['MSVC_VERSIONS'] = ['msvc ' + msvc_version]
conf.env['MSVC_TARGETS'] = [conf.options.msvc_arch]
conf.load('msvc')
@@ -616,7 +612,8 @@ def copyFileToPkg(task):
from buildtools.config import opj
src = task.inputs[0].abspath()
tgt = task.outputs[0].abspath()
task.exec_command('touch %s' % tgt)
#task.exec_command('touch %s' % tgt)
open(tgt, "wb").close() # 'touch'
tgt = opj(cfg.PKGDIR, os.path.basename(src))
copy_file(src, tgt, verbose=1)
return 0