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
This commit is contained in:
Ron Lee
2004-09-21 17:16:29 +00:00
parent 6d06e061dc
commit ceec2216bd
183 changed files with 4862 additions and 4606 deletions

View File

@@ -3,7 +3,8 @@ wxwidgets for Debian
The following packages are built from the wxWidgets CVS source.
libwxgtk wxGTK runtime shared libraries
libwxgtk wxGTK runtime shared libraries, including selected
contrib libs.
libwxgtk-dev extra files and static libs for building wxGTK apps
libwxgtk-dbg wxGTK libraries built with -g and __WXDEBUG__
@@ -11,9 +12,6 @@ libwxgtk-python Python binding to wxGTK (from 2.2.3 onward, this
obsoletes the libwxgtk-python-contrib package as
all python modules are built into a single monolith)
libwxgtk-contrib wxWin contrib runtime shared libs (built with wxGTK)
libwxgtk-contrib-dev extra files and static contrib libs for building apps
wx-headers common header files for building wxWidgets apps
wx-doc HTML version of the wxWidgets manual
wx-examples wxWidgets and wxPython demos and samples (source)

16
debian/changelog vendored
View File

@@ -1,3 +1,19 @@
wxwidgets2.5 (2.5.2.3) experimental; urgency=low
* Greatly improved concurrent installs. We can now install
a much wider range of builds without conflicting and select
between them without the need to go changing symlinks or
the suite of applications you have installed.
* Contrib is dead. Long live contrib.
Better multi-library builds have made contrib more or less
obsolete. This is the big crunch before the boom. Everything
useful out of contrib has been moved back into the main package.
Later we will split many out again along the lines of shared
dependencies, so a minimal wx install really can remain minimal
without losing any future potential.
-- Ron Lee <ron@debian.org> Sat, 18 Sep 2004 00:59:01 +0930
wxwidgets2.5 (2.5.1.1) experimental; urgency=low
* The s/ndow/dget/g release.

46
debian/control.in vendored
View File

