Commit Graph

2151 Commits

Author SHA1 Message Date
Robin Dunn
80e2614bac Merge branch 'WX_3_0_BRANCH' into wxPy-3.0-branch 2016-10-21 16:01:24 -07:00
mirh
2a21297d41 Don't use thread-safe statics with MSVS when targeting XP
Disable thread-safe initialization for static local variables in Visual Studio
2015 when XP toolset is used as this results in crashes when using DLLs under
XP, see #13116.

See #17403.

See https://github.com/wxWidgets/wxWidgets/pull/305

(cherry picked from commit 26a58e9d48)
2016-09-29 01:37:08 +02:00
Robin Dunn
95bff5496b Merge branch 'WX_3_0_BRANCH' into wxPy-3.0-branch 2016-06-28 15:46:11 -07:00
Dimitri Schoolwerth
c293c645d7 Include all repository files in setup exe
Don't exclude non-MSW specific files any longer from the generated
installer for MSW. The space savings are hardly worth the effort:
originally 46.9 MiB (133 MiB installed) and with all files included 48 MiB
(142 MiB installed).
Also by having all files in the installer more exotic builds such as wxGTK
for MSW are available.

(cherry picked from commit 9a9a1199d4)
2016-06-06 03:31:55 +04:00
Robin Dunn
e44418ba2d Merge branch 'WX_3_0_BRANCH' into wxPy-3.0-branch 2016-05-04 21:58:48 -07:00
Václav Slavík
a7644e7b05 Convert all CRLF files to use LF to fix git confusion.
Having CRLF files in the repository with eol=crlf breaks just about
everything, e.g. any rebase/merge involving these files would fail.
Try to fix this by making sure the files use LF in the repository and CRLF is
only used in the working copy.

(analogous to commit c3e5751c36)
2016-04-23 17:20:42 +02:00
Danny Scott
966084a65a Add script for building MSVS 2015 binaries
See #17408.

(this is a backport of 7e493c3a3c from master)
2016-02-29 18:58:17 +01:00
Robin Dunn
f9115e168e Another Python3 fix 2015-12-05 13:46:19 -08:00
Robin Dunn
e2f5fad8db Some fixes for running the build script with Python3 2015-12-04 17:54:14 -08:00
Robin Dunn
923d5865ec Look for newer SDKs, plus some future proofing. 2015-12-01 17:56:16 -08:00
Bryan Petty
80ceca14b5 Backport release script updates to 3.0. 2015-11-15 22:20:26 -07:00
Bryan Petty
6ed2b8527f Add AppVeyor configurations for 3.0 branch. 2015-11-09 18:46:26 -07:00
Vadim Zeitlin
90cec63a53 Don't use "u" option with ar(1).
It seems like it was never really needed as we always delete the archive
before creating it anyhow and there is no advantage in "updating" it if it
doesn't exist. Worse, with recent ar versions (like the one from binutils 2.25
in Debian Sid), using "u" results in a somewhat unclear warning

ar: `u' modifier ignored since `D' is the default (see `U')

so just get rid of it to avoid the warning.

(cherry picked from commit 004b5a4f49)
2015-08-04 20:11:12 -07:00
Dimitri Schoolwerth
97eb03c9a7 Re-enable symbols visibility support for the Clang compiler
Visibility support for Clang was disabled in 7198c33 because of linking
errors when building shared libraries, related to non-inline methods in
exported template classes.

The last Clang version to have these problems is version "4.1
(tags/Apple/clang-421.11.66)" as part of Xcode 4.5.2, and the next
release fixes them (version "4.2 (clang-425.0.24)", Xcode 4.6). Check
for the Clang version and only disable visibility support when compiling
with Apple Clang < 4.2.

Note that Apple Clang 4.2 is based on official Clang 3.2 so also check
for that version in case of non-Apple builds. The only official Clang
that has been tested successfully is 3.4 which worked fine with
visibility. Other versions that were tried (3.1 and 3.2) segfault while
compiling wx.

