Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 11:30:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,059 Commits 8 Branches 23 Tags
4c29dfae85517b05d2e9dc7df7f1c46c3196c59d
Commit Graph

52 Commits

Author SHA1 Message Date
Robin Dunn
986d868ccb Begin merging the remaining parts for PR #35. 
Add _msw module for wxMSW-only things, starting with the metafile classes.
 2016-05-13 18:51:53 -07:00
Scott Talbert
36683c840f Fix linking of wx.media module 2016-03-09 20:13:25 -05:00
Robin Dunn
549df8a6d0 Merge branch 'gtk3' of git://github.com/swt2c/Phoenix into gtk3 2016-03-02 18:26:08 -08:00
Scott Talbert
a57bec2e71 Add support for building with GTK3 2016-02-29 20:22:58 -05:00
DietmarSchwertberger
abbf850d56 Add support for Visual Studio 2015 and encoding issues 
Replace 'touch' command with Python implementation to reduce dependency on cygwin.
 2016-02-28 00:27:28 -08:00
DietmarSchwertberger
c5952165cb add _media module with MediaCtrl 2016-02-27 23:10:22 -08:00
Robin Dunn
db20285f49 Start of porting to newest sip. Not quite ready yet… 2015-03-13 18:28:33 -07:00
Robin Dunn
d5a0a73de4 fix typo 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@76347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-04-14 21:19:51 +00:00
Robin Dunn
774001b14b Fix compiler selection when building for Py34 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@76346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-04-14 21:03:28 +00:00
Robin Dunn
4fd3eb82cf Add option for buildign release mode binaries that include debug info/symbols. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-06 08:04:59 +00:00
Robin Dunn
7d0f393c5f Switch to a 3 component+tag versioning scheme instead of the 4 component scheme used by Classic. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-01-02 01:47:27 +00:00
Robin Dunn
1690888828 Only build the webkit module on Darwin 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-29 08:25:39 +00:00
Robin Dunn
cf81dd29ef Add wxWebKitCtrl wrappers for Phoenix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-29 03:44:04 +00:00
Robin Dunn
4f8e935257 Generate demo/version.py in the build script. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-13 06:18:20 +00:00
Robin Dunn
ecf2cfb12d richtext module needs to link with html libs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-09 17:28:15 +00:00
Robin Dunn
13d5942cbb Add wxArrayPtrWrapperTemplate to wrap the wxArrays using the pointer version of the macro 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-08 23:30:44 +00:00
Robin Dunn
ce4424c4ea Initial add of richtext modules. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-08 23:28:44 +00:00
Robin Dunn
35747ab703 Go back to using WAF's check_python_headers on non-Windows platforms. 
It is needed in case the Python installation has split the pyconfig.h to
a different location, so the extra -I flag will be added.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 06:24:24 +00:00
Robin Dunn
afc84c41aa Additional tweaks for magic on Linux: 
In the bdist_egg build, if one of the libwx* symlinks is actually the soname then we need to keep that one as the real file instead of removing it.

No need to do a wx install if we're using magic.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:16:32 +00:00
Robin Dunn
3a03a0a362 Deal with rpath related options for Phoenix magic bundling on wxGTK 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:16:22 +00:00
Robin Dunn
d7e2c91b69 Remove some commented out code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:15:07 +00:00
Robin Dunn
05608fb3b4 Fix selection of the python executable on Windows so virtualenv pythons can be used. 
Fix --python

Fix indentation bug in the code setting INCLUDES_PY* in wscript

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:15:00 +00:00
Robin Dunn
b9871f9e66 Add install and bdist_egg commands. 
Add the ability to use an already installed wxWidgets.
Remove the setup_py command since setup.py no longer duplicates the build functionality.
Avoid having WAF look for the python*-config scripts and just use the values fetched from distutils.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:14:51 +00:00
Robin Dunn
465ab1823a Move all the default build output locations to be under the main build folder 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-28 19:16:50 +00:00
Robin Dunn
78029ef10e Bump up to WAF 1.7.9 
Add more support for building with MSVC 10 for Python 3.3+

