Commit Graph

266 Commits

Author SHA1 Message Date
Ron Lee
ceec2216bd wx-config2.6
Designed to be resiliant against future cut and paste coders.  Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble.  In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs.  Functions now all have api
descriptions.  If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.

Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer.  Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future.  In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied.  If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested.  At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.

Removed references to --gl-libs in --help.  It still exists, but if
its deprecated, no need to fill space in a compact help summary.  It
will remain documented (as deprecated) in the man page.

Removed references to arcane order rules for arguments.  Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.

Removed references to --inplace, it doesn't need to be in the summary
help either.  It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly.  When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case).  If you do type it when you don't need it, bad things will
probably happen just like they always would have.

Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging.  If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.

Command line input is now controlled by a small generic parser.  You
define what options you want and what groups you want them in by
initialising them as lists.  It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.

Added a validator for it to check yes/no options.

Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.

Made --list more user friendly.  It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix.  Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called.  We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.

Delegation.  Too big a topic to remark on in depth here, see the code
for a fuller description.  With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified.  This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.

Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.

Added the inplace-config tweak for use in the build tree.  This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed.  It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with.  In that event, it will try to delegate as per the
normal rules.

The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs.  It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)

Enabled full support for static builds again, promoted --static to a
full feature option.  Fixed --ld to return something for them too.

Added --flavour, similar to the existing --vendor, but for autoconf
builds.  These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.

Fix bit rot in make-dist due to new/deleted files.

Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution.  Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about.  Remove extra files and symlinks added for the two
part wx-config version.

Removed the debian -contrib packages.  We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required.  This means the retained contribs will
now get __WXDEBUG__ versions packaged too.

Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.

