Commit Graph

240 Commits

Author SHA1 Message Date
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
Robin Dunn
1c190dc1b1 Update to new SIP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-10 05:15:41 +00:00
Robin Dunn
9b4fe86559 AMD64 --> x64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-10 05:15:00 +00:00
Robin Dunn
d2ade55810 fix typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 03:06:31 +00:00
Robin Dunn
a3c43d0e04 Adapt to new lib dirs, etc. in the Windows build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 02:59:30 +00:00
Robin Dunn
0fbc3d4f5d Ensure that the .py file exists before deciding to skip running sip
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-26 18:25:52 +00:00
Robin Dunn
e9c73e2165 use waf_py as the default build_py command
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-26 18:25:42 +00:00
Robin Dunn
d0c3be8ad1 Use i386 arch flag when building sip, update MD5 in build.py
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 00:22:02 +00:00
Robin Dunn
84bd75da00 Refactor the code which downloads the tools to make it reusable for more tools. Add downloading of the Doxygen command. This helps ensure that all are using the same version, and makes setting up new build environments or buildslaves easier since sometimes installing an old version of doxygen can be tricky.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 23:22:05 +00:00
Robin Dunn
5577cb87b7 Update to a newer build of SIP to get some bug fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-06 01:15:27 +00:00
Robin Dunn
7a4a5eb4cf Check dependencies and skip running sip if nothing is out of date.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-31 20:31:03 +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
Andrea Gavana
4fee2a598a Phoenix:
- Reformat the documentation generator to take into account the "adv" sub-package;
- Make the `sphinx_generator.py` and the `sphinxtools` package Python 3 - compliant.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-29 20:11:36 +00:00
Robin Dunn
b41df0b779 Many, many (many!) changes needed to build and run the Phoenix extension modules with Python 3. Where possible changes were made such that the code works with both Python 2.7 and 3.2 without conditionals. In general the following types of changes were made:
* Changed imports to use either absolute or explicit relative imports.  Implicit relative imports are no longer allowed.

 * Changes to accomodate standard library classes or modues moving to other locations, or being removed entirely.

 * Changes related to print becoming a function, execfile being removed, u'' no longer allowed, and other syntax related issues.

 * Working around C APIs that have changed or simply vanished. (PyInt, PyString, PyBytes, etc.)

 * Dealing with text file objects using strings vs binary file objects using bytes, auto-encoding, and etc.

 * Replacing the use of PyCObject with PyCapsule and dealing with an apparent bug where PyCapsule objects can't be imported from submodules within a package.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-24 23:28:02 +00:00
Robin Dunn
267123eea9 copy the cairo DLLs on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-12 06:18:05 +00:00
Robin Dunn
75bc864e1c Run _core first
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-30 05:35:58 +00:00
Robin Dunn
79f6e60a7b * Refactor the code for getting the svn revision so it can be shared.
* Refactor the code for uploading files to the nightly server to its own helper function.
* Add command to build and upload a docs tarball.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-19 03:04:04 +00:00
Robin Dunn
9e70e1ba0e Set install names using @loader_path in the extension modules and the wx libs so they can be loaded from the same folder and they can be included in the wx package dir.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-18 03:33:07 +00:00
Robin Dunn
d28db25970 * Add a readme file to the snapshot builds.
* Add code to remove all but five of the snapshots from the FTP server
* Add code to try getting the revision number from git-svn if it can't be gotten from svn

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-17 21:44:38 +00:00
Robin Dunn
f41caff007 No change, just testing buildbot triggers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-17 17:43:16 +00:00
Robin Dunn
b139723508 change print to print()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-17 17:01:37 +00:00
Andrea Gavana
ff175387b3 Phoenix: Add support for documenting wx.lib, wx.py and wx.tools (that's the whole wxPython/Phoenix documentation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-07 21:00:39 +00:00
Andrea Gavana
77338050a0 Phoenix:
- First stub at integrating `wx.lib` (116 warnings);
- Added `internationalization.rst` file from Werner (with a cool sample app as well);
- Added new samples for AffineMatrix2D.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 18:28:47 +00:00
Robin Dunn
7ff0880c64 Add note about doing a dependency check before running sip
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-26 19:22:14 +00:00
Robin Dunn
b7c12003d3 Only remove the first _ for the .py filename.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-22 20:30:22 +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
8b3348b371 Add code to measure and display the run time for each command. Because we are Geeks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-17 20:37:55 +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
c4e9d6b90d Correct help string for --cairo option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-17 02:56:26 +00:00
Robin Dunn
7cbb3b3b34 Accept --jobs option, pass it on to build_wxwidgets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-17 02:56:22 +00:00
Robin Dunn
fb35ec7696 Check for JOBS=n in the envirment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 00:14:00 +00:00
Robin Dunn
42a1a97211 Update to the 4.13.2 version of SIP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-02 21:53:21 +00:00
Kevin Ollivier
3a61c5900e Add --cairo build option for Windows, and have fatal build errors stop the build so that it's easier to track down where the first error occurred.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 02:42:54 +00:00
Robin Dunn
820ef9b5c9 Switch to sip 4.13.1, fix build script for Lion/Xcode4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-09 05:41:35 +00:00
Robin Dunn
474de882a8 * Run the sphinx command directly instead of going through their batch or Makefile.
* Output the html files to docs/html
* Clean more in clean_sphinx

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-02 22:03:17 +00:00
Robin Dunn
f09b4b4aac More checks for newer/changed content before writing files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-31 10:41:00 +00:00
Robin Dunn
a22be70a88 * make clean_sphinx a command function
* Move sphinx specific stuff to the sphinx command out of the etg command
* Make it possible to not run the docs generator
* Don't update some files unless they are newer or changed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-31 09:50:25 +00:00
Robin Dunn
819fe46a95 Go back to latest sip build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-31 02:31:05 +00:00