Commit Graph

100 Commits

Author SHA1 Message Date
Ron Lee
0506bbbfdf Undo the link creation in builddir. contrib is still going to be
here for a while so there isn't much paydirt in working around the
problems on platforms with limited filesystems at this stage.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 11:56:48 +00:00
Ron Lee
ecd16d74ce Get rid of the symlink farm in $builddir too, contrib is here
to stay for a while.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 16:00:21 +00:00
Ron Lee
9103d280f9 Install the config files for cross debs under /usr/$(host), but link them
to the default system location under /usr.  This way the commands:
wx-config --prefix=/usr/$(host) and wx-config --prefix=/usr --host=$(host)
are much more congruent in their action.

Another nail in the coffin for inplace hacks.  Link $srcdir/include to
the build dir so that --prefix=$build_dir really does point to a
realistic looking installed development environment.  I don't know why
I didn't do this instead of (ab)using --exec-prefix to 'fix' this
simple omission for so long.  Probably because it is much more obvious
if contrib is out of the picture.  That makes it a little more work
right now, but long term this is a very clean and correct thing to do.
It completely absolves us of the two independent variables problem,
and of the tree becoming bogus without actually being stale.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 20:29:51 +00:00
Ron Lee
5636172bce Filter out the 'std' pseudo-lib from monolithic builds too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 23:46:54 +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
Václav Slavík
c39ee0ad46 don't output -DwxUSE_GUI=0 in monolithic build, setup.h will take care of setting it correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-08 16:30:03 +00:00
Stefan Neis
2001ecbc76 Fixed typo reported by Ian Brown.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-04 08:37:19 +00:00
Vadim Zeitlin
224bf05c9b added --version-full option to wx-config
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-01 22:21:54 +00:00
Václav Slavík
838c9bd039 documentation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-25 10:07:24 +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
Václav Slavík
14885f0910 complain about unrecognized flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-17 21:54:31 +00:00
Václav Slavík
89816e4f30 cleaned up --inplace description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-17 18:52:18 +00:00
Václav Slavík
251f47d1ea modified arguments syntax to be wx-config [options] [libraries list]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-17 17:48:37 +00:00
Vadim Zeitlin
a43ed08aa8 made --cppflags return -DwxUSE_GUI=0 when used with --libs=base
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-12 23:29:57 +00:00
Václav Slavík
74b8433210 put -DNO_GCC_PRAGMA into CPPFLAGS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-29 20:36:13 +00:00
Václav Slavík
cadfae2b76 documentation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-28 16:26:02 +00:00
Václav Slavík
16327fd824 re-added --inplace documentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-27 09:00:52 +00:00
Vadim Zeitlin
bc79eb4f76 fixed spellign typo in comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-08 08:58:44 +00:00
Vadim Zeitlin
127e9080f1 add -Icontrib/include when using --inplace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-08 08:57:44 +00:00
Vadim Zeitlin
1d8864ac63 added support for --libs=std,... syntax in wx-config
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-06 23:42:31 +00:00
Václav Slavík
efe6c06ffc --static flag docs correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 13:18:54 +00:00
Ron Lee
b63b07a809 More updates to the Debian packaging for wxPython, unicode and
the project name change.

Applied patch from ABX to make tex2rtf unicode compatible, then
removed wxSprintf lameness from it so it might actually work.
Also modified it to return true from tex2rtf OnInit in console
builds so the app will exit with a successful return code rather
than always returning failure even when it succeeds.

Implemented unicode capable wxCtime for glibc systems also needed
by tex2rtf.

Wrapped dde include in tex2rtf in a guard and assert that dde is
MSW only in its forwarding header.

Lowered the limit of maxlen in wxSprintf so it actually has a
chance to segfault on people instead of failing silently and
mysteriously with glibc.

Silenced some other 'potentially uninitialised variable' warnings
from gcc3, most of which were bogus, one potentially not so.

Added missing newline at the end of fontdlg.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 17:40:38 +00:00
Stefan Neis
31414f4c19 Do a configure test whether or not to include -I/usr/local/include in
wx-config --c*flags instead of never doing it for gcc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-15 14:14:03 +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
Vadim Zeitlin
09d3439cc2 fix for wx-config --inplace --rezflags output in wxCocoa (and reorganization of code common to wxMac/wxCocoa)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 11:28:06 +00:00
Václav Slavík
3527f29c87 added .chm support for Unix (Markus Sinner)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 20:15:27 +00:00
Václav Slavík
ffef10f672 output -Wl,--subsystem,console for Mingw if any GUI library is used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-16 16:12:31 +00:00
Václav Slavík
edd891e220 fix the situation when one of sublibraries is not built
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 15:09:17 +00:00
Václav Slavík
0154f61aa8 fix for broken --inplace, --prefix and --exec-prefix handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 14:51:55 +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
9818fdf902 added wxAdvanced
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-02 01:14:10 +00:00
Robin Dunn
9171d4b479 fixed --basename
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-31 21:30:03 +00:00
Václav Slavík
3338009913 reorganized wx-config to have all configure-modified values in one part and script logic in another, so that the former can be moved to another file to allow choosing from installed wx versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 09:44:43 +00:00
Václav Slavík
67c13b6cf5 more fixes: add host_alias suffix when cross-compiling; add builtin 2rd party libs to --libs output; always include wxbase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 09:10:55 +00:00
Václav Slavík
fef23dd452 fix wxBase name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 23:06:59 +00:00
Václav Slavík
a3ea8b5c09 fixed a small bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 22:53:16 +00:00
Václav Slavík
cf615ebbb1 adapted wx-config to work in multilib mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-29 22:42:16 +00:00
Václav Slavík
c74dc1630d don't link wxBase against GUI libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 18:55:09 +00:00
Václav Slavík
f0290fcacd oops, partially reverted previous commit, it was incorrect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 09:25:45 +00:00
Václav Slavík
fddeb06b11 use CODE_GEN_FLAGS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-29 09:17:26 +00:00
Václav Slavík
e90ed8ad58 moving to autoconf-2.5x
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 22:12:12 +00:00
Václav Slavík
2f42e5b6bf added --basename and --release flags to wx-config (patch #750815)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-18 16:08:15 +00:00
Gilles Depeyrot
36825681b5 improved Mac resource creation step in order to allow samples to provide
specific Rez options (used in docview sample)
added separate Mac Finder flag modification step (using SetFile)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-27 22:18:18 +00:00
Vadim Zeitlin
52c71b808f experimental --inplace flag implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 03:09:08 +00:00
Ron Lee
dc5e3b9ec5 gah. escape $ in the here block.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 22:50:23 +00:00
Ron Lee
82a649b67c reverted the --inplace addition and instead documented the use of
--prefix and --exec-prefix to do the same thing.  I can't think of
any way to do this right now with one flag without making some
assumption about the users working habits.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-15 22:44:38 +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
Robin Dunn
e26c13cffd Ensure -D_FILE_OFFSET_BITS=64 also gets on the command line when
needed, and also fix wx-config to output the largefile flags


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-05 20:12:08 +00:00