Commit Graph

189 Commits

Author SHA1 Message Date
Robin Dunn
1f81ba9299 Let's try multilib builds on Mac... 2016-06-21 20:24:28 -07:00
Robin Dunn
d62a2af519 Update comments about version number scheme 2016-05-09 22:17:52 -07:00
Robin Dunn
549df8a6d0 Merge branch 'gtk3' of git://github.com/swt2c/Phoenix into gtk3 2016-03-02 18:26:08 -08:00
Robin Dunn
ae68dbc1e1 Fix typo 2016-02-29 19:12:12 -08:00
Robin Dunn
5c029d5955 Use cp1252 on Windows for the wxWidgets build too,
and add a note to the README about it.
2016-02-29 19:11:49 -08:00
Scott Talbert
a57bec2e71 Add support for building with GTK3 2016-02-29 20:22:58 -05:00
Robin Dunn
5a2ce07014 Add compiler version support for VisStudio 2015 2016-02-28 22:37:21 -08:00
Robin Dunn
f679024027 Use cp1252 encoding on Windows for cmd output 2016-02-28 00:45:24 -08: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
Robin Dunn
598ee1e3f2 Import and use build_wxwidgets from buildtools 2016-02-27 18:25:28 -08:00
Robin Dunn
4cbfc0d330 Copy the build-wxwidgets.py script into Phoenix's buildtools.
I think we're the only ones using it anyway.
2016-02-27 18:25:28 -08:00
Robin Dunn
2e9b9c7399 Use either 32bit or 64bit builds of SIP on linux 2015-08-10 22:50:53 -07:00
Robin Dunn
db20285f49 Start of porting to newest sip. Not quite ready yet… 2015-03-13 18:28:33 -07:00
Robin Dunn
cd377cdfe0 Update sip to version 4.14.7 2015-03-05 15:37:36 -08:00
Robin Dunn
dba10ef333 * Make the git hash be the "local version label" (see PEP 440) by separating it with a '+'.
* Change the name template for the docs tarball so pip will not think it is part of the local version label and is the package's source code.

* Use version3 for the docset filenames.
2015-02-06 10:31:09 -08:00
Robin Dunn
611417f509 Ensure the pathnames being uploaded are using forward slashes.
A little refactoring
2015-02-03 15:01:10 -08:00
Robin Dunn
27fbae8524 Adapt the build to the new relative location of the wx source 2015-02-03 00:40:14 -08:00
Robin Dunn
b35f75b680 Create a meaningful and sortable build number from the current git revision. 2015-01-31 22:14:01 -08:00
Robin Dunn
3761c93345 Bump version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@78203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-11-28 04:47:58 +00:00
Robin Dunn
bd95bd2b4a Bump version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@76878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-08 21:00:08 +00:00
Robin Dunn
e98d311d42 Add the wx language catalogs to wx/locale in the wx package.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@76360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-17 03:12:02 +00:00
Robin Dunn
50426ba20c typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@76355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-16 03:02:27 +00:00
Robin Dunn
801682c786 Some Py3 fixes for PyCrust
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@76040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-02 07:48:20 +00:00
Robin Dunn
3ecd3ab293 PR 47: print() fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-15 07:28:25 +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
72fee9de94 Change --upload_package to --upload.
Simplify cleanup of older snapshot uploads.  Just keep the last 50 files instead of trying to keep 5 of each type.  It's too easy for those filters to break.

Add ability to upload eggs, wheels, and exe's

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-12-31 07:48:11 +00:00
Robin Dunn
7d0b8d94d0 Bump to 3.0.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-12-29 03:45:05 +00:00
Robin Dunn
b85e6b0252 Update version number to match wxWidgets
(although I'm not sure we're ready for 3.0…)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-11 17:02:21 +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
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
e5eefd8625 Add a note about possibly changing the id in addition to the dependency names.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-10 00:05:21 +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
429a96c73f Enable finding the wxWidgets folder as a subdir of the main Phoenix folder.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-27 04:28:25 +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
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
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
5b8bc4fe17 Use textfile_open when loading core.pi to avoid encoding errors in Python3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-16 01:15:21 +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
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
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
Robin Dunn
5a73d6fd55 Don't echo when checking version of cl.exe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-12 23:59:49 +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
Kevin Ollivier
852c00aab3 Only strip sysroot if it is specified in cc_args, if it is passed in via environment variables, keep it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-11 17:40:23 +00:00
Robin Dunn
dc1287e9ce bump to match wx-trunk's version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-11 08:49:51 +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
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