Commit Graph

28 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
a92d711e45 ABX's changes to support MGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-14 20:22:23 +00:00
Václav Slavík
4b167aca0c moved wx-config to wx-config-VERSION (with symlink), to satisfy Debian packagers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-11 20:37:33 +00:00
Václav Slavík
166bcebb8e install headers in prefix/include/wx-version/wx/ instead of prefix/include/wx/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 08:28:28 +00:00
Václav Slavík
48112931db fixes to wx-config config name matching
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-21 10:17:51 +00:00
Václav Slavík
8708fa7618 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-18 11:19:34 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Václav Slavík
af594ecaf1 added support for building eVC projects (not yet tested)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-01 20:20:57 +00:00
David Elliott
bdcc580c3d Update Rez command to reflect new location for .r files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-31 20:49:39 +00:00
Václav Slavík
c79241a238 changes to make building plugins possible; build wxSound SDL plugin on Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 18:31:54 +00:00
Václav Slavík
5d1000e7f1 generate build.cfg file on Windows, with information about settings used to build the library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-05 23:33:24 +00:00
Václav Slavík
004779cd73 added DESTDIR support to make install
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 21:00:27 +00:00
Václav Slavík
d424f5ae6d more visible banner after installation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 15:07:58 +00:00
Václav Slavík
ee929bcff4 change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 21:20:32 +00:00
Václav Slavík
065a32a58f install locales
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 23:11:21 +00:00
Václav Slavík
ca58c9bbb8 added 'make dist' and misc fixes to installed headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 20:35:07 +00:00
Václav Slavík
399a88248a use univ/setup.h when building wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 11:07:23 +00:00
David Elliott
25a4727e95 Added dummy resources for wxCocoa so bundles will build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 14:53:42 +00:00
Václav Slavík
289919bf04 re-added info after installation and added samples target to the main makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 22:38:55 +00:00
Václav Slavík
b0251b161a fixes to setup_h rule
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 19:39:49 +00:00
Václav Slavík
6ee3c06421 fixes to dependency problems in win32 makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 13:03:24 +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
4765217040 added phony target setup_h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 14:59:11 +00:00
David Elliott
622dca25c3 src/mac/corersrc.r is in $(top_srcdir) not ".."
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 15:29:44 +00:00
Václav Slavík
4cd612f944 install setup.h before compiling on windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-27 13:41:21 +00:00
Václav Slavík
e86e15224d many changed to enable multilib build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-25 16:29:51 +00:00
Václav Slavík
f70083b694 fixed OSX resources invalid path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 20:13:44 +00:00
Václav Slavík
ddf9896893 moving bakefile build system to the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-23 19:50:43 +00:00