Commit Graph

45 Commits

Author SHA1 Message Date
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
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
85e5a58cc8 A more intelligent fix for LDSHARED
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-26 18:25:56 +00:00
Robin Dunn
b55d1879d3 Also set LDSHARED from the wx-config --ld output.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-26 18:25:48 +00:00
Robin Dunn
b443e0e5e9 Ensure that all the extra -isysroot flags are removed from the arg list, not just the first extra one.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 00:11:14 +00:00
Robin Dunn
3426d72bc3 Some little tweaks and fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-06 01:15:14 +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
Kevin Ollivier
45ac7c4273 Use absolute paths to these includes so that extensions can pick up headers from these dirs as well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-30 18:29:45 +00:00
Robin Dunn
1d3fc8dad2 remove the 't' mode for codecs.open
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 21:35:14 +00:00
Robin Dunn
2011586fa0 Use codecs.open in textfile_open() for Py2.7 so it can work more like open() in Py3, auto-converting to/from utf-8 and unicode. Use textfile_open in parts of the sphinx command that were having encoding errors and also in writeIfChanged().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 20:43:48 +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
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
Andrea Gavana
003fb0a804 Phoenix:
1) Update documentation generator for `InfoBar`, `ListCtrl` and new additions;
2) Correct the `writeIfChanged` method, we can't use `str(text)` if the wxWidgets docs contain non-ascii compliant docstrings. Just treat them as unicode objects and use `codecs.open` to compare existing files with new docstrings;
3) Add empty stubs for the `ListCtrl Overview` and `Internationalization`, hopefully someone will populate them...
4) Small fix to the `MigrationGuide.txt`.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-27 20:54:15 +00:00
Robin Dunn
1f9c6d88b0 Turn on the SIP command-line flag that will generate code around every wrapped C++ call to release and reacquire the GIL. After some testing this seems to be the best option and the additional overhead is mostly negligible.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-23 03:19:56 +00:00
Robin Dunn
b0298e71e5 Optionally return an empty list from makeLibName if we're using the monolithic wx lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-23 01:54:42 +00:00
Robin Dunn
0358c27467 Don't unconditionally use the adv and html libs in MSW builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-22 21:37:02 +00:00
Robin Dunn
919078c196 Let the distutils build handle multiple architectures in the ARCH= flag too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-17 23:51:07 +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
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
Robin Dunn
73554e9d4c add writeIfChanged()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-31 10:13:46 +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
8db6d43f14 set version to 2.9.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-31 02:30:30 +00:00
Robin Dunn
78c1a61993 Move wxDir() and phoenixDir() to buildtools.config
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-30 21:01:09 +00:00
Robin Dunn
143b1ecb58 * Refactor the code that post-processes the code output by SIP to a separate function so it can be used in more than one place.
* Check for the presense of a msgfmt command before trying to rebuild the message catalogs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-20 19:27:21 +00:00
Robin Dunn
fb54a7fb92 Download the sip binary (if it's not already present) to be used, to ensure that all builds are using the same version.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-11 00:38:26 +00:00
Robin Dunn
3ebcacecb4 sort the list of C++ files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-20 04:33:51 +00:00
Robin Dunn
93affb710a remove debug print
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 21:41:11 +00:00
Robin Dunn
e54ba50b49 Various fixes for the build on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 06:50:09 +00:00
Robin Dunn
3b087917bf It's done, remove the "TODO"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-13 05:56:10 +00:00
Robin Dunn
2d4e4b7ca2 Since we're running the etg scripts and sip from build.py then we don't need the distutils hacks needed to run them from setup.py. Deactivate the and just use normal distutils stuff on the generated C++ files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-13 05:47:13 +00:00
Robin Dunn
d949d1dad1 * Update version number
* Since they are almost always needed for window classes, move the calls to
  removeVirtuals and addWindowVirtuals into the fixWindowClass and
  fixTopLevelWindowClass functions.

* Add wxWithImages to the interface headers and create wrappers for it and use
  it as a base of wxBoockCtrlBase.

* Add a new wx.deprecated() function that can handle properties and classes in
  addition to callables. It issues a custom warning, wxPyDeprecationWarning
  since the stock DeprecationWarning is filtered out by default in Python 2.7.

* Deprecate PyWindow and similar aliases

* Deprecate wx.Window.SetDimensions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 00:33:10 +00:00
Robin Dunn
849e0427fc * 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
2011-09-06 16:28:59 +00:00
Robin Dunn
5e89a9606d Change the package name from wxPhoenix to wx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@68979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 02:39:18 +00:00
Robin Dunn
04f10c5868 Update Phoenix copyright statements to 2011
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@68978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 01:52:23 +00:00
Robin Dunn
4219e02440 * move wxPen to etg/pen.py
* move wxBrush to etg/brush.py
* move wxBookCtrlBase and wxBookCtrlEvent to etg/bookctrl.py
* move wxBitmapButton to etg/bmpbuttn.py
* move wxArrayString MappedType and add wxArrayInt plus some unittests
* add checking for default values for pos and size parameters in fixWindowClass
* set out parameter flags for wxImageHistogram.FindFirstUnusedColour
* Restore layout constraints classes and related methods
* Create a MappedType for wxClientData
* update used of wxClientData in wx.CommandEvent
* Move wxControlWithItems, wxItemContainer and wxControlWithItems to etg/ctrlsub.py
* enable some Append, Insert and Set overloads in wxControlWithItems
* addGetterSetterProps: don't make setter-only properties
* addGetterSetterProps: ensure that the getter can be called with zero args
* addGetterSetterProps: ensure that the setter can be called with just 1 arg
* restore version checking code
* moved DC classes to other etg files to match interface file names.
* allow both overloads for wx.DC.GetTextExtent and GetMultiLineTextExtent by renaming 1
* add wx.DC.GetPartialTextExtents
* and some other stuff

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@68975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 01:42:42 +00:00
Kevin Ollivier
49fda7ada4 Add automatic class property generation, add support for defines, remove layout constraints from the build as they appear not to be generated with the docs for me, and add wrappers for a bunch of classes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@68963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-30 15:39:33 +00:00
Robin Dunn
911d90273c Lots of little changes made to Phoenix code over the past few months, plus some tweaks to get it running with the current wx.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@68905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-25 23:45:50 +00:00
Robin Dunn
b5ec0c87be Add code to build wxPython(phoenix) based on the command line options.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@66349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 03:00:31 +00:00
Robin Dunn
bec66711ce Added the beginnings of a new all-in-one build script like the build-wxpython.py in the wxPython folder. Made it command+options based instead of just options, and make it easy to extend with new commands.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@66321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-04 00:32:25 +00:00
Robin Dunn
96717983ad A boatload of changes and additions, all my Phoenix work for the past few days. Lots of lower level classes are wrapped, wxApp is working up through OnInit, plus there's a good start on some unit tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@66272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-27 08:53:17 +00:00
Robin Dunn
5e4f2bfbff fixes for the build on MSW and other tweaks and cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/sandbox/trunk/Phoenix@66188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-18 08:05:50 +00:00
Robin Dunn
7ddbef68b5 Add ability to generate code into a .py file which does the import of the extension module. This will be used to add Python code to a module so we dont' have to do everything in C++.
git-svn-id: https://svn.wxwidgets.org/svn/wx/sandbox/trunk/Phoenix@66126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-12 22:19:32 +00:00
Robin Dunn
2c4ebc512e Add file headers to the rest of the source files, don't bother with cvs keywords, fix some typos, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/sandbox/trunk/Phoenix@66114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-11 00:54:15 +00:00
Robin Dunn
ab37739a9b initial commit of experimental Phoenix code
git-svn-id: https://svn.wxwidgets.org/svn/wx/sandbox/trunk/Phoenix@66111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-11 00:08:20 +00:00