Don't use check_python_headers on Windows.  WAF can sometimes needlessly confuse itself there and configurations will fail with the configuration test builds acting like they can't find the python lib or .h file.  Since we can easily deduce all that is needed from the python path and prefix we'll just take care of it all in the wscript.

Other minor tweaks.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-21 02:18:28 +00:00
Robin Dunn
0784c3cc09 First pass at adding wxGrid and related classes. It all compiles, but there is still lots more to do. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-12 05:12:14 +00:00
Robin Dunn
35fd2e16bf Update copyright year 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-01-21 02:13:03 +00:00
Robin Dunn
b7cf438804 MSW build fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-12-01 01:16:49 +00:00
Robin Dunn
4d5faa2868 Add _xml and _xrc modules with some unit tests 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-30 22:32:53 +00:00
Robin Dunn
422814f88b Add html2 (WebView) classes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-27 01:23:10 +00:00
Robin Dunn
431b09c5a2 Add wx.glcanvas 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-09 04:39:42 +00:00
Robin Dunn
fbda53cbe4 Add wxHtml classes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-01 22:50:37 +00:00
Robin Dunn
06b02a6277 Add wx.stc.StyledTextCtrl 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-10-27 03:16:14 +00:00
Robin Dunn
9fcada3f63 Enable setting the architecture to be used for building with MSVC in wscript. Fetch the arch of the PYTHON being used for the build and use that to set things like the flag passed to waf, additional folders to clean up, etc. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-12 23:59:53 +00:00
Robin Dunn
337d0df8b8 The last commit didn't work, and I can't find any other way to work around the problem, so just undo the change for now 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-27 07:34:57 +00:00
Robin Dunn
b05a08b37e Run finishSetup before check_python_headers is run on Macs. This will reset the compile and link command lines the same way they will be when the build is done. This will allow the configure to succeed where it would fail in the cases when the default flags are incorrect. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-27 05:30:58 +00:00
Robin Dunn
da0baab29e Initialize some variables that we'll be assigning to later, otherwise they won't get the debug flags and etc. (WAF bug?) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-20 17:11:35 +00:00
Robin Dunn
2c2562bdc1 10.5 deployment target 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 22:46:34 +00:00
Robin Dunn
1574d2c081 Explicitly specify the waf build output fodler and have it include the Python version so more than one can be in the build tree at the same time. Also add release/debug for Windows builds. Remove the code and comments attempting to do this from wscript. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-05-31 20:30:58 +00:00
Robin Dunn
3eb0e40d78 A little cleanup and comments 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-05-30 03:23:56 +00:00
Robin Dunn
63c7167aca we also need the /Z7 flag for debug info on MSVC 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-05-24 23:27:24 +00:00
Robin Dunn
370d9e45c9 Make it possible to build both release and debug (*_d.pyd, /MDd, etc.) versions on Windows. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-05-12 06:18:09 +00:00
Robin Dunn
ba91908eec Convert tabs to spaces 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-04-04 23:24:01 +00:00
Robin Dunn
aeda101cf4 build changes to add extra libs for non-core modules for MSW 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-22 21:37:07 +00:00
Robin Dunn
838199f9f0 We need the net lib too in multi-lib builds 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-22 21:36:56 +00:00
Robin Dunn
19db0eb058 Add a new wx.adv extension module for those items that are in the wx adv lib in multi-lib builds. 
Add AboutDialog.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-22 20:30:37 +00:00
Robin Dunn
9ef3e60992 msw build tweaks for waf 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-21 17:17:10 +00:00
Robin Dunn
aa8c0d679f build fixes for wxGTK 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-17 20:37:51 +00:00
Robin Dunn
3a7de14aff First phase of the build.py/waf integration. A versioned waf command is downlaoded like we do for sip, and either setup.py or waf can still be used for the build. Also enable specifying more than one arch for universal mac builds now that wx's configure can handle it. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-17 02:56:32 +00:00
Robin Dunn
e79b147024 Initial changes for getting waf builds working well for Phoenix. wx-config based builds are working, still need to do integration with build.py and MSW builds. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-17 02:56:11 +00:00