Commit Graph

53 Commits

Author SHA1 Message Date
Vadim Zeitlin
5d5591816d Update to bakefile 0.2.13 to fix DLL directory creation
Fix the bug introduced in ec0734f96f (Install DLLs in bindir, not
libdir, when using MSW toolchains, 2021-01-09): the directory where the
DLLs were installed wasn't created any more, resulting in errors if it
didn't exist.

Update to latest bakefile version adding the missing mkdir command to
fix this and also use a released bakefile version for the wx makefiles.

Regenerate configure to match the new version.

See #14601.
2022-04-23 23:11:31 +02:00
Arrigo Marchiori
30915c6163 Make wxrc independent from GUI support
The wxrc program does not depend on the GUI libraries, but only on
the base and XML libraries, so make it possible to build it in non-GUI
builds too.

Closes https://github.com/wxWidgets/wxWidgets/pull/2419
2021-08-06 21:51:11 +02:00
Vadim Zeitlin
f5001e728c Rebake with bakefile 0.2.12
No real changes, just synchronize with the bakefile release used now.
2020-05-02 17:02:36 +02:00
Maarten Bent
343bd89b63 Rebake after changes 2020-03-27 23:15:03 +01:00
Maarten Bent
a72c9b6dbc Run autoconf and rebake after adding wxUSE_DPI_AWARE_MANIFEST 2019-10-30 00:02:08 +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
Bryan Petty
164d5dbb37 Sync EOL normalization settings.
This reflects additions to .gitattributes in last commit.

See #15584
2015-03-17 13:47:20 -06:00
Vadim Zeitlin
0d4ad161d5 Remove support for Win9x from wxMSW.
Most importantly, this allows us to remove all MSLU-related stuff.

Some functions which were previously loaded dynamically can now be just used
directly, too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 02:33:40 +00:00
Vadim Zeitlin
bed99c2256 Rebake the rest of the files after TOOLKIT change in MSW bakefile.
This should have been part of r74406 but I only rebaked wxWidgets make/project
files themselves and not the samples/utils/demos files in it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 12:32:23 +00:00
Vadim Zeitlin
22a3b6e4b2 Don't include wxUniversal configurations in MSVC project files.
wxUniversal is practically not used under MSW and just confuses people.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-21 16:37:01 +00:00
Steve Lamerton
92b4653a62 Rebake trunk after wxWebView merge and add missing project files for the wxWebView library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 10:12:19 +00:00
Vadim Zeitlin
00eef16d51 Rebake everything using bakefile 0.2.9.
Update configure and bakefile.m4 for the new version too.

Also add the missing makefiles and projects for the XTI sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-03 15:02:45 +00:00
Václav Slavík
b796194b15 Regenerated makefiles after removing USE_GDIPLUS.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-09 14:14:26 +00:00
Kevin Ollivier
f82b7036e8 Rebake after last commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-18 19:22:58 +00:00
Vadim Zeitlin
7880889720 Rebake everything using bakefile 0.2.7.
Also updated aclocal inputs and regenerated configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-22 16:53:10 +00:00
Kevin Ollivier
d5e7ffcf7a Make sure all Bakefile formats that use CRLF line feeds are set to use CRLF in SVN.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 04:07:02 +00:00
Vadim Zeitlin
d33ccbe15c Rebaked everything with bakefile 0.2.6 after wxRibbon merge.
0.2.5 versions of some makefiles were checked in, regenerate them using 0.2.6.

Also regenerate configure after autoconf_inc.m4 was updated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-16 13:07:10 +00:00
Peter Cawley
3c3ead1d15 Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-16 12:06:02 +00:00
Vadim Zeitlin
873c1a2300 Reenable build of execmon in utils bakefile.
Undo r61894, it's not necessary to disable build of execmon any longer after
r61901.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-13 11:55:08 +00:00
Vadim Zeitlin
63f4968cd1 Disable build of utils/execmon.
Bakefile for this program doesn't exist so its makefiles are out of date and
it doesn't build any more now, disable its build until the bakefile is checked
in.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-12 15:29:11 +00:00
Francesco Montorsi
aa113d87d7 adding the first raw version of the execution monitor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-12 11:44:00 +00:00
Vadim Zeitlin
0e0d3ae110 added wxrc to the makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-03 22:58:45 +00:00
Vadim Zeitlin
506e9b7ed2 rebaked using bakefile 0.2.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-27 16:40:51 +00:00
Francesco Montorsi
63052a509d add to utils.bkl the hhp2cached (why wasn't already there?) and screenshotgen utilities
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-06 10:00:30 +00:00
Francesco Montorsi
eeb67742cd removed old utils (helpgen, tex2rtf, helphtml, nplugin, wxprop, wxole)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-27 14:03:33 +00:00
Francesco Montorsi
5934cda171 added the interface checker to the utils folder
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-22 18:02:13 +00:00
Václav Slavík
6e0fbb3dbf regenerated makefiles with bkl-0.2.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-23 12:13:07 +00:00
Vadim Zeitlin
6490a288bb rebaked and regenerated everything after the latest changes (wxWeakRef &c)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-13 02:48:17 +00:00
Vadim Zeitlin
cef590ee27 added src to the HelpGen directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-04 00:28:14 +00:00
Robin Dunn
25bb1412af Move version number to 2.8.0.0 and rebake the makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-10 02:32:01 +00:00
Robin Dunn
3abcf424a3 Bumping the version number also requires that version.h be modified,
and also rebaking the makeifles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-09 01:20:56 +00:00
Włodzimierz Skiba
c744d3f862 'configtool' removal.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-19 15:37:21 +00:00
Julian Smart
3b2cb4316b Moved wxRichTextCtrl to its own library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-29 07:16:39 +00:00
Vadim Zeitlin
cf9b63b38a regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl as it's now defined by bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:27:51 +00:00
Michael Wetherell
9d309aad76 Rebake all the VC++ project files and makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 23:06:27 +00:00
Michael Wetherell
ab6ea1ac2f Regenerate the msvc makefiles after TARGET_CPU option added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-16 20:35:41 +00:00
Julian Smart
0d90d6ea7a Rebake for 2.6.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-28 12:48:14 +00:00
Julian Smart
8c9f8f91cd Updated version to 2.5.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-23 13:05:13 +00:00
Julian Smart
162a956bb6 Regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-12 19:01:50 +00:00
Ryan Norton
c33fae85b0 Regen Bakefiles for OSX HID integration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 06:53:08 +00:00
Julian Smart
c4839ccf58 Regenerated makefiles for 2.5.2
Other version updates
Added list of Cocoa files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-24 14:12:40 +00:00
Václav Slavík
b92ca8cf62 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 19:36:30 +00:00
David Elliott
c3255f5fba Bakefile 0.1.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 02:14:15 +00:00
David Elliott
b17c174693 Baked files with Bakefile 0.1.2 (Mac OS 10.3 Python 2.3)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 03:48:09 +00:00
David Elliott
69ada15b30 Baked files with Bakefile 0.1.1 using Python 2.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-19 06:16:56 +00:00
Václav Slavík
e1e61c81bd fixed utils.bkl to include all utils
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-03 15:52:48 +00:00
Vadim Zeitlin
b71531ad92 regenerated after adding gzstream.* and vidmode.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-27 15:48:14 +00:00
Václav Slavík
19c35fa587 forgot to commit some regenerated files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 13:37:20 +00:00
Václav Slavík
2ace007846 added HelpGen makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 22:11:12 +00:00