Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-09-05 17:30:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,250 Commits 8 Branches 22 Tags
cec51e924ff81c808ada8c1f8b685c42a642c97d
Commit Graph

127 Commits

Author SHA1 Message Date
Robin Dunn
590c739493 just use 6 build jobs instead of all 8 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-07 03:02:40 +00:00
Robin Dunn
ca2d49660a Remove import statement for not being used in the code. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-07 01:42:07 +00:00
Robin Dunn
cd92ea7a90 Improve build.py command and option help text. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-05-04 02:01:00 +00:00
Robin Dunn
2e5b10c207 reset cfg.VERSION after running the setrev command 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-04-11 17:19:02 +00:00
Robin Dunn
6a20f2a6d4 Add a message displaying the svn rev used 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-04-10 01:09:00 +00:00
Robin Dunn
ebdfcfe2db Instead of fetching the svn revision every time a Config object is created add a command to fetch it on demand and cache the value for later use. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-04-10 00:05:30 +00:00
Robin Dunn
80bd5f62a9 fix the test command function name 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-04-03 02:11:36 +00:00
Robin Dunn
ee209f1025 Check and run the etg/_core.py file before any others. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-04-02 03:57:37 +00:00
Robin Dunn
6b4601273a Include the svn revision in the version numbers. 
Various other sdist and bdist tweaks and updates.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-30 04:42:00 +00:00
Robin Dunn
2b067e331d Run egg_info before doing an sdist. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-30 04:41:39 +00:00
Robin Dunn
16487fafa8 Use waf 1.7.10 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-30 04:41:24 +00:00
Robin Dunn
a18dffde8d Add a setup.py to the tarball to bootstrap automated builds made by pip or easy_install. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-27 04:28:34 +00:00
Robin Dunn
f8eaf4854e Clean only the build dir for the selected Python 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-22 01:30:14 +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
a6b33446c4 a bit of cleanup 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:16:13 +00:00
Robin Dunn
2037175733 Rename build commands to have a 'cmd_' prefix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:16:06 +00:00
Robin Dunn
cd8f86cbe4 add more text about the --no_magic option 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:15:58 +00:00
Robin Dunn
bb32bf5da3 Add sip 4.14.4 MD5s for win32 and linux 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:15:50 +00:00
Robin Dunn
7e90570bbd Update to sip 4.14.4 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:15:43 +00:00
Robin Dunn
ed1ee1222e There isn't any need for separate carbon/cocoa build folders any more since carbon is mostly dead. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:15:30 +00:00
Robin Dunn
b7e1d321e5 comment 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:15:23 +00:00
Robin Dunn
7c8faf80c3 add bdist_wininst command 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-14 01:15:15 +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
a0c1f560b4 Use platform, not sys.platform so the older win64 builds will be removed from the daily snapshots 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-03-06 19:56:31 +00:00
Robin Dunn
4d1c775c9f Also copy the generated .py and .pi files into the sdist 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-28 19:17:23 +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
3f274356d0 Move check for XMLSRC to etg command instead of when the etgtools are imported. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-26 00:45:26 +00:00
Robin Dunn
fa3f290712 Add sdist command for building a source tarball. 
Add command to buildbot config.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-24 03:09:16 +00:00
Robin Dunn
766893c4b9 Enable using jom in place of nmake in the wxMSW build 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-22 06:20:18 +00:00
Robin Dunn
fcb55098be Use 'win64' in bdist 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-21 02:18:36 +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
052696ceca Add version check for MSVC 10 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-19 08:33:56 +00:00
Robin Dunn
f2b9601a52 Use commands.pop() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-01-31 02:51:15 +00:00
Robin Dunn
7f70d5297f Add a --x64 option, even though it is actually checked before the command line options are processed. This way it will be displayed in the help automatically. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-12-29 02:33:48 +00:00
Robin Dunn
12886cd868 Use 'linux' for the platform name no matter if the real platform name is 'linux2', 'linux3' or just 'linux' 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-12-27 03:07:05 +00:00
Robin Dunn
32b174134b Verify that the cl.exe used for the wx and py builds is the one that the target Python wants to be built with, and also set the environment vars from that version of the compiler's vcvarsall.bat the same way that distutils does it. Ensure that CPU is set for the wx build. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-12-14 08:49:44 +00:00
Andrea Gavana
3ca003508a Phoenix: revert build.py to the previous version, it was committed by mistake... 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-29 21:23:30 +00:00
Andrea Gavana
cd5581f696 Phoenix docs update: added support for wx.html2 and friends, converted a bunch of snippets and translated the wx.Command/wx.CommandProcessor overviews. Revised some internal links between documentation classes and overviews (again... please wx-devs stop renaming the interlinks between classes and overviews). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-29 21:18:30 +00:00
Robin Dunn
ef5144d08d Update to SIP 4.14.1 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-17 22:21:46 +00:00
Robin Dunn
52d40e37ba skip doxygen version check 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-05 05:59:06 +00:00
Robin Dunn
a4353a763e Update to doxygen 1.8.2 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-05 05:20:18 +00:00
Kevin Ollivier
2d1d79cfb0 When building external extensions, we won't have _core.sip, so only move it if it's in the modules list. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-08-23 01:39:44 +00:00
Robin Dunn
a5e632d98f Make it possible to run each test suite in a new process, while still collecting and combining all the results so it looks like all tests were run in a single pass. This slows down the test run quite a bit, but protects against tests causing problems for each other (which was happening more often on OSX.) Using nosetest's multi-process feature wasn't workable in this case because new wx.App's could not be created in the child multiprocess.Process instances on Macs because of how they are forked. We need a totally new process (using the Framework Python) to make it work. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-08-10 04:54:43 +00:00
Robin Dunn
719770cf45 Since I keep editing the wrong copy of this file, move the classic_vs_phoenix document to the same place as the MigrationGuide document so it is easier to find. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-20 01:47:04 +00:00
Robin Dunn
38bf364858 some tweaks to the usage string 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-17 01:05:42 +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
e3d75409c3 Also check the .sip file being run when looking at dependencies. Fixes a problem of sip being skipped if the only change was in _core.sip, for example. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-12 23:59:39 +00:00
Kevin Ollivier
3670519430 Enable etg code to be used to build extensions other than Phoenix itself. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-11 17:42:05 +00:00