@@ -24,9 +24,6 @@ Architecture: any
Section: libdevel
Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
Suggests: wxwin=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
Conflicts: libwxgtk-dev, libwxbase-dev
Replaces: libwxgtk-dev, libwxbase-dev, wxgtk2.1-dev
Provides: libwxgtk-dev
Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
wxWidgets (formerly known as wxWindows) is a class library for C++ providing
GUI components and other facilities on several popular platforms (and some
@@ -41,9 +38,6 @@ Architecture: any
Section: libdevel
Priority: extra
Depends: wx=V-headers (= ${Source-Version}), libc6-dev
Conflicts: libwxgtk-dbg, libwxbase-dbg
Replaces: libwxgtk-dbg, libwxbase-dbg
Provides: libwxgtk-dbg
Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
wxWidgets (formerly known as wxWindows) is a class library for C++ providing
GUI components and other facilities on several popular platforms (and some
@@ -71,38 +65,9 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
contrib libs. If you wish to use xrced you'll also need the python-xml
package installed.
Package: libwxgtk=V-contrib
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
Description: wxWidgets Cross-platform C++ GUI toolkit (runtime contrib libs)
wxWidgets (formerly known as wxWindows) is a class library for C++ providing
GUI components and other facilities on several popular platforms (and some
unpopular ones as well). For more information see http://wxwidgets.org
.
This package provides the contrib libs from the wxWidgets source tree
Package: libwxgtk=V-contrib-dev
Architecture: any
Section: libdevel
Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev
Conflicts: libwxgtk-contrib-dev
Replaces: libwxgtk-contrib-dev
Provides: libwxgtk-contrib-dev
Description: wxWidgets Cross-platform C++ GUI toolkit (development contrib libs)
wxWidgets (formerly known as wxWindows) is a class library for C++ providing
GUI components and other facilities on several popular platforms (and some
unpopular ones as well). For more information see http://wxwidgets.org
.
Install this package if you wish to compile applications that use the
contrib libs from the wxWidgets source tree.
Package: wx=V-headers
Architecture: any
Section: devel
Conflicts: wx-headers, wxwin-headers
Replaces: wx-headers, wxwin-headers, wxgtk2.1-dev, libwxgtk2.3
Provides: wx-headers
Description: wxWidgets Cross-platform C++ GUI toolkit (header files)
wxWidgets (formerly known as wxWindows) is a class library for C++ providing
GUI components and other facilities on several popular platforms (and some
@@ -127,8 +92,6 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support)
Package: wx=V-doc
Architecture: all
Section: doc
Conflicts: wx-doc, wxwin2.2-doc, wxwin-doc
Replaces: wx-doc, wxwin-doc
Provides: wx-doc
Suggests: doc-base, www-browser
Description: wxWidgets Cross-platform C++ GUI toolkit (documentation)
@@ -176,9 +139,6 @@ Package: libwxmsw=V-dev
Architecture: i386
Section: otherosfs
Depends: wx=V-headers-msw (= ${Source-Version})
Conflicts: libwxmsw-dev
Replaces: libwxmsw-dev
Provides: libwxmsw-dev
Description: wxMSW mingw32msvc-cross
mingw32msvc-cross wxMSW libs.
@@ -186,9 +146,6 @@ Package: libwxmsw=V-dbg
Architecture: i386
Section: otherosfs
Depends: wx=V-headers-msw (= ${Source-Version})
Conflicts: libwxmsw-dbg
Replaces: libwxmsw-dbg
Provides: libwxmsw-dbg
Description: wxMSW mingw32msvc-cross (debug)
mingw32msvc-cross wxMSW libs.
__WXDEBUG__ version.
@@ -197,9 +154,6 @@ Package: wx=V-headers-msw
Architecture: i386
Section: otherosfs
Depends: wx=V-headers (= ${Source-Version})
Conflicts: wx-headers-msw, wxwin-headers-msw
Replaces: wx-headers-msw, wxwin-headers-msw
Provides: wx-headers-msw
Description: Extra wxWidgets headers for mingw32msvc-cross
Headers required by the wxWidgets mingw32msvc-cross libraries.

View File

@@ -1,3 +0,0 @@
?package(libwxgtk=V-contrib-dev):needs="X11" section="Apps/Programming"\
title="wxrcedit" command="/usr/bin/wxrcedit"

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2ud-=V-config.1.gz

View File

@@ -1,7 +1,7 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2ud-=V-config 50
update-alternatives --install /usr/bin/wx-config wx-config /usr/lib/wx/config/gtk2-unicode-debug-=V 50
#DEBHELPER#

View File

@@ -1,7 +1,7 @@
#! /bin/sh
set -e
update-alternatives --remove wx-config /usr/bin/wxgtk2ud-=V-config
update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-debug-=V
#DEBHELPER#

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2u-=V-config.1.gz

3
debian/libwxgtk-dev.menu vendored Normal file
View File

@@ -0,0 +1,3 @@
?package(libwxgtk=V-dev):needs="X11" section="Apps/Programming"\
title="wxrcedit" command="/usr/bin/wxrcedit"

View File

@@ -1,7 +1,8 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2u-=V-config 70
update-alternatives --install /usr/bin/wx-config wx-config /usr/lib/wx/config/gtk2-unicode-release-=V 70
update-alternatives --install /usr/bin/wx-config wx-config /usr/lib/wx/config/gtk2-unicode-release-=V-static 60
#DEBHELPER#

View File

@@ -1,7 +1,8 @@
#! /bin/sh
set -e
update-alternatives --remove wx-config /usr/bin/wxgtk2u-=V-config
update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-release-=V
update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-release-=V-static
#DEBHELPER#

View File

@@ -5,8 +5,8 @@ set -e
WXPYTHONDIR="/usr/lib/=PY/site-packages/wxPython"
if [ "$1" = "configure" ]; then
python /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
python -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
fi
#DEBHELPER#

View File

@@ -3,11 +3,7 @@
set -e
PACKAGE="libwxgtk=V-python"
dpkg --listfiles $PACKAGE |
awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
xargs rm -f >&2
dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
#DEBHELPER#

View File

@@ -1,4 +0,0 @@
usr/bin
usr/=H/lib/wx/include/mswd-=V-=H/wx
usr/share/man/man1

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmswd-=V-=H-config.1.gz

View File

@@ -1,7 +1,7 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxmswd-=V-=H-config 40
update-alternatives --install /usr/bin/wx-config wx-config /usr/lib/wx/config/=H-msw-ansi-debug-=V 30
#DEBHELPER#

View File

@@ -1,7 +1,7 @@
#! /bin/sh
set -e
update-alternatives --remove wx-config /usr/bin/wxmswd-=V-=H-config
update-alternatives --remove wx-config /usr/lib/wx/config/=H-msw-ansi-debug-=V
#DEBHELPER#

View File

@@ -1,4 +0,0 @@
usr/bin
usr/=H/lib/wx/include/msw-=V-=H/wx
usr/share/man/man1

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmsw-=V-=H-config.1.gz

View File

@@ -1,7 +1,7 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxmsw-=V-=H-config 40
update-alternatives --install /usr/bin/wx-config wx-config /usr/lib/wx/config/=H-msw-ansi-release-=V 40
#DEBHELPER#

View File

@@ -1,7 +1,7 @@
#! /bin/sh
set -e
update-alternatives --remove wx-config /usr/bin/wxmsw-=V-=H-config
update-alternatives --remove wx-config /usr/lib/wx/config/=H-msw-ansi-release-=V
#DEBHELPER#

View File

@@ -1,2 +0,0 @@
libwxgtk2.5-dbg: non-dev-pkg-with-shlib-symlink

2
debian/lintian-override.in vendored Normal file
View File

@@ -0,0 +1,2 @@
libwxgtk=V-dbg: non-dev-pkg-with-shlib-symlink

330
debian/rules vendored
View File

@@ -25,8 +25,22 @@ endif
-include debian/python-version
# This will extract a flavour out of the name of the source directory
# and flavour the packages and binaries with it. 'Official' builds
# should use a source dir of the form wxwidgets$RELEASE-$VERSION.
# Flavoured builds may use wxwidgets$RELEASE-$FLAVOUR-$VERSION, where
# any descriptive alphanumeric name will do for FLAVOUR. This will
# allow a custom build to be installed alongside the mainline ones
# without conflict. You will also need to make a corresponding
# changelog entry for your flavour source package using:
# wxwidget$RELEASE-$FLAVOUR ($VERSION) to satify dpkg-source and
# to correctly set the release below.
DEBIAN_WXFLAVOUR := $(shell pwd | sed -e 's@.*/wxwidgets[0-9.]\+-\?\(.*\)-[0-9.]\+-\?.*@\1@')
release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p')
cross_host = i586-mingw32msvc
cross_build = $(shell ./config.guess)
@@ -38,8 +52,6 @@ package_gtk_lib = libwxgtk$(release)
package_gtk_dev = libwxgtk$(release)-dev
package_gtk_dbg = libwxgtk$(release)-dbg
package_gtk_py = libwxgtk$(release)-python
package_gtk_contrib = libwxgtk$(release)-contrib
package_gtk_contrib_dev = libwxgtk$(release)-contrib-dev
package_headers = wx$(release)-headers
package_i18n = wx$(release)-i18n
package_doc = wx$(release)-doc
@@ -55,7 +67,6 @@ objdir_gtk_shared = objs_gtk_sh
objdir_gtk_static = objs_gtk_st
objdir_gtk_debug = objs_gtk_d
objdir_gtk_install = objs_gtk_install
objdir_gtk_contrib_install = objs_gtk_contrib_install
objdir_doc_cruft = objs_doc_con
objdir_doc = docs/wx-manual.html
objdir_examples = docs/examples
@@ -66,7 +77,7 @@ objdir_msw_static = objs_msw_st
objdir_msw_dbg = objs_msw_d
objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
$(objdir_gtk_install) $(objdir_gtk_contrib_install) \
$(objdir_gtk_install) \
$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
$(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)
@@ -76,9 +87,9 @@ objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
# Build stamps:
build_arch_stamps = build-gtk-shared-stamp build-gtk-static-stamp \
build-gtk-debug-stamp \
build-contrib-shared-stamp build-contrib-static-stamp \
build_arch_stamps = build-gtk-shared-stamp build-gtk-shared-contrib-stamp \
build-gtk-static-stamp build-gtk-static-contrib-stamp \
build-gtk-debug-stamp build-gtk-debug-contrib-stamp \
build-i18n-stamp build-gtk-py-stamp
@@ -93,7 +104,6 @@ build_stamps = $(build_stamps_native) $(build_cross_stamps)
# Install targets:
install_all_arch = install-gtk-lib install-gtk-dev install-gtk-dbg \
install-gtk-contrib install-gtk-contrib-dev \
install-headers install-i18n install-gtk-py
install_all_indep = install-examples install-doc
@@ -105,15 +115,10 @@ install_all_native = $(install_all_arch) $(install_all_indep)
install_all = $(install_all_native) $(install_all_cross)
wxconfig := $(shell pwd)/$(objdir_gtk_shared)/wx-config \
--prefix=$(shell pwd) \
--exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
wxconfig := $(shell pwd)/$(objdir_gtk_shared)/wx-config
wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config
wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config \
--prefix=$(shell pwd) \
--exec-prefix=$(shell pwd)/$(objdir_gtk_debug)
contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
#contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
# The Rules:
@@ -126,21 +131,17 @@ debian/control: $(addprefix debian/,control.in python-version)
control-files-stamp: debian/control
dh_testdir
@for f in links postinst prerm; do \
# FIXME: we clipped menu out of this one, clean up the rest of that.
@for f in postinst prerm; do \
echo "generating control file $(package_gtk_dev).$$f"; \
sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
> debian/$(package_gtk_dev).$$f; \
done;
@for f in links postinst prerm; do \
@for f in postinst prerm; do \
echo "generating control file $(package_gtk_dbg).$$f"; \
sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
> debian/$(package_gtk_dbg).$$f; \
done;
@for f in menu; do \
echo "generating control file $(package_gtk_contrib_dev).$$f"; \
sed -e 's/=V/$(release)/g' < debian/libwxgtk-contrib-dev.$$f \
> debian/$(package_gtk_contrib_dev).$$f; \
done;
@for f in dirs docs menu postinst prerm; do \
echo "generating control file $(package_gtk_py).$$f"; \
sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g' \
@@ -168,21 +169,19 @@ control-files-stamp: debian/control
< debian/libwxgtk-dbg-python.$$f \
> debian/$(package_gtk_dbg_py).$$f; \
done;
@for f in dirs links postinst prerm; do \
@for f in postinst prerm; do \
echo "generating control file $(package_msw_dev).$$f"; \
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
> debian/$(package_msw_dev).$$f; \
done;
@for f in dirs links postinst prerm; do \
@for f in postinst prerm; do \
echo "generating control file $(package_msw_dbg).$$f"; \
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dbg.$$f \
> debian/$(package_msw_dbg).$$f; \
done;
@for f in dirs; do \
echo "generating control file $(package_headers_msw).$$f"; \
sed -e 's/=H/$(cross_host)/g' < debian/wx-headers-msw.$$f \
> debian/$(package_headers_msw).$$f; \
done;
@echo "generating control file lintian-override"; \
sed -e 's/=V/$(release)/g' < debian/lintian-override.in \
> debian/lintian-override; \
touch $@
build_arch: control-files-stamp $(build_arch_stamps)
@@ -201,17 +200,18 @@ configure-gtk-shared-stamp:
dh_testdir
mkdir -p $(objdir_gtk_shared)
cd $(objdir_gtk_shared) \
&& ../configure --prefix=/usr \
--cache-file=$(config_cache) \
--with-gtk \
--enable-gtk2 \
--enable-unicode \
--with-opengl \
--with-zlib=sys \
--with-libjpeg=sys \
--with-libpng=sys \
--with-libtiff=sys \
--enable-dynamic-loader \
&& ../configure --prefix=/usr \
--cache-file=$(config_cache) \
--with-flavour=$(DEBIAN_WXFLAVOUR) \
--with-gtk \
--enable-gtk2 \
--enable-unicode \
--with-opengl \
--with-zlib=sys \
--with-libjpeg=sys \
--with-libpng=sys \
--with-libtiff=sys \
--enable-dynamic-loader \
--enable-std_iostreams
touch $@
@@ -224,18 +224,19 @@ configure-gtk-static-stamp:
dh_testdir
mkdir -p $(objdir_gtk_static)
cd $(objdir_gtk_static) \
&& ../configure --prefix=/usr \
--cache-file=$(config_cache) \
--with-gtk \
--enable-gtk2 \
--enable-unicode \
--with-opengl \
--disable-shared \
--with-zlib=sys \
--with-libjpeg=sys \
--with-libpng=sys \
--with-libtiff=sys \
--enable-dynamic-loader \
&& ../configure --prefix=/usr \
--cache-file=$(config_cache) \
--with-flavour=$(DEBIAN_WXFLAVOUR) \
--with-gtk \
--enable-gtk2 \
--enable-unicode \
--with-opengl \
--disable-shared \
--with-zlib=sys \
--with-libjpeg=sys \
--with-libpng=sys \
--with-libtiff=sys \
--enable-dynamic-loader \
--enable-std_iostreams
touch $@
@@ -248,18 +249,19 @@ configure-gtk-debug-stamp:
dh_testdir
mkdir -p $(objdir_gtk_debug)
cd $(objdir_gtk_debug) \
&& ../configure --prefix=/usr \
--cache-file=$(config_cache) \
--with-gtk \
--enable-gtk2 \
--enable-unicode \
--with-opengl \
--enable-debug \
--with-zlib=sys \
--with-libjpeg=sys \
--with-libpng=sys \
--with-libtiff=sys \
--enable-dynamic-loader \
&& ../configure --prefix=/usr \
--cache-file=$(config_cache) \
--with-flavour=$(DEBIAN_WXFLAVOUR) \
--with-gtk \
--enable-gtk2 \
--enable-unicode \
--with-opengl \
--enable-debug \
--with-zlib=sys \
--with-libjpeg=sys \
--with-libpng=sys \
--with-libtiff=sys \
--enable-dynamic-loader \
--enable-std_iostreams
touch $@
@@ -269,18 +271,24 @@ build-gtk-debug-stamp: configure-gtk-debug-stamp
touch $@
build-contrib-shared-stamp: build-gtk-shared-stamp
build-gtk-shared-contrib-stamp: build-gtk-shared-stamp
dh_testdir
cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
cd $(objdir_gtk_shared)/contrib/utils/wxrc && $(FAST_MAKE)
cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
touch $@
build-contrib-static-stamp: build-gtk-static-stamp
build-gtk-static-contrib-stamp: build-gtk-static-stamp
dh_testdir
cd $(objdir_gtk_static)/contrib/src && $(FAST_MAKE)
touch $@
build-gtk-debug-contrib-stamp: build-gtk-debug-stamp
dh_testdir
cd $(objdir_gtk_debug)/contrib/src && $(FAST_MAKE)
touch $@
purge-dbg-py:
@if [ ! -e build-gtk-py-stamp ]; then \
$(MAKE) -f debian/rules clean-py; \
@@ -290,33 +298,26 @@ purge-dbg-py:
build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py
dh_testdir
touch docs/lgpl.txt
cd wxPython/include/wx \
&& for f in $(contrib_libs); do \
$(RM) $$f; \
ln -s ../../../contrib/include/wx/$$f .; \
done
cd wxPython \
&& $(python_ver) ./setup.py build \
WX_CONFIG='$(wxconfig)' \
WXPORT=gtk2 \
UNICODE=1
cd wxPython/include/wx \
&& for f in $(contrib_libs); do $(RM) $$f; done
touch $@
build-doc-stamp: build-gtk-shared-stamp
dh_testdir
cd $(objdir_gtk_shared)/utils/tex2rtf/src \
&& $(FAST_MAKE)
cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE)
rm -rf $(objdir_doc)
rm -rf $(objdir_doc_cruft)
mkdir $(objdir_doc)
mkdir $(objdir_doc_cruft)
cd $(objdir_doc_cruft) \
&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html
../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
../docs/latex/wx/manual.tex \
../$(objdir_doc)/wx$(release)-manual.html \
-twice -html
cp docs/latex/wx/*.gif $(objdir_doc)
rm -rf $(objdir_doc_cruft)
rm -f $(objdir_doc)/wxwin.con $(objdir_doc)/wxwin.hh* \
@@ -364,30 +365,23 @@ purge-release-py:
build-gtk-dbg-py-stamp: build-gtk-debug-stamp purge-release-py
dh_testdir
touch docs/lgpl.txt
cd wxPython/include/wx \
&& for f in $(contrib_libs); do \
$(RM) $$f; \
ln -s ../../../contrib/include/wx/$$f .; \
done
cd wxPython \
cd wxPython \
&& $(python_ver) ./setup.py build \
WX_CONFIG='$(wxconfig-dbg)' \
WXPORT=gtk2 \
UNICODE=1
cd wxPython/include/wx \
&& for f in $(contrib_libs); do $(RM) $$f; done
touch $@
configure-msw-shared-stamp:
dh_testdir
mkdir -p $(objdir_msw_shared)
cd $(objdir_msw_shared) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=$(config_cache_cross) \
--host=$(cross_host) \
--build=$(cross_build)
cd $(objdir_msw_shared) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=$(config_cache_cross) \
--host=$(cross_host) \
--build=$(cross_build) \
--with-flavour=$(DEBIAN_WXFLAVOUR)
touch $@
build-msw-shared-stamp: configure-msw-shared-stamp
@@ -398,11 +392,12 @@ build-msw-shared-stamp: configure-msw-shared-stamp
configure-msw-static-stamp:
dh_testdir
mkdir -p $(objdir_msw_static)
cd $(objdir_msw_static) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=$(config_cache_cross) \
--host=$(cross_host) \
--build=$(cross_build) \
cd $(objdir_msw_static) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=$(config_cache_cross) \
--host=$(cross_host) \
--build=$(cross_build) \
--with-flavour=$(DEBIAN_WXFLAVOUR) \
--disable-shared
touch $@
@@ -414,11 +409,12 @@ build-msw-static-stamp: configure-msw-static-stamp
configure-msw-dbg-stamp:
dh_testdir
mkdir -p $(objdir_msw_dbg)
cd $(objdir_msw_dbg) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=$(config_cache_cross) \
--host=$(cross_host) \
--build=$(cross_build) \
cd $(objdir_msw_dbg) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=$(config_cache_cross) \
--host=$(cross_host) \
--build=$(cross_build) \
--with-flavour=$(DEBIAN_WXFLAVOUR) \
--enable-debug
touch $@
@@ -437,8 +433,6 @@ clean-py:
# What to do about src/__version__.py ???
cd wxPython/include/wx \
&& for f in $(contrib_libs); do $(RM) $$f; done
# We do the equivalent of this above by removing build, unfortunately
# its not enough by itself to get the tree properly clean again.
@@ -457,8 +451,6 @@ clean: debian/control clean-py
rm -f debian/$(package_gtk_dev).*
rm -f debian/$(package_gtk_dbg).*
rm -f debian/$(package_gtk_py).*
rm -f debian/$(package_gtk_contrib).*
rm -f debian/$(package_gtk_contrib_dev).*
rm -f debian/$(package_headers).*
rm -f debian/$(package_i18n).*
rm -f debian/$(package_doc).*
@@ -466,82 +458,67 @@ clean: debian/control clean-py
rm -f debian/$(package_gtk_dbg_py).*
rm -f debian/$(package_msw_dev).*
rm -f debian/$(package_msw_dbg).*
rm -f debian/$(package_headers_msw).*
rm -f debian/lintian-override
install_arch: build_arch $(install_all_arch)
install: build_all $(install_all_native)
install-gtk-shared-stamp:
install-gtk-shared-stamp: build-gtk-shared-stamp build-gtk-shared-contrib-stamp
dh_testdir
mkdir -p $(objdir_gtk_install)
cd $(objdir_gtk_shared) \
&& $(MAKE) install prefix=`pwd`/../$(objdir_gtk_install)
cd $(objdir_gtk_shared)/contrib/src \
&& $(MAKE) install prefix=`pwd`/../../../$(objdir_gtk_install)
touch $@
install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
install-gtk-lib: build-gtk-shared-stamp install-gtk-shared-stamp
install-gtk-lib: install-gtk-shared-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_install)/share/wx usr/share
dh_install $(objdir_gtk_install)/lib/*.so.* usr/lib
dh_install $(objdir_gtk_install)/lib/libwx_*.so.* usr/lib
dh_install $(objdir_gtk_install)/share/wx usr/share
# FIXME: /share/wx may eventually need to go in a common runtime package.
install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
install-gtk-dev: build-gtk-static-stamp install-gtk-shared-stamp
install-gtk-dev: build-gtk-static-stamp build-gtk-static-contrib-stamp install-gtk-shared-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_install)/bin/wxgtk2u-$(release)-config usr/bin
dh_install $(objdir_gtk_install)/lib/{wx,*.so} usr/lib
dh_install $(objdir_gtk_static)/lib/libwx_gtk2u{-,_gl}*.a usr/lib
dh_install $(objdir_gtk_install)/lib/libwx_*.so usr/lib
dh_install $(objdir_gtk_install)/lib/wx/include usr/lib/wx
dh_install $(objdir_gtk_install)/lib/wx/config/gtk* usr/lib/wx/config
dh_install $(objdir_gtk_static)/lib/libwx*.a usr/lib
dh_install $(objdir_gtk_static)/lib/wx/include usr/lib/wx
dh_install $(objdir_gtk_static)/lib/wx/config/gtk* usr/lib/wx/config
# FIXME: What to do about these for multi-version installs? Probably
# put them in a bin package that conflicts.
#
#dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc usr/bin
#dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit usr/bin
#dh_installman debian/wxrc-tools.1
#dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1 \
# usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1
install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
install-gtk-dbg: build-gtk-debug-stamp
install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs usr/share/lintian/overrides
dh_install $(objdir_gtk_debug)/wxgtk2ud-$(release)-config usr/bin
dh_install $(objdir_gtk_debug)/lib usr
dh_install $(objdir_gtk_debug)/lib/libwx_* usr/lib
dh_install $(objdir_gtk_debug)/lib/wx/include usr/lib/wx
dh_install $(objdir_gtk_debug)/lib/wx/config/gtk* usr/lib/wx/config
cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
install-gtk-contrib-stamp:
dh_testdir
mkdir -p $(objdir_gtk_contrib_install)/lib
cd $(objdir_gtk_shared)/contrib/src \
&& $(MAKE) install prefix=`pwd`/../../../$(objdir_gtk_contrib_install)
touch $@
install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
install-gtk-contrib: build-contrib-shared-stamp install-gtk-contrib-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_contrib_install)/lib/*.so.* usr/lib
install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_contrib_install)/include usr
dh_install $(objdir_gtk_contrib_install)/lib/*.so usr/lib
dh_install -Xlibwx_gtk2u- -Xlibwx_gtk2u_gl- \
$(objdir_gtk_static)/lib/*.a usr/lib
dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc usr/bin
dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit usr/bin
dh_installman debian/wxrc-tools.1
dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1 \
usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1
install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
install-gtk-py: build-gtk-py-stamp
dh_testdir
@@ -589,9 +566,10 @@ install-headers: install-gtk-shared-stamp
# dh_movefiles --sourcedir=$(objdir_univ_install)
dh_install $(objdir_gtk_install)/include usr
dh_install $(objdir_gtk_install)/share/aclocal usr/share
dh_installman debian/wx-config.1
# FIXME: put these in a common package that can conflict.
#dh_install $(objdir_gtk_install)/share/aclocal usr/share
#dh_installman debian/wx-config.1
install-i18n: DH_OPTIONS=-p$(package_i18n)
install-i18n: build-i18n-stamp install-gtk-shared-stamp
@@ -653,9 +631,12 @@ install-msw-dev: build-msw-shared-stamp build-msw-static-stamp
dh_testroot
dh_clean -k
dh_installdirs
cp -a $(objdir_msw_shared)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
cp -a $(objdir_msw_static)/lib/*.a debian/$(package_msw_dev)/usr/$(cross_host)/lib
cp $(objdir_msw_shared)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
dh_install $(objdir_msw_shared)/lib/*.dll* usr/$(cross_host)/lib
dh_install $(objdir_msw_shared)/lib/wx/include usr/$(cross_host)/lib/wx
dh_install $(objdir_msw_shared)/lib/wx/config/$(cross_host)* usr/lib/wx/config
dh_install $(objdir_msw_static)/lib/*.a usr/$(cross_host)/lib
dh_install $(objdir_msw_static)/lib/wx/include usr/$(cross_host)/lib/wx
dh_install $(objdir_msw_static)/lib/wx/config/$(cross_host)* usr/lib/wx/config
$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
install-msw-dbg: DH_OPTIONS=-p$(package_msw_dbg)
@@ -664,8 +645,9 @@ install-msw-dbg: build-msw-dbg-stamp
dh_testroot
dh_clean -k
dh_installdirs
cp -a $(objdir_msw_dbg)/lib/* debian/$(package_msw_dbg)/usr/$(cross_host)/lib
cp $(objdir_msw_dbg)/wxmswd-$(release)-$(cross_host)-config debian/$(package_msw_dbg)/usr/bin/
dh_install $(objdir_msw_dbg)/lib/*.dll* usr/$(cross_host)/lib
dh_install $(objdir_msw_dbg)/lib/wx/include usr/$(cross_host)/lib/wx
dh_install $(objdir_msw_dbg)/lib/wx/config/$(cross_host)* usr/lib/wx/config
# No static lib, they're freakin' huge!
#$(cross_host)-strip --strip-debug debian/$(package_msw_dbg)/usr/$(cross_host)/lib/*.a
@@ -674,18 +656,24 @@ install-headers-msw:
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# FIXME: This installs too much now. Do a dummy install first then
# then determine the links from there instead of the main
# tree. Or grab the list out of the main package install,
# but that presupposed we already built it which we may not.
@# Symlink all the headers that will be installed by the main -headers
@# package to where the cross compiler will expect them.
@for f in `ls -1 include/wx`; do \
ln -s /usr/include/wx/$$f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx; \
echo "linking header /usr/include/wx/$$f"; \
done;
@( for f in `ls -1 include/wx`; do \
all_h="$${all_h} /usr/include/wx-$(release)/wx/$$f usr/$(cross_host)/include/wx-$(release)/wx/$$f"; \
echo "linking header /usr/include/wx-$(release)/wx/$$f"; \
done; \
dh_link $${all_h}; \
)
@# But install this lot for real.
rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/msw
cp -a include/wx/msw debian/$(package_headers_msw)/usr/$(cross_host)/include/wx
@# and remove this cruft(?)
rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/treelay.h
rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx-$(release)/wx/msw
dh_install include/wx/msw usr/$(cross_host)/include/wx-$(release)/wx
binary-common:
@@ -712,7 +700,7 @@ binary-common:
fi
dh_installdeb
dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib:debian/$(package_gtk_contrib)/usr/lib
dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib
dh_gencontrol
dh_md5sums
dh_builddeb
@@ -785,7 +773,7 @@ binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers
binary-indep binary-arch binary binary-common \
binary-gtk binary-gtk-dev binary-gtk-dbg binary-doc binary-cross \
install install_arch install-gtk-lib install-gtk-dev \
install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
install-gtk-dbg \
install-gtk-py install-gtk-dbg-py \
install-headers install-i18n install-doc install-examples \
install-msw-dev install-msw-dbg install-headers-msw

View File

@@ -1,10 +1,10 @@
Document: wx-manual
Title: wxWidgets Programming Manual
Document: wx=V-manual
Title: wxWidgets=V Programming Manual
Author: The wxWidgets Cabal
Abstract: This manual describes the wxWidgets cross-platform GUI toolkit.
Abstract: This manual describes the wxWidgets=V cross-platform GUI toolkit.
Section: Apps/Programming
Format: HTML
Index: /usr/share/doc/wx=V-doc/wx-manual.html/wxwin.htm
Index: /usr/share/doc/wx=V-doc/wx-manual.html/wx=V_contents.html
Files: /usr/share/doc/wx=V-doc/wx-manual.html/*

View File

@@ -1,2 +0,0 @@
usr/=H/include/wx