Added support for flavoured debs as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
Włodzimierz Skiba
db11ea905f Support for comma in contrib gizmo wxLEDNumberCtrl (patches #1006434, #1007063 with modifications).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-25 18:50:52 +00:00
Włodzimierz Skiba
794f464d1d No mondrian.ico file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-16 12:47:44 +00:00
Włodzimierz Skiba
9cf662c492 GCC fixes: order of initializations, type casting, empty last lines.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-05 15:01:34 +00:00
Włodzimierz Skiba
289d1ddbaf Makefiles for foldbar sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-03 14:46:56 +00:00
Włodzimierz Skiba
f857e441bf Full headers, Unicode markup, whitespaces, wxID_ANY, wxDefaultCoord conventions applied with some warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-03 14:39:09 +00:00
Vadim Zeitlin
957f5ab77a added foldbar contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-03 11:18:36 +00:00
Włodzimierz Skiba
c7f8ebf848 wxUSE_STL fixes and suggested coding of -1/TRUE/FALSE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-30 15:28:32 +00:00
Włodzimierz Skiba
e38c6b5fc7 wxUSE_STATLINE fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-23 18:06:03 +00:00
Włodzimierz Skiba
5e0dbc8dd9 wxUSE_STL fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-23 18:04:12 +00:00
Włodzimierz Skiba
36ca94a260 wxUSE_STL fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 19:07:59 +00:00
Włodzimierz Skiba
8833e26cbd wxUSE_STATLINE fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 18:47:17 +00:00
Włodzimierz Skiba
fa0d344773 wxUSE_LOG fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-20 17:04:02 +00:00
Włodzimierz Skiba
422d0ff0be wxDefaultSize.* and wxDefaultPosition.* to wxDefaultCoord.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-20 10:09:47 +00:00
Włodzimierz Skiba
d96cdd4a88 Fixes for wxUSE_STATUSBAR.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-19 15:14:07 +00:00
Włodzimierz Skiba
63a24a91a9 VC warning fix and update to curent state of wxW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-14 19:30:00 +00:00
Włodzimierz Skiba
dea7e44a76 -1, TRUE/true, FALSE/false and tabs replacements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-16 15:22:59 +00:00
Dimitri Schoolwerth
dabbc6a5a1 removed SetAutoLayout(true) calls when a corresponding SetSizer() was also called (the latter already calls SetAutoLayout(true) in case of a non-NULL window); usual cleanup: removing tabs and end of line whitespace, TRUE->true, FALSE->false, -1->wxID_ANY, Enable(false)->Disable(), ""->wxEmptyString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-12 23:44:08 +00:00
Włodzimierz Skiba
f80ea77b4a wxID_ANY, wxDefaultSize, wxDefaultPosition, wxNOT_FOUND, true, false, tabs replacements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-11 13:14:23 +00:00
Włodzimierz Skiba
2ba06d5a8c -1->wxID_ANY, TRUE->true, FALSE->false and tabs replacements. Correct help system in non MSW builds of OGL-Studio sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-09 16:42:34 +00:00
Włodzimierz Skiba
a2d49353d4 -1->wxID_ANY, TRUE->true, FALSE->false and tabs replacements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-08 19:27:42 +00:00
Włodzimierz Skiba
c82c42d498 -1->wxID_ANY, TRUE->true, FALSE->false and tabs replacements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-07 16:02:23 +00:00
Dimitri Schoolwerth
2a21ac1590 applied patch #935127: "wxDIALOG_MODAL and wxDIALOG_MODELESS cleaning"; some cosmetic cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 12:44:56 +00:00
Julian Smart
be5a51fb59 More name changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 11:20:37 +00:00
Julian Smart
37699af5bb Bakefile/Makefile fix for uuid.cpp
Removed some obsolete project files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-24 20:28:06 +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
Mattia Barbon
99940d1bab Patch #952359 from ABX: contrib updates after wxHashTable and
other recent changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-15 17:38:29 +00:00
David Elliott
3fd9c29882 Baked with Bakefile 0.1.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-09 21:44:08 +00:00
Dimitri Schoolwerth
d1f4723592 applied patch #929947: "Various cleaning of warnings under MSW"; removed some tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-06 13:19:42 +00:00
Stefan Csomor
1346242154 corrected Info.plist.in location
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-27 10:54:30 +00:00
Václav Slavík
b598205862 another cleanup of constraints code in samples (patch #906438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 21:13:00 +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
Julian Smart
2b3644c715 Applied patch [ 875663 ] Warning free mmedia contrib
ABX


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 11:56:22 +00:00
Robin Dunn
e411268c8c Start out with the line numbers not shown.
Don't use the default size for the AppFrame.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 17:36:28 +00:00
Václav Slavík
078c7a596d makefiles update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-05 22:34:18 +00:00
Dimitri Schoolwerth
d301b8a247 Applied most of patch #880002: "Warning free plot contrib".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-29 23:30:21 +00:00
David Elliott
b92ca05a69 Baked bakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-24 06:22:55 +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
Chris Elliott
756d3e7fb5 apply SF patch 876817
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-14 15:28:37 +00:00
Julian Smart
83ae4c616c Must have event.Skip() in OnSize for wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 13:32:07 +00:00
Dimitri Schoolwerth
2b5dcd17c1 To use "#pragma warning" a #ifdef __VISUALC__ guard should be used, not a #ifdef _MSC_VER one (CW defines _MSC_VER).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 02:07:44 +00:00
Julian Smart
93210c68cb Applied patch [ 868061 ] Warning free OGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 14:35:36 +00:00
Julian Smart
ba597ca831 Applied patch [ 867158 ] Warning free gizmos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-08 08:35:31 +00:00
Julian Smart
8e74bcb2a4 Fixed palette so all tools are visible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-29 10:47:51 +00:00
Václav Slavík
9bfe7ad92d regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-15 11:42:03 +00:00
Dimitri Schoolwerth
88b98c53ac Applied patch #845884 (Fixes Unicode compilation of stc sample with Watcom).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-20 23:49:18 +00:00
Mattia Barbon
8552e6f031 Warning fixes and deprecated method elimination from ABX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-09 21:40:34 +00:00
Robin Dunn
f4cf4fdab2 Patch #821454
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-11 01:20:24 +00:00