(this is a backport of 7cacde3 from master)
2015-06-08 02:36:52 +04:00
Dimitri Schoolwerth
5964643206 Update XML Tools URL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-13 21:49:06 +00:00
Václav Slavík
f0c6aa2478 Xcode project: src/regex must be in non-user search path
Otherwise it wouldn't be included as <regex.h> and the system copy would
be used. We need to always use the builtin, wxChar-aware copy.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-12-05 15:56:02 +00:00
Robin Dunn
163f2169ed Allow explicitly selecting the carbon build since it is not the default anymore.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-11-27 22:23:49 +00:00
Robin Dunn
a20ff140f1 Add gtk3 build support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-11-27 22:23:31 +00:00
Vadim Zeitlin
94b711e9f3 Only link webview library with libwebkitgtk in wxGTK, not the core one.
Add EXTRALIBS_WEBVIEW similar to the existing EXTRALIBS_MEDIA and such and set
it in configure instead of adding libwebkitgtk and dependent libraries
directly to GUI_TK_LIBRARY.

This ensure that the core library doesn't have any dependencies on
libwebkitgtk which it doesn't need.

Closes #16624.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-16 13:33:19 +00:00
Vadim Zeitlin
b8e42da6b2 Fix resource compiler include path for Borland.
Explicitly include $(BCCDIR)/include/windows/sdk directory in the resource
compiler options, as it needs it to find windows.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-11 15:48:22 +00:00
Vadim Zeitlin
3ee48824fc Check that there are no uncommitted changes in the release script.
Any such changes wouldn't be included in the release, which is probably
unexpected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-06 21:50:09 +00:00
Vadim Zeitlin
7f1e03a22a Rebake and rerun autoconf after 3.0.3 version update.
Don't forget to update configure, this time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-06 17:33:15 +00:00
Vadim Zeitlin
f8506c65a5 Update version to 3.0.3.
Run misc/scripts/inc_release, update version.bkl and changes.txt manually.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-06 12:35:15 +00:00
Dimitri Schoolwerth
8a35babbbf Fix crash with newer OS X builds running on older.
Use built-in zlib sources instead of system zlib. Backport of trunk
r76382, r76383, and r76385.

Closes #16192.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-03 14:38:11 +00:00
Dimitri Schoolwerth
04a7f51ccd Regenerate Xcode projects.
Update the Xcode projects to include xh_simplebook.cpp, as well as
wxWebView related sources in the iPhone project.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-03 13:43:50 +00:00
Vadim Zeitlin
03fb8ebf7b Add XRC handler for wxSimplebook.
Similar to wxNotebook but even simpler as wxSimplebook doesn't use images.

Also add wxSimplebook::Create() as the version inherited from wxBookCtrlBase
didn't _quite_ work: we need to add wxBK_TOP style to prevent asserts due to
unknown alignment in the base class when creating wxSimplebook.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-05 22:00:57 +00:00
Vadim Zeitlin
2306e9f9ff Remove accidentally committed wxCompilerPrefix setting.
Don't use "vc120" compiler prefix by default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-04 11:50:00 +00:00
Vadim Zeitlin
56657b8ea3 Extract setup.h copying into a separate project for MSVC11+.
This fixes problems with parallel builds in Visual Studio 2012 or 2013 IDE as
multiple projects may try to copy setup.h file at once, resulting in errors.

Use _custom_build project as a common dependency to ensure that the copy step
is done only once.

This is a backport of r76419 from trunk, see #16177.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-04 11:31:00 +00:00
Vadim Zeitlin
4f6daf7149 Generate debug information in MSVC 11/12 builds too.
This partially (as MSVC 10 projects were already correct) backports r76475
from trunk, see #16236.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-25 15:17:37 +00:00
Vadim Zeitlin
4af9d1aace Generate 64 bit configurations in MSVC 8/9 projects.
Update bakefile configuration to include x64 configurations into MSVS 2005 and
2008 projects (2003 doesn't support building in 64 bits, 2010 and later are
manually maintained and already have them) and rebake the projects.

See #13675.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-24 23:52:39 +00:00
Vadim Zeitlin
52b452881f Update the version to 3.0.2 and rebake everything.
This is the result of running misc/scripts/inc_release and bakefile_gen.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-16 17:50:58 +00:00
Vadim Zeitlin
4342174e3f Install private headers used by wx/unix/execute.h.
Although private headers are not normally installed, do install the ones
included from the (erroneously) public wx/unix/execute.h to allow code
including it to compile.

