Commit Graph

2416 Commits

Author SHA1 Message Date
Vadim Zeitlin
c66c9c5ae6 Merge branch 'build_cmake' of https://github.com/TcT2k/wxWidgets
Add CMake-based build system.

Merge the original branch without any changes except for resolving the
conflict due to moving the contents of .travis.yml to a separate file by
propagating the changes done in this file since then to the new script
and rerunning ./build/update-setup-h and ./build/cmake/update_files.py
to update the file lists changed in the meanwhile.

Closes https://github.com/wxWidgets/wxWidgets/pull/330
2017-12-09 15:09:47 +01:00
Vadim Zeitlin
cf02d15646 Merge branch 'appveyor-tests'
Fix several problems in tests under MSW (mostly with MinGW) and enable
building and running them on AppVeyor CI.
2017-11-25 19:18:14 +01:00
Vadim Zeitlin
b29aa3f785 Run unit tests on AppVeyor too
Launch the tests after building them.
2017-11-25 17:30:51 +01:00
Vadim Zeitlin
f10bd1279d Remove the correct directory from PATH for MinGW AppVeyor builds
We need to remove the directory containing sh.exe from the PATH as
otherwise mingw32-make seems to use it and not cmd.exe for executing the
commands in the makefile, but the wrong directory was being removed in
appveyor.yml, having no effect.

Fix this and undo 5f2ccde269 which
compensated for it by (almost) clearing the PATH entirely which, in
turn, broke one of our unit tests (and could break other things in the
future, as having an empty PATH is rather unexpected).

Also use the full path for head program now that its directory is not in
the PATH any more. Alternative could be to use PowerShell, but while

powershell -Command "'gcc','mingw32-make','ar'|%%{ iex \"$_ --version\"|select -first 1 }"

does work, it looks really ugly, so avoid it for now.

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

