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
This commit is contained in:
Ron Lee
42
debian/changelog
vendored
42
debian/changelog
vendored
@@ -1,33 +1,59 @@
|
||||
wxwindows2.2 (2.3.1) unstable; urgency=low
|
||||
wxwindows2.3 (2.3.2) unstable; urgency=low
|
||||
|
||||
* 2.3.1 debs -- still not QA'd for general release yet.
|
||||
* Major Overhaul. First serious release contender.
|
||||
|
||||
-- Ron <ron@debian.org> Sun, 10 Jun 2001 20:10:36 -0700
|
||||
-- Ron Lee <ron@debian.org> Thu, 27 Sep 2001 05:55:07 -0700
|
||||
|
||||
wxwindows2.2 (2.3.0) unstable; urgency=low
|
||||
wxwindows2.3 (2.3.1) unstable; urgency=low
|
||||
|
||||
* 2.3.1 test debs -- still not QA'd for general release yet.
|
||||
|
||||
-- Ron Lee <ron@debian.org> Sun, 10 Jun 2001 20:10:36 -0700
|
||||
|
||||
wxwindows2.3 (2.3.0) unstable; urgency=low
|
||||
|
||||
* Updated 2.2 build scripts for 2.3
|
||||
* initial test builds, please do not release..
|
||||
|
||||
-- Ron Lee <ron@debian.org> Sat, 27 Jan 2001 01:51:24 -0800
|
||||
|
||||
wxwindows2.2 (2.2.8) unstable; urgency=low
|
||||
|
||||
* Fixed bogus samples makefile. Closes: #110061
|
||||
* Added ability to build wxMSW-cross packages, but they
|
||||
are not built and distributed by default.
|
||||
|
||||
If you think such creatures belong in the archive,
|
||||
register your vote by filing a wishlist bug (or preferably
|
||||
append some reasoned response to one already posted ;)
|
||||
|
||||
* Pruned more inapplicable files from the raw cvs source,
|
||||
cleaned configure.in and removed the need for a common setup.h,
|
||||
removed superfluous library links and generally tweaked things
|
||||
so as to make adding new ports easier.
|
||||
* added --gl-libs flag to wx-config.
|
||||
|
||||
-- Ron Lee <ron@debian.org> Thu, 30 Aug 2001 15:41:49 -0700
|
||||
|
||||
wxwindows2.2 (2.2.7) unstable; urgency=medium
|
||||
|
||||
* The "Testing Tarantella" release.
|
||||
* various small control (mis)behaviours corrected.
|
||||
* added missing build-dep for gettext.
|
||||
* updated wxPython description, Closes: #102689
|
||||
* Never publicly released, oh well.
|
||||
|
||||
-- Ron <ron@debian.org> Sun, 10 Jun 2001 19:32:46 -0700
|
||||
-- Ron Lee <ron@debian.org> Sun, 10 Jun 2001 19:32:46 -0700
|
||||
|
||||
wxwindows2.2 (2.2.6.1) unstable; urgency=low
|
||||
|
||||
* fix rules so it really doesn't build -indep for ports
|
||||
and fixed ambiguous oveload bug in mmedia contrib.
|
||||
and fixed ambiguous overload bug in mmedia contrib.
|
||||
This time it will build on alpha for sure. Really. :)
|
||||
Closes: #92288
|
||||
* added extra -dev package deps. Closes: #91364
|
||||
|
||||
-- Ron <ron@aeon.otsys.com> Sat, 7 Apr 2001 06:49:58 -0700
|
||||
-- Ron Lee <ron@debian.org> Sat, 7 Apr 2001 06:49:58 -0700
|
||||
|
||||
wxwindows2.2 (2.2.6) unstable; urgency=low
|
||||
|
||||
@@ -39,7 +65,7 @@ wxwindows2.2 (2.2.6) unstable; urgency=low
|
||||
likely default use.
|
||||
* general buglet count reduced.
|
||||
|
||||
-- Ron <ron@debian.org> Thu, 8 Mar 2001 21:10:07 -0800
|
||||
-- Ron Lee <ron@debian.org> Thu, 8 Mar 2001 21:10:07 -0800
|
||||
|
||||
wxwindows2.2 (2.2.5.1) unstable; urgency=low
|
||||
|
||||
|
||||
34
debian/control.in
vendored
34
debian/control.in
vendored
@@ -117,10 +117,10 @@ Package: libwxgtk=V-python
|
||||
Architecture: any
|
||||
Section: interpreters
|
||||
Depends: python-base (>=1.5.2), ${shlibs:Depends}
|
||||
Suggests: wxwin=V-doc
|
||||
Suggests: wxwin=V-doc, wxwin=V-examples
|
||||
Conflicts: libwxgtk=V-python-contrib, python-wxwin
|
||||
Replaces: libwxgtk=V-python-contrib, python-wxwin
|
||||
Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
|
||||
Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
|
||||
wxWindows is a class library for C++ providing GUI (Graphical User
|
||||
Interface) and other facilities on more than one platform. Version =V
|
||||
currently supports subsets of GTK+, Motif, and MS Windows.
|
||||
@@ -204,3 +204,33 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples)
|
||||
.
|
||||
This package contains examples of using the wxWindows toolkit.
|
||||
|
||||
Package: libwxbase-msw=V-dev
|
||||
Architecture: i386
|
||||
Section: otherosfs
|
||||
Depends: wxwin=V-headers-msw (= ${Source-Version})
|
||||
Conflicts: libwxbase-msw-dev
|
||||
Replaces: libwxbase-msw-dev
|
||||
Provides: libwxbase-msw-dev
|
||||
Description: wxBase mingw32msvc-cross
|
||||
mingw32msvc-cross wxBase libs.
|
||||
|
||||
Package: libwxmsw=V-dev
|
||||
Architecture: i386
|
||||
Section: otherosfs
|
||||
Depends: wxwin=V-headers-msw (= ${Source-Version})
|
||||
Conflicts: libwxmsw-dev
|
||||
Replaces: libwxmsw-dev
|
||||
Provides: libwxmsw-dev
|
||||
Description: wxMSW mingw32msvc-cross
|
||||
mingw32msvc-cross wxMSW libs.
|
||||
|
||||
Package: wxwin=V-headers-msw
|
||||
Architecture: i386
|
||||
Section: otherosfs
|
||||
Depends: wxwin=V-headers (= ${Source-Version})
|
||||
Conflicts: wxwin-headers-msw
|
||||
Replaces: wxwin-headers-msw
|
||||
Provides: wxwin-headers-msw
|
||||
Description: Extra wxWindows headers for mingw32msvc-cross
|
||||
Headers required by the wxWindows mingw32msvc-cross libraries.
|
||||
|
||||
|
||||
2
debian/libwxbase-dbg.dirs
vendored
2
debian/libwxbase-dbg.dirs
vendored
@@ -1,5 +1,5 @@
|
||||
usr/bin
|
||||
usr/lib/wx/include/wx
|
||||
usr/lib/wx/include/based-=V/wx
|
||||
usr/share/man/man1
|
||||
usr/share/lintian/overrides
|
||||
|
||||
|
||||
2
debian/libwxbase-dbg.links
vendored
2
debian/libwxbase-dbg.links
vendored
@@ -1,2 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-config.1.gz
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz
|
||||
|
||||
|
||||
2
debian/libwxbase-dbg.postinst
vendored
2
debian/libwxbase-dbg.postinst
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-config 50
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50
|
||||
|
||||
if [ "$1" = "configure" ]; then
|
||||
ldconfig
|
||||
|
||||
2
debian/libwxbase-dbg.prerm
vendored
2
debian/libwxbase-dbg.prerm
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxbased-config
|
||||
update-alternatives --remove wx-config /usr/bin/wxbased-=V-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
2
debian/libwxbase-dev.dirs
vendored
2
debian/libwxbase-dev.dirs
vendored
@@ -1,3 +1,3 @@
|
||||
usr/bin
|
||||
usr/lib/wx/include/wx
|
||||
usr/lib/wx/include/base-=V/wx
|
||||
usr/share/man/man1
|
||||
|
||||
4
debian/libwxbase-dev.files
vendored
4
debian/libwxbase-dev.files
vendored
@@ -1,4 +1,4 @@
|
||||
usr/bin/wxbase-config
|
||||
usr/lib/wx/include/wx/base/setup.h
|
||||
usr/bin/wxbase-=V-config
|
||||
usr/lib/wx/include/base-=V/wx/setup.h
|
||||
usr/lib/libwx_base*.so
|
||||
|
||||
|
||||
2
debian/libwxbase-dev.links
vendored
2
debian/libwxbase-dev.links
vendored
@@ -1 +1 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-config.1.gz
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz
|
||||
|
||||
2
debian/libwxbase-dev.postinst
vendored
2
debian/libwxbase-dev.postinst
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-config 60
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-config 60
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
2
debian/libwxbase-dev.prerm
vendored
2
debian/libwxbase-dev.prerm
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxbase-config
|
||||
update-alternatives --remove wx-config /usr/bin/wxbase-=V-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
4
debian/libwxbase-msw-dev.dirs
vendored
Normal file
4
debian/libwxbase-msw-dev.dirs
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
usr/bin
|
||||
usr/=H/lib/wx/include/base-=V-=H/wx
|
||||
usr/share/man/man1
|
||||
|
||||
2
debian/libwxbase-msw-dev.links
vendored
Normal file
2
debian/libwxbase-msw-dev.links
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz
|
||||
|
||||
7
debian/libwxbase-msw-dev.postinst
vendored
Normal file
7
debian/libwxbase-msw-dev.postinst
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-=H-config 40
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
7
debian/libwxbase-msw-dev.prerm
vendored
Normal file
7
debian/libwxbase-msw-dev.prerm
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxbase-=V-=H-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
2
debian/libwxgtk-dbg.dirs
vendored
2
debian/libwxgtk-dbg.dirs
vendored
@@ -1,5 +1,5 @@
|
||||
usr/bin
|
||||
usr/lib/wx/include/wx/gtkd/
|
||||
usr/lib/wx/include/gtkd-=V/wx
|
||||
usr/share/man/man1
|
||||
usr/share/lintian/overrides
|
||||
|
||||
|
||||
2
debian/libwxgtk-dbg.links
vendored
2
debian/libwxgtk-dbg.links
vendored
@@ -1,2 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-config.1.gz
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz
|
||||
|
||||
|
||||
2
debian/libwxgtk-dbg.postinst
vendored
2
debian/libwxgtk-dbg.postinst
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-config 50
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-=V-config 50
|
||||
|
||||
if [ "$1" = "configure" ]; then
|
||||
ldconfig
|
||||
|
||||
2
debian/libwxgtk-dbg.prerm
vendored
2
debian/libwxgtk-dbg.prerm
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxgtkd-config
|
||||
update-alternatives --remove wx-config /usr/bin/wxgtkd-=V-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
3
debian/libwxgtk-dev.dirs
vendored
3
debian/libwxgtk-dev.dirs
vendored
@@ -1,3 +1,4 @@
|
||||
usr/bin
|
||||
usr/lib/wx/include/wx/gtk/
|
||||
usr/lib/wx/include/gtk-=V/wx
|
||||
usr/share/man/man1
|
||||
|
||||
|
||||
8
debian/libwxgtk-dev.files
vendored
8
debian/libwxgtk-dev.files
vendored
@@ -1,6 +1,4 @@
|
||||
usr/bin/wxgtk-config
|
||||
usr/lib/wx/include/wx/gtk/setup.h
|
||||
usr/lib/libwx_gtk-*.so
|
||||
usr/lib/libwx_gtk.so
|
||||
usr/lib/libwx_gtk_gl*.so
|
||||
usr/bin/wxgtk-=V-config
|
||||
usr/lib/wx/include/gtk-=V/wx/setup.h
|
||||
usr/lib/libwx_gtk*.so
|
||||
|
||||
|
||||
3
debian/libwxgtk-dev.links
vendored
3
debian/libwxgtk-dev.links
vendored
@@ -1 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-config.1.gz
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-=V-config.1.gz
|
||||
|
||||
|
||||
2
debian/libwxgtk-dev.postinst
vendored
2
debian/libwxgtk-dev.postinst
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-config 70
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-=V-config 70
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
2
debian/libwxgtk-dev.prerm
vendored
2
debian/libwxgtk-dev.prerm
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxgtk-config
|
||||
update-alternatives --remove wx-config /usr/bin/wxgtk-=V-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
4
debian/libwxmsw-dev.dirs
vendored
Normal file
4
debian/libwxmsw-dev.dirs
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
usr/bin
|
||||
usr/=H/lib/wx/include/msw-=V-=H/wx
|
||||
usr/share/man/man1
|
||||
|
||||
2
debian/libwxmsw-dev.links
vendored
Normal file
2
debian/libwxmsw-dev.links
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmsw-=V-=H-config.1.gz
|
||||
|
||||
7
debian/libwxmsw-dev.postinst
vendored
Normal file
7
debian/libwxmsw-dev.postinst
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxmsw-=V-=H-config 40
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
7
debian/libwxmsw-dev.prerm
vendored
Normal file
7
debian/libwxmsw-dev.prerm
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxmsw-=V-=H-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
210
debian/rules
vendored
210
debian/rules
vendored
@@ -13,6 +13,9 @@ export DH_OPTIONS
|
||||
release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
|
||||
python_dir:=python$(shell python -c "import sys;print sys.version[:3]")
|
||||
|
||||
cross_host=i586-mingw32msvc
|
||||
cross_build=$(shell ./config.guess)
|
||||
|
||||
# Packages to build:
|
||||
package_wxbase_lib=libwxbase$(release)
|
||||
package_wxbase_dev=libwxbase$(release)-dev
|
||||
@@ -28,6 +31,10 @@ package_i18n=wxwin$(release)-i18n
|
||||
package_doc=wxwin$(release)-doc
|
||||
package_examples=wxwin$(release)-examples
|
||||
|
||||
package_wxbase_msw_dev=libwxbase-msw$(release)-dev
|
||||
package_msw_dev=libwxmsw$(release)-dev
|
||||
package_headers_msw=wxwin$(release)-headers-msw
|
||||
|
||||
# Build directories:
|
||||
objdir_wxbase_shared=objs_wxbase_sh
|
||||
objdir_wxbase_static=objs_wxbase_st
|
||||
@@ -39,9 +46,14 @@ objdir_doc_cruft=objs_doc_con
|
||||
objdir_doc=docs/wxWindows-manual.html
|
||||
objdir_examples=docs/examples
|
||||
objdir_i18n=locale
|
||||
|
||||
objdir_wxbase_msw_static=objs_wxbase_msw_st
|
||||
objdir_msw_static=objs_msw_st
|
||||
|
||||
objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
|
||||
$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
|
||||
$(objdir_doc) $(objdir_examples)
|
||||
$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
|
||||
$(objdir_wxbase_msw_static) $(objdir_msw_static)
|
||||
|
||||
# note that the i18n package is actually arch indep (once built)
|
||||
# but must be built (and installed) during the arch any phase as
|
||||
@@ -56,7 +68,11 @@ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
|
||||
|
||||
build_indep_stamps=build-examples-stamp build-doc-stamp
|
||||
|
||||
build_stamps=$(build_arch_stamps) $(build_indep_stamps)
|
||||
build_cross_stamps=build-wxbase-msw-dev-stamp build-msw-dev-stamp
|
||||
|
||||
build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
|
||||
|
||||
build_stamps=$(build_stamps_native) $(build_cross_stamps)
|
||||
|
||||
# Install targets:
|
||||
install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
|
||||
@@ -66,7 +82,11 @@ install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
|
||||
|
||||
install_all_indep=install-examples install-doc
|
||||
|
||||
install_all=$(install_all_arch) $(install_all_indep)
|
||||
install_all_cross=install-wxbase-msw-dev install-msw-dev install-headers-msw
|
||||
|
||||
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 \
|
||||
@@ -79,10 +99,7 @@ wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
|
||||
debian/control: debian/control.in
|
||||
sed -e 's/=V/$(release)/g' < debian/control.in > debian/control
|
||||
|
||||
debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in
|
||||
sed -e 's/=V/$(release)/g' < debian/wxwin-doc.doc-base.in > debian/wxwin-doc.doc-base
|
||||
|
||||
control-files-stamp: debian/control debian/wxwin-doc.doc-base
|
||||
control-files-stamp: debian/control
|
||||
dh_testdir
|
||||
@for f in dirs postinst; do \
|
||||
echo "generating control file $(package_wxbase_lib).$$f"; \
|
||||
@@ -90,11 +107,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
|
||||
done;
|
||||
@for f in dirs files links postinst prerm; do \
|
||||
echo "generating control file $(package_wxbase_dev).$$f"; \
|
||||
cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
|
||||
> debian/$(package_wxbase_dev).$$f; \
|
||||
done;
|
||||
@for f in dirs links postinst prerm; do \
|
||||
echo "generating control file $(package_wxbase_dbg).$$f"; \
|
||||
cp debian/libwxbase-dbg.$$f debian/$(package_wxbase_dbg).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
|
||||
> debian/$(package_wxbase_dbg).$$f; \
|
||||
done;
|
||||
@for f in dirs postinst; do \
|
||||
echo "generating control file $(package_gtk_lib).$$f"; \
|
||||
@@ -102,11 +121,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
|
||||
done;
|
||||
@for f in dirs files links postinst prerm; do \
|
||||
echo "generating control file $(package_gtk_dev).$$f"; \
|
||||
cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
|
||||
> debian/$(package_gtk_dev).$$f; \
|
||||
done;
|
||||
@for f in dirs links postinst prerm; do \
|
||||
echo "generating control file $(package_gtk_dbg).$$f"; \
|
||||
cp debian/libwxgtk-dbg.$$f debian/$(package_gtk_dbg).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
|
||||
> debian/$(package_gtk_dbg).$$f; \
|
||||
done;
|
||||
@for f in dirs docs files postinst prerm; do \
|
||||
echo "generating control file $(package_gtk_py).$$f"; \
|
||||
@@ -131,36 +152,57 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
|
||||
done;
|
||||
@for f in dirs docs doc-base; do \
|
||||
echo "generating control file $(package_doc).$$f"; \
|
||||
cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
|
||||
> debian/$(package_doc).$$f; \
|
||||
done;
|
||||
@for f in examples; do \
|
||||
echo "generating control file $(package_examples).$$f"; \
|
||||
cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
|
||||
done;
|
||||
@for f in dirs links postinst prerm; do \
|
||||
echo "generating control file $(package_wxbase_msw_dev).$$f"; \
|
||||
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
|
||||
> debian/$(package_wxbase_msw_dev).$$f; \
|
||||
done;
|
||||
@for f in dirs links 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; do \
|
||||
echo "generating control file $(package_headers_msw).$$f"; \
|
||||
sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
|
||||
> debian/$(package_headers_msw).$$f; \
|
||||
done;
|
||||
touch $@
|
||||
|
||||
build_arch: control-files-stamp $(build_arch_stamps)
|
||||
build_all: control-files-stamp $(build_stamps)
|
||||
build_all: control-files-stamp $(build_stamps_native)
|
||||
|
||||
# do nothing until we know which binary target is called
|
||||
build:
|
||||
# Really we should probably do nothing here until we know which
|
||||
# binary target is being called, but alpha builds were exploding
|
||||
# (compiler segfaults) in random places when building under fakeroot
|
||||
# from the binary-arch target. Build all -arch files here then, and
|
||||
# let the -indep stuff fend for itself later.
|
||||
|
||||
build: build_arch
|
||||
|
||||
|
||||
build-wxbase-shared-stamp:
|
||||
dh_testdir
|
||||
mkdir $(objdir_wxbase_shared)
|
||||
mkdir -p $(objdir_wxbase_shared)
|
||||
cd $(objdir_wxbase_shared) \
|
||||
&& ../configure --prefix=/usr \
|
||||
--cache-file=../config_deb.cache \
|
||||
--disable-gui \
|
||||
--enable-burnt_name \
|
||||
--enable-soname \
|
||||
--with-zlib=sys \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
build-wxbase-static-stamp:
|
||||
dh_testdir
|
||||
mkdir $(objdir_wxbase_static)
|
||||
mkdir -p $(objdir_wxbase_static)
|
||||
cd $(objdir_wxbase_static) \
|
||||
&& ../configure --prefix=/usr \
|
||||
--cache-file=../config_deb.cache \
|
||||
@@ -172,26 +214,26 @@ build-wxbase-static-stamp:
|
||||
|
||||
build-wxbase-debug-stamp:
|
||||
dh_testdir
|
||||
mkdir $(objdir_wxbase_debug)
|
||||
mkdir -p $(objdir_wxbase_debug)
|
||||
cd $(objdir_wxbase_debug) \
|
||||
&& ../configure --prefix=/usr \
|
||||
--cache-file=../config_deb.cache \
|
||||
--disable-gui \
|
||||
--enable-debug \
|
||||
--enable-burnt_name \
|
||||
--enable-soname \
|
||||
--with-zlib=sys \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
build-gtk-shared-stamp:
|
||||
dh_testdir
|
||||
mkdir $(objdir_gtk_shared)
|
||||
mkdir -p $(objdir_gtk_shared)
|
||||
cd $(objdir_gtk_shared) \
|
||||
&& ../configure --prefix=/usr \
|
||||
--cache-file=../config_deb.cache \
|
||||
--with-gtk \
|
||||
--with-opengl \
|
||||
--enable-burnt_name \
|
||||
--enable-soname \
|
||||
--with-zlib=sys \
|
||||
--with-libjpeg=sys \
|
||||
--with-libpng=sys \
|
||||
@@ -201,7 +243,7 @@ build-gtk-shared-stamp:
|
||||
|
||||
build-gtk-static-stamp:
|
||||
dh_testdir
|
||||
mkdir $(objdir_gtk_static)
|
||||
mkdir -p $(objdir_gtk_static)
|
||||
cd $(objdir_gtk_static) \
|
||||
&& ../configure --prefix=/usr \
|
||||
--cache-file=../config_deb.cache \
|
||||
@@ -217,14 +259,14 @@ build-gtk-static-stamp:
|
||||
|
||||
build-gtk-debug-stamp:
|
||||
dh_testdir
|
||||
mkdir $(objdir_gtk_debug)
|
||||
mkdir -p $(objdir_gtk_debug)
|
||||
cd $(objdir_gtk_debug) \
|
||||
&& ../configure --prefix=/usr \
|
||||
--cache-file=../config_deb.cache \
|
||||
--with-gtk \
|
||||
--with-opengl \
|
||||
--enable-debug \
|
||||
--enable-burnt_name \
|
||||
--enable-soname \
|
||||
--with-zlib=sys \
|
||||
--with-libjpeg=sys \
|
||||
--with-libpng=sys \
|
||||
@@ -258,7 +300,7 @@ build-doc-stamp: build-gtk-shared-stamp
|
||||
mkdir $(objdir_doc)
|
||||
mkdir $(objdir_doc_cruft)
|
||||
cd $(objdir_doc_cruft) \
|
||||
&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \
|
||||
&& 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
|
||||
cp docs/latex/wx/*.gif $(objdir_doc)
|
||||
@@ -267,10 +309,15 @@ build-doc-stamp: build-gtk-shared-stamp
|
||||
$(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
|
||||
touch $@
|
||||
|
||||
build-examples-stamp:
|
||||
build-examples-stamp: build-gtk-shared-stamp
|
||||
dh_testdir
|
||||
mkdir $(objdir_examples)
|
||||
mkdir -p $(objdir_examples)
|
||||
|
||||
# copy all samples and the Makefile generated for libwxgtk.
|
||||
cp -a samples $(objdir_examples)
|
||||
rm -f $(objdir_examples)/samples/Makefile
|
||||
cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples
|
||||
|
||||
cp -a demos $(objdir_examples)
|
||||
cp -a wxPython/demo $(objdir_examples)/wxPython
|
||||
@for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
|
||||
@@ -292,6 +339,33 @@ build-i18n-stamp: build-gtk-shared-stamp
|
||||
&& $(MAKE) allmo
|
||||
touch $@
|
||||
|
||||
build-wxbase-msw-dev-stamp:
|
||||
dh_testdir
|
||||
mkdir -p $(objdir_wxbase_msw_static)
|
||||
cd $(objdir_wxbase_msw_static) \
|
||||
&& ../configure --prefix=/usr/$(cross_host) \
|
||||
--cache-file=../config_deb.cache \
|
||||
--host=$(cross_host) \
|
||||
--build=$(cross_build) \
|
||||
--disable-gui \
|
||||
--disable-shared \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
build-msw-dev-stamp:
|
||||
dh_testdir
|
||||
mkdir -p $(objdir_msw_static)
|
||||
cd $(objdir_msw_static) \
|
||||
&& ../configure --prefix=/usr/$(cross_host) \
|
||||
--cache-file=../config_deb.cache \
|
||||
--host=$(cross_host) \
|
||||
--build=$(cross_build) \
|
||||
--with-mingw \
|
||||
--disable-shared \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
|
||||
clean: debian/control
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
@@ -312,10 +386,13 @@ clean: debian/control
|
||||
rm -f debian/$(package_i18n).*
|
||||
rm -f debian/$(package_doc).*
|
||||
rm -f debian/$(package_examples).*
|
||||
rm -f debian/$(package_wxbase_msw_dev).*
|
||||
rm -f debian/$(package_msw_dev).*
|
||||
rm -f debian/$(package_headers_msw).*
|
||||
|
||||
install_arch: build_arch $(install_all_arch)
|
||||
|
||||
install: build_all $(install_all)
|
||||
install: build_all $(install_all_native)
|
||||
|
||||
install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
|
||||
install-wxbase-lib: build-wxbase-shared-stamp
|
||||
@@ -324,7 +401,7 @@ install-wxbase-lib: build-wxbase-shared-stamp
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/usr/lib
|
||||
cp $(objdir_wxbase_shared)/wxbase-config debian/$(package_wxbase_lib)/usr/bin/
|
||||
cp $(objdir_wxbase_shared)/wxbase-$(release)-config debian/$(package_wxbase_lib)/usr/bin/
|
||||
|
||||
install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
|
||||
install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
|
||||
@@ -342,7 +419,7 @@ install-wxbase-dbg: build-wxbase-debug-stamp
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
|
||||
cp $(objdir_wxbase_debug)/wxbased-config debian/$(package_wxbase_dbg)/usr/bin/
|
||||
cp $(objdir_wxbase_debug)/wxbased-$(release)-config debian/$(package_wxbase_dbg)/usr/bin/
|
||||
cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
|
||||
|
||||
install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
|
||||
@@ -371,7 +448,7 @@ install-gtk-dbg: build-gtk-debug-stamp
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
|
||||
cp $(objdir_gtk_debug)/wxgtkd-config debian/$(package_gtk_dbg)/usr/bin/
|
||||
cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/
|
||||
cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
|
||||
|
||||
install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
|
||||
@@ -441,6 +518,45 @@ install-examples: build-examples-stamp
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
|
||||
install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
|
||||
install-wxbase-msw-dev: build-wxbase-msw-dev-stamp
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_wxbase_msw_static)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
|
||||
cp $(objdir_wxbase_msw_static)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
|
||||
$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a
|
||||
|
||||
install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
|
||||
install-msw-dev: build-msw-dev-stamp
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_msw_static)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
|
||||
cp $(objdir_msw_static)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
|
||||
$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
|
||||
|
||||
install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
|
||||
install-headers-msw:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
@# 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;
|
||||
@# 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
|
||||
|
||||
|
||||
binary-common:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
@@ -448,7 +564,11 @@ binary-common:
|
||||
dh_installchangelogs
|
||||
dh_installexamples
|
||||
dh_link
|
||||
dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg)
|
||||
|
||||
@# Don't strip debug libs at all, and strip cross libs elsewhere
|
||||
@# with the cross host tools until dh_strip gets smarter.
|
||||
dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) -N$(package_wxbase_msw_dev) -N$(package_msw_dev)
|
||||
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
dh_makeshlibs -N$(package_gtk_py) -V
|
||||
@@ -462,15 +582,29 @@ binary-common:
|
||||
# Note that you currently can't build the indep packages without first
|
||||
# building the arch specific package files needed to create them.
|
||||
binary-indep: build_all install
|
||||
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
|
||||
$(MAKE) -f debian/rules \
|
||||
DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
|
||||
binary-common
|
||||
|
||||
# Build just the architecture-dependent files here.
|
||||
binary-arch: build_arch install_arch
|
||||
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
|
||||
$(MAKE) -f debian/rules \
|
||||
DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
|
||||
binary-common
|
||||
|
||||
# Build all packages target.
|
||||
binary: binary-arch binary-indep
|
||||
|
||||
# This is a special target for building the wxMSW-cross packages.
|
||||
# It's not currently called during the official package build run
|
||||
# but may be run separately to build the extra packages.
|
||||
# There is an implied build dep on the mingw32 cross compiler
|
||||
# that is not in the control file.
|
||||
binary-cross: control-files-stamp $(install_all_cross)
|
||||
$(MAKE) -f debian/rules \
|
||||
DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_msw_dev) -p$(package_headers_msw)" \
|
||||
binary-common
|
||||
|
||||
|
||||
############################################################################
|
||||
#
|
||||
@@ -511,8 +645,10 @@ binary-doc: control-files-stamp install-doc
|
||||
|
||||
.PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
|
||||
binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
|
||||
binary-wxbase-dbg binary-doc install install_arch install-wxbase-lib \
|
||||
binary-wxbase-dbg binary-doc binary-cross \
|
||||
install install_arch install-wxbase-lib \
|
||||
install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
|
||||
install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
|
||||
install-gtk-py install-headers install-i18n install-doc install-examples
|
||||
install-gtk-py install-headers install-i18n install-doc install-examples \
|
||||
install-wxbase-msw-dev install-msw-dev install-headers-msw
|
||||
|
||||
|
||||
2
debian/wxwin-headers-msw.dirs
vendored
Normal file
2
debian/wxwin-headers-msw.dirs
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/=H/include/wx
|
||||
|
||||
Reference in New Issue
Block a user