Commit Graph

71 Commits

Author SHA1 Message Date
Ron Lee
589e20d03c Move the WX_FLAVOUR variables to be defined generally, not just for
autoconf builds, else the wince targets (at least) will complain.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 15:08:33 +00:00
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
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
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
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
Stefan Csomor
0b0efa9a67 corrected Info.plist.in location
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-27 12:14:34 +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
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
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
1857c88d26 Ignore isosurf.dat.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 04:50:11 +00:00
Dimitri Schoolwerth
5cf036d017 Fixed Open Watcom compilation of OpenGL samples; Code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 04:21:10 +00:00
Václav Slavík
e1a098d1ec fixed bakefile so that in-tree headers take precedence over system-installed ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 21:37:54 +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
Julian Smart
ec08d395bd Updated makefiles etc. for 2.5.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 15:36:27 +00:00
Julian Smart
2db98bf520 Applied patch [ 802596 ] warning and error free Open GL samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 07:20:55 +00:00
Václav Slavík
5a89970f76 opengl fixes for msvc5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 18:53:57 +00:00
Václav Slavík
22cef5668d better way of dealing with EXTRALIBS_xxx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 22:15:25 +00:00
Václav Slavík
e09c7b2d62 forgot to commit regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-08 17:11:29 +00:00
Václav Slavík
a93aa55a00 fixed win32res
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-03 20:16:10 +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
b328fad371 regenerated with fixed version of bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-23 11:38:02 +00:00
Robin Dunn
e8f60bac1a regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-22 21:02:44 +00:00
Václav Slavík
6c04a87329 removed old bc++ makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 21:22:26 +00:00
Václav Slavík
75a0a7b7de change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-15 22:08:13 +00:00
Václav Slavík
1ee9f07ca1 removing old makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 17:13:25 +00:00
Václav Slavík
17283f91ee corrected DSW dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 16:49:50 +00:00
Václav Slavík
a1900c9e1d new VC++ project files with both dll and lib in one project
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 22:43:53 +00:00
Václav Slavík
ab892b9519 makefiles update with OSX fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 12:38:44 +00:00
Václav Slavík
4e209a2064 1) some compilers (Watcom) don't like it if wxBase library PCH file contains
symbols from GUI components and won't link a DLL
2) fixed subdirs recursion code - all options must be output
3) fixed subdirs recursion code - all options must be output
4) fix for watcom resource compiler


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-08 13:15:16 +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
e93c6860ed added opengl samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-05 20:42:41 +00:00
Gilles Depeyrot
99c2d4f20c added CarbonFrameworkLib to CodeWarrior 5 projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 11:24:49 +00:00
Ron Lee
b1d4dd7add Split this out from other changes to keep things sane..
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 05:17:41 +00:00
Julian Smart
df37f0c65c Added opengl32.lib glu32.lib to OpenGL samples VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 18:37:28 +00:00
Julian Smart
c31752dadf Updated version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-05 11:08:08 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Gilles Depeyrot
33ac313082 updated CW exported xml projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-24 21:08:41 +00:00
Gilles Depeyrot
0f15e00bcb updated CodeWarrior 5.3 exported xml projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-09 12:38:11 +00:00
Vadim Zeitlin
2f6c54eb07 patch from Dimitri fixing a few memory leaks and unTABbing the sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-17 14:16:03 +00:00
Vadim Zeitlin
27fd024644 inserted @IF_GNU_MAKE@ to allow building with other make versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-25 11:31:21 +00:00
Julian Smart
847341dbeb Updated VC++ files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-18 14:33:01 +00:00
Gilles Depeyrot
c97ff4d83d changed PPC struct alignement setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-12 19:56:08 +00:00
Gilles Depeyrot
afcca39be9 store CodeWarrior 5.3 projects as xml instead of binary projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-02 18:11:49 +00:00
Vadim Zeitlin
a6f762a646 replaced "CC = gcc" and even stranger "CPP = gcc -g" (huh?) with
"CXX = $(shell wx-config --cxx)" in all makefile.unx


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-28 18:10:15 +00:00
Vadim Zeitlin
f6656ccb14 replaced wx-config --cflags with wx-config --cxxflags and mentioned that
it must be done in user makefiles too in changes.txt


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-28 12:30:26 +00:00
Gilles Depeyrot
9d705dfa81 applied SourceForge patch #479670 (fixes for OpenGL samples) by Paul Thiessen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-16 07:17:37 +00:00
Vadim Zeitlin
750b113f76 updated templates and regenerated project files for OpenGL samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-10 12:55:54 +00:00