mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-04 11:00:07 +01:00
* Switch to Py2.7 for the default Python to build with.
* Print wx.version() from the tests to help ensure we're using the version of wxPython we thing we are. * Set the sub-release number to a larger value to help keep it separate from classic wxPython. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
4
b
4
b
@@ -2,8 +2,8 @@
|
||||
|
||||
##set -o xtrace
|
||||
|
||||
PYVER=2.6
|
||||
PYVER2=26
|
||||
PYVER=2.7
|
||||
PYVER2=27
|
||||
|
||||
if [ "$OSTYPE" = "cygwin" ]; then
|
||||
$TOOLS/python$PYVER2/python.exe -u build.py "$@"
|
||||
|
||||
4
build.py
4
build.py
@@ -18,8 +18,8 @@ from distutils.dep_util import newer, newer_group
|
||||
from buildtools.config import Config, msg, opj, posixjoin, loadETG, etg2sip
|
||||
import buildtools.version as version
|
||||
|
||||
PYVER = '2.6'
|
||||
PYSHORTVER = '26'
|
||||
PYVER = '2.7'
|
||||
PYSHORTVER = '27'
|
||||
PYTHON = 'UNKNOWN' # it will be set later
|
||||
|
||||
# wx version numbers
|
||||
|
||||
@@ -14,5 +14,5 @@
|
||||
VER_MAJOR = 2 # The first three must match wxWidgets
|
||||
VER_MINOR = 9
|
||||
VER_RELEASE = 2
|
||||
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets
|
||||
VER_SUBREL = 80 # wxPython release num for x.y.z release of wxWidgets
|
||||
VER_FLAGS = "" # release flags, such as prerelease or RC num, etc.
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import wx
|
||||
print wx.version()
|
||||
app = wx.PySimpleApp() # Should see a deprecation warning here
|
||||
frm = wx.Frame(None)
|
||||
frm.Show()
|
||||
|
||||
@@ -14,6 +14,7 @@ sys.path.insert(0, phoenixDir)
|
||||
|
||||
# stuff for debugging
|
||||
import wx
|
||||
print "wx.version:", wx.version()
|
||||
print "pid:", os.getpid()
|
||||
#print "executable:", sys.executable; raw_input("Press Enter...")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user