Closes #16325.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-11 14:56:06 +00:00
Vadim Zeitlin
1f66eef324 Correct webview DLL name in x64 config of MSVS 2010 project files.
The architecture suffix was missing.

Closes #15820.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-04 22:11:30 +00:00
Paul Cornett
8799c2e10f Add a separate GTK-specific wxDisplay implementation.
This separates the GTK implementation from Unix/X11, except for the wxVideoMode
stuff, and _NET_WORKAREA when GTK < 3.4. wxDisplay and wxClientDisplayRect()
should now work as well as they can with Wayland.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-17 17:36:10 +00:00
Vadim Zeitlin
37dd8f5b7b Use "MultiProcessorCompilation" instead of explicit /MP in MSVS projects.
Use the user-visible option instead of the command line option which is now
hidden in the IDE.

Closes #16093.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-18 17:07:12 +00:00
Vadim Zeitlin
3ab8839562 Install wx/preferences.h and wx/testing.h in "make install".
These headers were accidentally forgotten in files.bkl, add them there and
rebake.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-13 16:12:22 +00:00
Vadim Zeitlin
1770c2088d Remove non-existent wx/cairo.h from MSVC{11,12} projects.
This file resulted in never ending rebuilds of the core project as MSVS tried
to recreate the missing dependency (and failed).

See http://blogs.msdn.com/b/andrewarnottms/archive/2012/06/07/enable-c-and-javascript-project-system-tracing.aspx
for help with debugging such problems in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-02 23:37:41 +00:00
Vadim Zeitlin
1f18e60647 Enable debug information in release configuration of MSVC{11,12} projects.
We want to generate debug information even in the release builds of the
libraries in order to allow debugging of the programs using them. This is
especially important for the DLLs but do it for the static release build too
for consistency.

This also almost fixes the constant rebuilding of the entire solution which
happened because the PDBs, supposed to be generated by linker, were not found
because they were not actually created as the debug information wasn't there.

See #15780.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-02 23:37:36 +00:00
Vadim Zeitlin
52254bd97e Add missing XRC handlers to the manual VC{11,12} projects.
XRC handler in aui, ribbon and richtext libraries were omitted in the initial
versions of the projects for some reason.

See #15780.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-02 23:37:26 +00:00
Vadim Zeitlin
b5b037687e Correct wrong version number in MSVC12 properties file.
Use "30" in 3.0 branch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-02 16:07:29 +00:00
Vadim Zeitlin
de5ae5495e Add projects for MSVC 11 and 12 (MSVS 2012 and 2013).
Add manually created projects for now, as it looks that we are not going to
have bakefile-generated ones any time soon.

Closes #15780.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-18 15:40:45 +00:00
Vadim Zeitlin
b1f088b60d Revert "Add XRC handler file to MSVC 10 project."
This reverts r75789 which shouldn't have been applied to 3.0 branch as the
files added to the project don't exist in it.

Closes #15942.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-06 15:10:50 +00:00
Vadim Zeitlin
1edbe53368 Add XRC handler file to MSVC 10 project.
Closes #15942.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-04 16:42:34 +00:00
Vadim Zeitlin
c4de2abb3a Add new XRC headers to the core project too.
Closes #15942.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-04 15:46:29 +00:00
Vadim Zeitlin
7976b83456 Add xh_ribbon.cpp to MSVC 10 ribbon library project.
Fix linking errors when using wxRibbonXmlHandler.

Closes #15927.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-30 19:14:27 +00:00
Robin Dunn
e5160f90b4 Turn off wxUSE_COMPILER_TLS for wxPython builds to avoid crashes on XP.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-02 00:21:34 +00:00
Robin Dunn
4a06bb9051 Guard against trying to use extend() with None
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-12-29 03:36:14 +00:00
Paul Cornett
ae6ba148f2 fix inconsistent line endings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-12-15 02:07:14 +00:00
Vadim Zeitlin
5e97ee41d7 Update version to 3.0.1.
And regenerate everything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-21 13:49:53 +00:00
Vadim Zeitlin
12c6d5061a Add xh_auinotbk.{h,cpp} to the manually maintained VC10 project files.
This file existed in automatically generated projects but not this one.

Closes #15673.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-16 23:41:11 +00:00