See #17274.
2017-11-25 17:28:42 +01:00
Vadim Zeitlin
99db923c2c Add more missing generic headers to wxQt headers list
See f5cdda7b8b (commitcomment-25822547)
2017-11-25 00:25:14 +01:00
Vadim Zeitlin
53bf5936f1 Rename QT_LOWLEVEL_{HDR,SRC} to just QT_{HDR,SRC}
These file lists contained files that were not low level (meaning "used
by wxQt/Univ" in this context) at all and it doesn't make much sense to
think about Qt-based wxUniv port anyhow, so instead of painstakingly
separating them in low level part and the rest, just rename the
variables to be less confusing.
2017-11-25 00:12:38 +01:00
Vadim Zeitlin
778340a286 Merge branch 'private-fonts'
Add support for using application-private fonts.

Closes #13568.

Closes https://github.com/wxWidgets/wxWidgets/pull/591
2017-11-24 22:58:09 +01:00
Vadim Zeitlin
bc100ff31e Build tests under AppVeyor too 2017-11-24 22:55:11 +01:00
Vadim Zeitlin
f5cdda7b8b Add missing qt/nonownedwnd.h to the list of headers
Also add the previously added src/qt/nonownedwnd.cpp to the master files
list.
2017-11-22 21:49:56 +01:00
Vadim Zeitlin
2ee40f8a60 Add a build using GTK+ 3 to Travis
We need to test both wxGTK2 and wxGTK3 builds.
2017-11-22 02:33:53 +01:00
Vadim Zeitlin
38e441bdd8 Don't install libcppunit-dev under Travis CI any more
It is not needed since the switch to Catch for unit tests.
2017-11-22 02:31:47 +01:00
Vadim Zeitlin
34e6c7cccc Silence "make allmo" during release archives build
The commands used and their output are not important and there are many
of them, don't display them.
2017-11-16 23:37:24 +01:00
Vadim Zeitlin
7fd25de661 Update release script to include submodules in the archives
Use "git submodule foreach" to run "git archive" in all of the
submodules as well.

Also document the requirement to have GNU tar which is needed to be able
to successfully extract several concatenated tar archives.
2017-11-16 23:37:24 +01:00
Vadim Zeitlin
6471933857 Fix getting SHA-1 sums in the post-release script
sha1sum doesn't return just the SHA-1, unlike "git hash-object", so get
only the part of its output we need here.
2017-11-16 23:36:35 +01:00
Vadim Zeitlin
a80210f0d7 Allow running pre/post-release scripts from any directory
Don't assume they're run from the directory containing them, especially
as this is not how they are shown to be invoked in the release
instructions.

Now running ./build/tools/pre-release.sh works too.
2017-11-16 18:49:45 +01:00
Vadim Zeitlin
2fc4b76cf0 Use Bash for release scripts using non-POSIX features
A script using "declare -a" can't use /bin/sh as it's non-POSIX and not
supported by e.g. Dash which is /bin/sh on Debian systems.
2017-11-16 18:45:59 +01:00
Cătălin Răceanu
45c33d2a17 Add scripts for automating more parts of the release process
Update dates in various files before the release automatically.

Also automatically update SHA-1 of the release files both before the
release (to zero them) and afterwards (to use the correct values).

Closes https://github.com/wxWidgets/wxWidgets/pull/443
2017-11-16 18:45:17 +01:00
Vadim Zeitlin
5d134711a1 Add BUNDLE_FONT_RESOURCES and use it in font sample
Allow copying font files to the Fonts subdirectory of the app bundle,
private fonts can only be loaded from there under macOS currently.
2017-11-13 22:29:29 +01:00
Vadim Zeitlin
cc8657e436 Upgrade libjpeg to the latest version 9b
There don't seem to be any really important changes affecting our use of
the library, but it seems better to use the 2016 version instead of the
1998 one and it also allows to get rid of many hacks that were needed
before as the things they worked around are now taken care of by the
library itself.
2017-11-12 16:32:35 +01:00
Vadim Zeitlin
b9af392704 Remove obsolete COMPILED_FROM_DSP from Expat project files
This symbol is not used any longer since 2.2.0, see the corresponding
entry in Expat change log file.
2017-11-11 20:50:51 +01:00
Vadim Zeitlin
824134d427 Replace Expat sources directory with a Git submodule
This will make it simpler to track upstream in the future.
2017-11-11 20:50:50 +01:00
Stefan Csomor
895a86886d Modelling setup.h modification on osx along msw, having a separate file
Note that for update-setup-h to work properly on osx, gnu-sed is needed
2017-11-09 11:35:36 +01:00
Sean D'Epagnier
1cb7120ac9 support masked or partially transparent windows in wxqt 2017-11-06 02:05:40 +01:00
Vadim Zeitlin
2e9e38aba1 Revert "Work around using Python in Cygwin AppVeyor build"
This reverts commit 257974e321 as it
shouldn't be needed any more after the last commit.
2017-11-03 17:34:51 +01:00
Vadim Zeitlin
69d3c2bf50 Use -g (--upgrade-also) switch with Cygwin setup on AppVeyor
This is necessary to properly upgrade the package dependencies when
installing the new versions of the packages themselves and fixes the
problem with the new Python 2.7.14 failing to run since its package was
updated from 2.7.13.
2017-11-03 17:33:13 +01:00
Vadim Zeitlin
257974e321 Work around using Python in Cygwin AppVeyor build
This doesn't work any longer since Cygwin Python 2.7.14 update, see
https://cygwin.com/ml/cygwin/2017-11/msg00053.html

Avoid using it by preventing include/wx/stc/stc.h file from being
updated, this shouldn't be necessary anyhow as the version in git should
be already up-to-date.
2017-11-03 15:46:33 +01:00
Vadim Zeitlin
c363ce8500 Don't use "-t" option when running tests any longer
This option now lists the available tags instead of showing the timing
information.

We could use Catch "--durations yes" option, but it results in too much
output, so for now just run the tests with default verbosity.
2017-11-02 01:53:29 +01:00
Vadim Zeitlin
e70fc11ef1 Replace CppUnit with Catch for unit tests
Drop the legacy CppUnit testing framework used for the unit tests.
Replacing it with Catch has the advantage of not requiring CppUnit
libraries to be installed on the system in order to be able to run
tests (Catch is header-only and a copy of it is now included in the
main repository itself) and, in the future, of being able to write
the tests in a much more natural way.

For now, however, avoid changing the existing tests code as much as
[reasonably] possible to avoid introducing bugs in them and provide
the CppUnit compatibility macros in the new wx/catch_cppunit.h header
which allow to preserve the 99% of the existing code unchanged. Some
of the required changes are:

 - Decompose asserts using "a && b" conditions into multiple asserts
   checking "a" and "b" independently. This would have been better
   even with CppUnit (to know which part of condition exactly failed)
   and is required with Catch.

 - Use extra parentheses around such conditions when they can't be
   easily decomposed in the arrays test, due to the use of macros.
   This is not ideal from the point of view of messages given when
   the tests fail but will do for now.

 - Rewrite asserts using "a || b" as a combination of condition
   checks and assert macros. Again, this is better anyhow, and is
   required with Catch. Incidentally, this allowed to fix a bug in
   the "exec" unit test which didn't leave enough time for the new
   process to be launched before trying to kill it.

 - Remove multiple CPPUNIT_TEST_SUITE_NAMED_REGISTRATION() macros,
   our emulation of this macro can be used only once.

 - Provide string conversions using Catch-specific StringMaker for
   a couple of types.

 - Replace custom wxImage comparison with a Catch-specific matcher
   class.

 - Remove most of test running logic from test.cpp, in particular don't
   parse command line ourselves any longer but use Catch built-in
   command line parser. This is a source of a minor regression:
   previously, both "Foo" and "FooTestCase" could be used as the name of
   the test to run, but now only the latter is accepted.
2017-11-02 01:53:16 +01:00
Vadim Zeitlin
0d394eec9c Update to bakefile 0.2.11 and rebake everything
The main/only change in this version is the removal of automatic rules
using old Carbon Rez/DeRez/SetFile tools.
2017-10-21 17:42:30 +02:00
Stefan Csomor
dfed16a792 Adding intrinsics for ARM 64 bit ios png builds 2017-09-26 20:09:24 +02:00
Vadim Zeitlin
a156d5fa40 Extract wxPenInfoBase in a separate header
This allows to avoid dependency of wx/graphics.h on wx/pen.h.
2017-09-10 01:24:16 +02:00
Stefan Csomor
f045323934 Adding native macos Cocoa implementation for overlays into build files 2017-09-09 23:34:50 +02:00
Bryan Petty
ed173ed91e Use HTTPS with Trac links. 2017-07-04 13:15:14 -06:00
Stefan Csomor
85a24fd4db properly support weak_linking AVKit when compiling under 10.9 + SDK, even when deployment can be lower, removing QTKit 2017-06-08 10:37:58 +02:00
Dimitri Schoolwerth
249b76baef Fix Xcode-based builds using wxSecretStore
Add the Security framework which is required for linking.
2017-06-07 23:38:54 +04:00
Dimitri Schoolwerth
61e195e6bd Regenerate Xcode projects
Update the Xcode projects to include new Scintilla and wxSecretStore
sources.
2017-06-07 23:38:06 +04:00
Scott Talbert
42964879bc Fix building with WebKit2GTK+
After 2893f894, the extension define quotes need to be escaped.  Additionally,
this fixes monolithic and non-shared builds with WebKit2GTK+.
2017-06-05 23:34:18 -04:00
Stefan Csomor
e8333ebe71 switching to 10.7 deployment minimum, adding required frameworks 2017-06-01 11:26:30 +02:00
Dimitri Schoolwerth
e6928077e2 Fix wxOSX/Cocoa Xcode compilation
Define NO_CXX11_REGEX to be able to compile Scintilla after it was
updated to 3.6.6.

Regression since c03ce59b86 .
2017-05-30 16:02:29 +04:00
Paul Cornett
33f21c8244 Fix building with WebKitGTK+
Duplicate conditionals don't work in bakefiles.
Broken since support was added for WebKit2GTK+ in cbe0a1f
See #17865
2017-05-28 22:40:56 -07:00
Vadim Zeitlin
545bec0bac Revert "Remove last vestiges of Carbon-related tools from the makefile"
This reverts commit 2a3721bf98 because it
requires further changes in bakefile itself to really work under Mac, where
the build would be broken as soon as configure would be regenerated (which was
forgotten by that commit due to another error, and so the two errors finally
cancelled out).
2017-05-27 18:27:26 +02:00
Vadim Zeitlin
2a3721bf98 Remove last vestiges of Carbon-related tools from the makefile
Don't detect DeRez, Rez and SetFile in configure, they are not used any
longer as .r resource files are not used under modern macOS.
2017-05-20 16:50:59 +02:00
Vadim Zeitlin
2893f894ab Limit the use of "webkit2_ext" to autoconf only in bakefiles
This is used by WebKit2 backend under Unix with configure, but is not needed
under the other platforms and prevented bakefile_gen from generating all
output files due to the of undefined USE_WEBVIEW_WEBKIT2 variable.

We could define it for formats other than autoconf, but this doesn't seem to
be useful currently, so just avoid referencing it instead.

Closes #17860.
2017-05-15 23:40:08 +02:00
Vadim Zeitlin
4625439460 Eliminate another insignificant change in MSVS solution file
Somehow the indentation level of one line has changed here, rebake to get rid
of this change.
2017-05-15 23:28:37 +02:00
Artur Wieczorek
8d03282378 Move IUnknown implementation to the separate files
IUnknown interface is used sometimes (e.g. in WinRT implementation of
wxNotificationMessage) alone, without other OLE routines, so it is
helpful to have its code in the separate file to avoid coupling with main
OLE code when only IUnknown implementation is required.
2017-05-09 17:27:21 +02:00
Scott Talbert
cbe0a1f049 Add support for WebKit2GTK+ in wxWebView 2017-04-22 20:00:48 +01:00
Kelvin Lee
c4f6cf21dc Use canonical format for MSVS project/solution files
Use the same format as is used by MSVS itself to avoid spurious changes when
modifying the files. Notably:

- Use DOS end of line format (0D 0A).
- Add UTF-8 BOM (EF BB BF) to the beginning of the files.
- Do not put CR LF at the end of the last line in the file.

Closes https://github.com/wxWidgets/wxWidgets/pull/440
2017-03-18 15:14:26 +01:00
New Pagodi
8af97d8db3 Add reference to the new header file in the MSVS project files
Since 572db9c0a1, files.bkl instructs to create in the pre-MSVS2010 wx_*_base.vcproj files references to the winver.h header file so we need to regenerate these project files in the repository.
MSVS2010+ project files also have to be updated to reflect this change.
2017-02-12 19:56:21 +01:00
New Pagodi
68888ca0a2 Upgrade Scintilla component to 3.7.2
Closes #17705.

Closes https://github.com/wxWidgets/wxWidgets/pull/409
2017-02-12 19:56:21 +01:00
Tobias Taschner
3206df50c4 Add Microsoft Visual Studio 2017 solution file for building wxMSW
Allow building with VS15 out of the box.

Closes https://github.com/wxWidgets/wxWidgets/pull/353
2017-01-16 17:02:10 +01:00