Commit Graph

93 Commits

Author SHA1 Message Date
Vadim Zeitlin
54aa3821fc corrected a target name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-29 17:54:01 +00:00
Robin Dunn
8e05125981 enable sound and mediactrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-17 21:37:08 +00:00
Robin Dunn
690c6e8eef fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-27 19:16:11 +00:00
Vadim Zeitlin
b945df0092 added WX_UNICODE and WX_OPENGL options which can be used to build packages without Unicode/OpenGL; as a side benefit all configure arguments are now centralized in one place instead of being repeated many times
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-21 18:06:44 +00:00
Vadim Zeitlin
0a77a468a7 just some spelling fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-03 20:34:10 +00:00
Robin Dunn
7d69080996 Some explainations and directions for building the Debian wx packages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-01 22:23:24 +00:00
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
Vadim Zeitlin
9372855d19 fixed python-related files names after they had been apparently renamed in the cvs 4 months ago; fixed broken sed command syntax
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-04 12:12:01 +00:00
Ron Lee
8bdc493773 Sync changes from Debian 2.6 tree.
Fixes #324960, enabling config.py to handle in tree builds without
tainting build_options.py used for (later) install to some other
location.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-16 02:12:16 +00:00
Ron Lee
4b2e121be3 Remove reference to wxrcedit which sank a while back.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-23 07:58:58 +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
910cdf92e3 oops, 'ze hand is quicker zan vi.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-23 03:41:07 +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
df116f900b Ensure 2.6 trumps 2.5 as default.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-12 17:17:18 +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
337afe57d1 Update stray references to 2.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-12 15:59:59 +00:00
Ron Lee
8d7a4d695c Bump for 2.6.0 and close Debian bts report about missing archive.h on
the next upload.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-12 15:50:03 +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
8ec45325ea Add extra^2 debug mode to wx-config for brute force one pass debugging
of new platforms.

Import $EGREP from configure, posix `grep -E` is not endemic yet.

Clean up debian/rules for removed afm files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-13 08:53:36 +00:00
Ron Lee
e653e18150 Bump WX_CURRENT back to 3, this must stay the same as
wx_release_number until bakefile is fixed to unlink the
the soversion from it.  Ideally of course it should track
binary incompatible releases instead.

Update the Debian scripts to suit the new site-packages
location for wxPython.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-12 11:39:03 +00:00
Ron Lee
3b57de8b1f Fixes for wxPython site-packages location.
Fixed and baked unchecked mediaplayer.bkl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 07:00:51 +00:00
Ron Lee
54e83ca581 Added wx.manifest to the msw source dist, it seems to be necessary now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 13:52:51 +00:00
Ron Lee
41d8b0c9ca gtk2 is the default now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 17:52:09 +00:00
Ron Lee
46ec284e56 Add man page link for pywxrc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 17:37:12 +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
5173779ec4 Add wxversion/ to the dist tarball.
Prefer 2.5 wx-config in the debs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 14:02:27 +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
7714864e2f Update the wx-config man page.
Remove some cruft from the docs package.
Bump version in configure.
Update aclocal.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 09:07:08 +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
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
fdec35499d Add xrc to the dist target.
Bump subrelease to 2.5.2.9.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 21:54:57 +00:00
Ron Lee
62b3a2467f Fix registered location of docs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:58:23 +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
616d1b3cb0 Last minute changes to fix 2.5.1.1 debs for release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-14 14:02:04 +00:00
Ron Lee
5259a4179c Remove demos from the Debian -examples package.
Replace html lib in tex2rtf build, it is needed for any platform
where wxHelpController == wxHtmlHelpController.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 09:45:10 +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
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
55804c9363 more thinko tweaks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 00:12:50 +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
738aea8e0f add libwx_dcsvg.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-23 03:50:23 +00:00