Commit Graph

65 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
Václav Slavík
9a8f051375 moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-20 19:30:20 +00:00
Vadim Zeitlin
ef335a4fa8 rebaked to include latest modifications (mainly choicebkg addition)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-19 12:05:11 +00:00
David Elliott
ea7db9ff0a Support building X11 and Motif on Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-04 00:35:43 +00:00
David Elliott
e835546c77 Added Bakefile conditions used by recently updated samples/dialogs/Makefile.in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-22 15:56:10 +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
e3a0d44cd4 removed GzipStreams, upgraded zlib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-25 08:57:44 +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
Ron Lee
616d1b3cb0 Last minute changes to fix 2.5.1.1 debs for release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-14 14:02:04 +00:00
Ron Lee
5259a4179c Remove demos from the Debian -examples package.
Replace html lib in tex2rtf build, it is needed for any platform
where wxHelpController == wxHtmlHelpController.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 09:45:10 +00:00
Ron Lee
e1293dcf96 Updates for debian build scripts to suit new library and tool status.
Updated config.{sub,guess} for new platform support.
Incorporated fixes to GNU/Hurd support and added GNU/K*BSD support.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-03 07:10:36 +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
Václav Slavík
0aa7fa9afd applied patch 890642: wxRE_ADVANCED flag and docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-19 18:02:48 +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
Václav Slavík
2ece66cf55 autoconf_inc.m4 was corrupted as well, fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-04 19:58:46 +00:00
Václav Slavík
002ed9af83 renamed wxWave to wxSound
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-02 14:34:35 +00:00
Václav Slavík
f93ca9fd7e 1. optionally use libSDL for wxSound
2. added --enable-plugins for dynamically loadable SDL backend
3. fixed OSS detection to not be Linux specific


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 18:29:49 +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
Robin Dunn
7fcf27da12 x11/popupwin.h wasn't being installed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-13 01:36:35 +00:00
Ryan Norton
7b0c29b97b 1.
Regenerated Bakefiles

2.
Added regextest sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-20 13:08:29 +00:00
Mattia Barbon
833a51f67e Implemented wxPopupWindow for wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-14 17:05:28 +00:00
Václav Slavík
4bc89de684 added .chm support for Unix (Markus Sinner) -- regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 20:20:53 +00:00
Václav Slavík
a4ad36cdc5 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 13:49:34 +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
Mattia Barbon
05e770c40e Use glcanvas.cpp from wxX11 for wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 19:25:45 +00:00
Mattia Barbon
9fd04ddee8 Various fixes to contrib bakefiles. Regenerated corresponding
Makefile.in.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-12 21:49:46 +00:00
Mattia Barbon
73d617c9c7 Removing makegen and projgen, part #1: removing references
in other parts of wxWindows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-07 20:23:55 +00:00
Václav Slavík
1c3a6972f4 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-24 10:23:35 +00:00
Václav Slavík
3d8c1de070 more OS/2 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 16:00:55 +00:00
Václav Slavík
96c1699d51 (blind) OS/2 build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-20 13:56:20 +00:00
Václav Slavík
187cf772fa regenerated makefiles after fixing files.bkl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 11:17:34 +00:00
Julian Smart
8a82c9ecc9 Moved wxToolBarSimple to deprecated library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 10:20:08 +00:00
Václav Slavík
eb69fda554 ODBC library is built when wxUSE_GUI=0, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 19:54:59 +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
52a5a0098a don't install builtin 3rd party libs with shared version, only with static one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-10 11:54:20 +00:00
Václav Slavík
4584250034 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 11:52:38 +00:00
Václav Slavík
87e7f16682 fixed wrong srcdir in contrib w/ autoconf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-07 22:05:00 +00:00
Václav Slavík
fd9f42b6a9 regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-06 22:44:22 +00:00
Václav Slavík
bb41dcbe3a moved DB classes into wxODBC library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 19:14:54 +00:00
Václav Slavík
131f235d04 moved wxWave, wxJoystick and wxTaskBarIcon to wxAdvanced
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 13:52:31 +00:00
Václav Slavík
6c67131a07 --enable-debug_flag and --enable-debug_info work again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 15:03:33 +00:00
Václav Slavík
66a967448d separated wxBase and wxNet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 23:00:22 +00:00
Václav Slavík
64d19dba31 configure changed after 3rd party libs condition changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-27 13:17:20 +00:00
Václav Slavík
672abd7a83 moved XML classes to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 21:50:39 +00:00
Robin Dunn
250700e4ac A new set of baked makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-20 00:06:37 +00:00
Václav Slavík
4d2643327c re-added OpenGL canvas
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 22:27:21 +00:00
Václav Slavík
6e22c52489 updated to correctly install wx-config and wxMSW headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-14 16:05:25 +00:00
Václav Slavík
d78c94f200 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-05 20:45:00 +00:00