Commit Graph

39 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
2006-06-01 22:22:02 +00:00
Ron Lee
109898eaad Update standards version. Rip out wxrcedit cruft. Fix wxpyver dir.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-23 07:55:23 +00:00
Ron Lee
d103642201 Restore the no longer default, sensible defaults.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-23 00:44:25 +00:00
Ron Lee
f0f9cbf283 Replace files from 2.5 that still overlap.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-12 17:08:08 +00:00
Ron Lee
eedbe99970 Remove static libs from package build.
Trim configure options to reflect new defaults.
Make i18n package conflict/replace.  Not my first choice.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-11 13:30:06 +00:00
Ron Lee
c7ff293b42 Enable gnomeprint support for the .debs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-13 12:38:16 +00:00
Ron Lee
fdefae196a Clean up the soversion/flavour labelling of binary runtime packages.
Split out a common wxPython package so the runtime support for it
doesn't need to conflict any more either.

Makefile.in was apparently committed from out of date bakefiles
so it is included here again too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-04 05:14:55 +00:00
Ron Lee
22642fb2b8 Filter any arguments back to 2.4.2.6 syntax before
handing them on to a legacy wx-config.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 16:10:54 +00:00
Ron Lee
a13a7f891a Add support for legacy 2.4 installs to wx-config.
Add /utils/wxrc to the dist target and fix some things that still
think it is in contrib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 13:28:25 +00:00
Ron Lee
148e141b23 Enable concurrent installs of runtime packages after a soname change.
Add a common package for afm metrics, and other 'static' data and utilities.
Remove the version/flavour from afm installs on unix as discussed with Vaclav,
these files really do never change.
Mention --static along with other selection options in --help.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 14:47:08 +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
Ron Lee
6181913e8e Ported forward improvements from the 2.4.2.6 release.
This still won't build new 2.5 packages yet, but it is changes
that will happen anyway so I'm checkpointing the diff here.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-06 04:51:11 +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
Ron Lee
8ddf18dd0d Updates to packaging from the 2.4.0.2 release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:20:13 +00:00
Ron Lee
dc18c8f1b2 update libpng-dev deps.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 23:55:51 +00:00
Ron Lee
094e328c21 Changes resulting from the 2.4.0 release run.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-11 03:50:44 +00:00
Ron Lee
deefd67952 Recommend python-xml for xrced.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 23:47:08 +00:00
Ron Lee
0ecfbbea12 Incorporate changes from 2.4 release.
Bump standards version.
Update overrides for 2.5
Disable generation of gtk-univ package.
Update wx-config manpage.
Add wxPython-tools manpage(s).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 22:51:42 +00:00
Ron Lee
8155b6405f Update packaging for 2.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 09:16:10 +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
Ron Lee
e0252fb681 More packaging updates for pending 2.3.3 release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-01 22:58:21 +00:00
Ron Lee
fdb599058d Updates for 2.3.3 debs.
Typo fix for start of local event id's.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-23 03:33:12 +00:00
Ron Lee
10916a4f7a backported 2.2 packaging fixes for python 2.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-21 05:33:35 +00:00
Ron Lee
7631414188 Added WX_DEFINE_*_USER_EXPORTED_ARRAY macros for external dlls.
updated debian scripts to build with python2.1


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-17 11:33:50 +00:00
Ron Lee
4fb788e466 Added static lib to shared build targets for wxMSW builds.
Added -dbg packages for msw-cross.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-03 13:00:52 +00:00
Ron Lee
aeb7499407 updated debian policy version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-09 20:44:00 +00:00
Ron Lee
7b7a763758 Added UNIV_DIST target.
Fixed hp-hpux lib build targets.
Enabled cygwin cross compilation for 2.3 too.
Fixed SONAME_FLAGS for solaris.
Fixed PIC_FLAG for mingw.
Added first draft of wxUNIV debs.
Removed obsolete src/makeenvs/*


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-02 21:36:16 +00:00
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
2001-09-28 07:00:13 +00:00
Ron Lee
e0f33cf107 merged 2.2 /debian changes to 2.3
(and really test the new log mailer *after* committing
 CVSROOT changes :)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-11 03:02:05 +00:00
Ron Lee
3abb92cea8 Ported forward changes to 2.2 packaging.
Don't build/run tex2rtf for -arch builds.  It segfaults on Alpha.
Added extra (required) -dev package deps.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-07 16:14:05 +00:00
Ron Lee
ab0e718dc9 changed -dbg priority to match overrides.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-20 15:25:47 +00:00
Ron Lee
afa3e1edcd Updated /debian with the latest changes from 2.2 branch.
Applied patch from 2.2 to setup.py to allow the setting
of a 'trick' wx-config for in-tree package builds.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-18 23:11:58 +00:00
Ron Lee
050207ec17 Began updating 2.2 Debian build scripts for 2.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 08:46:25 +00:00
Bryan Petty
3ca6a5f046 second merge of the 2.2 branch (RL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Ron Lee
5c0e67b250 added wxBase & examples & various tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-24 01:15:08 +00:00
Ron Lee
e0a4aa8a21 added wxPython control files and a few changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-21 23:02:25 +00:00
Ron Lee
f538864d03 added -doc package
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-17 19:07:25 +00:00
Ron Lee
e4c4c1c697 added files / made changes to enable building Debian releases from cvs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-16 20:47:08 +00:00