d36dbec9c6
3 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Robin Dunn
|
6de5430bc6 |
Updated debian-dist and debian package scripts from 2.6 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 |
||
|
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
|
||
|
Ron Lee
|
3a922bb4bd |
More build system polishing.. mostly. Some stuff ported over from
recent changes to the 2.2 branch. Rationalised the autoconf scripts again, removed lots of stuff that shouldn't be there anymore and pounded the rest into an even tighter furball. (There's more work to be done here, but we're getting there..) Implemented the library naming scheme outlined in tn0012.txt -- introduced 'toolchain' and 'widget set' into the autoconf scripts, obsoleted the top level wx/setup.h and much of the mess associated with it. More changes for cross compiling and 2.3 debs. s/burnt_name/soname/g ; s/CC/CXX/g ; s/CCC/CC/g ; Just because it's Right. (Thanks Vadim for already doing *FLAGS..) Fixed libfl Makefile to actually work. Removed *_DEPS from tmake templates, in every case they can be determined from the relevant *_OBJS Added BASE_MSW_OBJS, a couple of missing #includes, some missing files to the 'dist' targets, and fixed some compile warnings. Changed setup.py to use wx-config --gl-libs instead of hard coded constants. Modified Files: Makefile.in configure configure.in setup.h.in wx-config.in wxBase.spec wxGTK.spec wxMotif.spec contrib/include/wx/applet/window.h contrib/src/Makefile.in contrib/src/applet/appletwindow.cpp contrib/src/fl/Makefile.in debian/changelog debian/control.in debian/libwxbase-dbg.dirs debian/libwxbase-dbg.links debian/libwxbase-dbg.postinst debian/libwxbase-dbg.prerm debian/libwxbase-dev.dirs debian/libwxbase-dev.files debian/libwxbase-dev.links debian/libwxbase-dev.postinst debian/libwxbase-dev.prerm debian/libwxgtk-dbg.dirs debian/libwxgtk-dbg.links debian/libwxgtk-dbg.postinst debian/libwxgtk-dbg.prerm debian/libwxgtk-dev.dirs debian/libwxgtk-dev.files debian/libwxgtk-dev.links debian/libwxgtk-dev.postinst debian/libwxgtk-dev.prerm debian/rules distrib/msw/tmake/base.t distrib/msw/tmake/gtk.t distrib/msw/tmake/mgl.t distrib/msw/tmake/motif.t distrib/msw/tmake/msw.t distrib/msw/tmake/os2.t distrib/msw/tmake/univ.t docs/motif/install.txt include/wx/msw/private.h include/wx/os2/SETUP.H include/wx/os2/SETUP0.H samples/ipc/Makefile.in samples/sockets/Makefile.in src/files.lst src/make.env.in src/makelib.env.in src/makeprog.env.in src/common/strconv.cpp src/gtk/files.lst src/mgl/files.lst src/motif/files.lst src/msw/files.lst src/msw/gsocket.c src/msw/gsockmsw.c src/msw/toplevel.cpp src/msw/utils.cpp src/os2/files.lst src/univ/files.lst wxPython/setup.py Added Files: debian/libwxbase-msw-dev.dirs debian/libwxbase-msw-dev.links debian/libwxbase-msw-dev.postinst debian/libwxbase-msw-dev.prerm debian/libwxmsw-dev.dirs debian/libwxmsw-dev.links debian/libwxmsw-dev.postinst debian/libwxmsw-dev.prerm debian/wxwin-doc.doc-base debian/wxwin-headers-msw.dirs Removed Files: debian/wxwin-doc.doc-base.in include/wx/setup.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 |