X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eedbe99970cd19e73a8f96f6a06e775408a4709f..94f6d685cb30a8e62d21254bbf19902b48eb2443:/debian/rules diff --git a/debian/rules b/debian/rules index 316d17626c..8c89fd845b 100755 --- a/debian/rules +++ b/debian/rules @@ -9,23 +9,41 @@ #export DH_VERBOSE=1 export DH_OPTIONS -ifdef DISTCC_HOSTS +ifdef CONCURRENCY_LEVEL - #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#))) - # Nearly as fast, but doesn't raise the room temperature - # or saturate the build machines quite so much. + # A user who knows what they want, that's like gold... + # respect their precious opinion of how much blue smoke to use. + JOB_COUNT := $(CONCURRENCY_LEVEL) + +else ifdef DISTCC_HOSTS + + # Otherwise, if they have a cluster, try to put it to good use. JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$\#) - FAST_MAKE = $(MAKE) -j $(JOB_COUNT) -else + # Not much faster, but it might keep you warm in winter... + #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#))) - FAST_MAKE = $(MAKE) +endif +ifdef JOB_COUNT + FAST_MAKE = $(MAKE) -j $(JOB_COUNT) +else + FAST_MAKE = $(MAKE) endif -include debian/python-version +# If another source package is to supply the common binary packages +# for a particular Debian release, then define this variable to indicate +# the $(release) that is expected to provide it. Do not define it at +# all if this is to be the default (or only) wx source package for the +# target release. +# +# for etch: +#DEBIAN_WX_DEFAULT_VERSION = 2.6 + + # 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. @@ -38,37 +56,149 @@ endif # 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') -soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/') -sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR)) +wx_major_version_number := $(shell sed -n 's/^wx_major_version_number=//p' configure.in) +wx_minor_version_number := $(shell sed -n 's/^wx_minor_version_number=//p' configure.in) +wx_release_number := $(shell sed -n 's/^wx_release_number=//p' configure.in) +wx_subrelease_number := $(shell sed -n 's/^wx_subrelease_number=//p' configure.in) + +##release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p' | sed 's/-ansi//') +release := $(wx_major_version_number).$(wx_minor_version_number) + +# This is broken completely now by bakefiles changes. Until we add +# some hocus pocus to the main tree, to export these values from it +# again, we approximate its behaviour (fairly precisely fwiw) to +# specify $soversion below. Re-automate if incompatible changes +# result in it actually changing. +#soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/') +soversion := 0 +sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR)) + +# In some places we use the full version number, including the micro version, +# for the development releases (which can be incompatible for the same major +# and minor version) but just the major.minor for the stable releases (which +# are supposed to be compatible), this variable contains the appropriate value +ifeq ($(shell echo `echo $(release) | sed 's/.\+\.\(.\+\)/\1/'`%2 | bc),1) + # development release + compatible_release := $(release).$(wx_release_number) +else + compatible_release := $(release) +endif + +# Base value for alternative priorities. +alt_prio := $(subst .,,$(release)) + +pytoolkit := gtk2 pydir := usr/lib/$(python_ver)/site-packages -wxpydir := $(pydir)/wx-$(sorelease)-gtk2-unicode +wxpydir := $(pydir)/wx-$(compatible_release)-$(pytoolkit) -cross_host = i586-mingw32msvc -cross_build = $(shell ./config.guess) +cross_host := i586-mingw32msvc +cross_build := $(shell ./config.guess) config_cache = ../config_deb.cache config_cache_cross = ../config_deb_cross.cache + +# build options +COMMON_CONFIGURE_OPTIONS = \ + --prefix=/usr \ + --cache-file=$(config_cache) \ + --with-flavour=$(DEBIAN_WXFLAVOUR) \ + --with-zlib=sys \ + --disable-reserved_virtual \ + +BASE_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \ + --disable-gui \ + +GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \ + --with-gtk \ + --enable-mediactrl \ + --enable-sound \ + --with-sdl \ + --enable-display \ + --enable-geometry \ + --enable-graphics_ctx \ + --with-libjpeg=sys \ + --with-libpng=sys \ + --with-libtiff=sys \ + + +PY_WX_CONFIG_OPTIONS = --version=$(release) --toolkit=$(pytoolkit) --static=no + +WX_UNICODE := 1 +WX_OPENGL := 1 + +ifeq ($(WX_UNICODE),1) + COMMON_CONFIGURE_OPTIONS += --enable-unicode + PY_WX_CONFIG_OPTIONS += --unicode + PY_UNICODE="UNICODE=1" + wxpydir := $(pydir)/wx-$(compatible_release)-$(pytoolkit)-unicode + + # for compatibility with the existing 2.6 packages, we don't use "u" in + # the Unicode (default) package names + unicode_suffix := +else + # but we do need to use something for non-Unicode packages to distinguish + # them + unicode_suffix := -ansi +endif + +ifeq ($(WX_OPENGL),1) + GTK_CONFIGURE_OPTIONS += --with-opengl +else + GTK_CONFIGURE_OPTIONS += --without-opengl +endif + # Packages to build: -package_gtk_lib = libwxgtk$(sorelease) -package_gtk_dev = libwxgtk$(release)-dev -package_gtk_dbg = libwxgtk$(release)-dbg -package_gtk_py_lib = libwxgtk$(sorelease)-python -package_gtk_py = wxpython$(sorelease) -package_common = wx$(release)-common -package_headers = wx$(release)-headers -package_i18n = wx$(release)-i18n -package_doc = wx$(release)-doc -package_examples = wx$(release)-examples - -package_gtk_dbg_py = libwxgtk$(sorelease)-dbg-python -package_msw_dev = libwxmsw$(release)-dev -package_msw_dbg = libwxmsw$(release)-dbg -package_headers_msw = wx$(release)-headers-msw +package_wxbase_lib := libwxbase$(sorelease)$(unicode_suffix) +package_wxbase_dev := libwxbase$(release)$(unicode_suffix)-dev +package_wxbase_dbg := libwxbase$(release)$(unicode_suffix)-dbg + +package_gtk_lib := libwxgtk$(sorelease)$(unicode_suffix) +package_gtk_dev := libwxgtk$(release)$(unicode_suffix)-dev +package_gtk_dbg := libwxgtk$(release)$(unicode_suffix)-dbg + + + + +package_gtk_py_lib := python-wxgtk$(release)$(unicode_suffix) +package_gtk_py_ver = python-wxversion +package_gtk_py_tools = python-wxtools +package_gtk_py_addons = python-wxaddons + +package_headers := wx$(release)-headers +package_i18n := wx$(release)-i18n +package_doc := wx$(release)-doc +package_examples := wx$(release)-examples +package_common = wx-common + +# The packages listed here are common to all wx versions, and may be provided +# by another source package if more than one is in the release simultaneously. +common_packages := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools) $(package_gtk_py_addons) + + +package_gtk_dbg_py := python-wxgtk$(release)$(unicode_suffix)-dbg + + + +package_msw_dev := libwxmsw$(release)$(unicode_suffix)-dev +package_msw_dbg := libwxmsw$(release)$(unicode_suffix)-dbg +package_headers_msw := wx$(release)-headers-msw + +# The packages listed here will not be built by default. +extra_packages := $(package_gtk_dbg_py) \ + $(package_msw_dev) $(package_msw_dbg) $(package_headers_msw) + +ifdef DEBIAN_WX_DEFAULT_VERSION + + extra_packages += $(common_packages) + +endif + # Build directories: +objdir_wxbase_shared = objs_wxbase_sh +objdir_wxbase_debug = objs_wxbase_d objdir_gtk_shared = objs_gtk_sh objdir_gtk_debug = objs_gtk_d objdir_gtk_install = objs_gtk_install @@ -82,48 +212,65 @@ objdir_msw_static = objs_msw_st objdir_msw_dbg = objs_msw_d objdir_msw_install = objs_msw_install -objdirs = $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install) \ - $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \ - $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg) \ - $(objdir_msw_install) +objdirs := $(objdir_wxbase_shared) $(objdir_wxbase_debug) \ + $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install) \ + $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \ + $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg) \ + $(objdir_msw_install) # note that the i18n package is actually arch indep (once built) # but must be built (and installed) during the arch any phase as # it's pulled out of the wxGTK shared lib package. +# +# similarly some of the wxpython packages are arch indep too, but +# all files for it are installed during the arch any phase. # Build stamps: -build_arch_stamps = build-gtk-shared-stamp build-gtk-shared-contrib-stamp \ +build_arch_stamps = build-wxbase-shared-stamp build-wxbase-debug-stamp \ + build-gtk-shared-stamp build-gtk-shared-contrib-stamp \ build-gtk-debug-stamp build-gtk-debug-contrib-stamp \ build-i18n-stamp build-gtk-py-stamp +build_indep_stamps = build-examples-stamp build-doc-stamp -build_indep_stamps = build-examples-stamp build-doc-stamp +build_cross_stamps = build-msw-shared-stamp build-msw-static-stamp build-msw-dbg-stamp -build_cross_stamps = build-msw-shared-stamp build-msw-static-stamp build-msw-dbg-stamp +build_stamps_native := $(build_arch_stamps) $(build_indep_stamps) -build_stamps_native = $(build_arch_stamps) $(build_indep_stamps) - -build_stamps = $(build_stamps_native) $(build_cross_stamps) +build_stamps := $(build_stamps_native) $(build_cross_stamps) # Install targets: -install_all_arch = install-gtk-lib install-gtk-dev install-gtk-dbg \ - install-common install-headers install-i18n \ +install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ + install-gtk-lib install-gtk-dev install-gtk-dbg \ + install-headers install-i18n \ install-gtk-py -install_all_indep = install-examples install-doc +ifndef DEBIAN_WX_DEFAULT_VERSION + + install_all_arch += install-common + +endif -install_all_cross = install-msw-dev install-msw-dbg install-headers-msw +install_all_indep = install-examples install-doc -install_all_native = $(install_all_arch) $(install_all_indep) +install_all_cross = install-msw-dev install-msw-dbg install-headers-msw -install_all = $(install_all_native) $(install_all_cross) +install_all_native := $(install_all_arch) $(install_all_indep) +install_all := $(install_all_native) $(install_all_cross) + +# wxPython uses this to build in-tree wxconfig := $(shell pwd)/$(objdir_gtk_shared)/wx-config --no_rpath wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config --no_rpath +# and this after it is installed. +py_wxconfig := wx-config $(PY_WX_CONFIG_OPTIONS) --debug=no +pyd_wxconfig := wx-config $(PY_WX_CONFIG_OPTIONS) --debug + + #contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*))) @@ -133,42 +280,58 @@ debian/python-version: echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@ debian/control: $(addprefix debian/,control.in python-version) - sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g' \ + sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g;s/=U/$(unicode_suffix)/g'\ < debian/control.in > debian/control control-files-stamp: debian/control dh_testdir + @for f in postinst prerm; do \ + echo "generating control file $(package_wxbase_dev).$$f"; \ + sed -e 's/=V/$(release)/g; '\ +' s/=PRIO/$(alt_prio)/g' \ + < debian/libwxbase-dev.$$f \ + > debian/$(package_wxbase_dev).$$f; \ + done; + @for f in postinst prerm; do \ + echo "generating control file $(package_wxbase_dbg).$$f"; \ + sed -e 's/=V/$(release)/g; '\ +' s/=PRIO/$(alt_prio)/g' \ + < debian/libwxbase-dbg.$$f \ + > debian/$(package_wxbase_dbg).$$f; \ + done; @for f in postinst prerm; do \ echo "generating control file $(package_gtk_dev).$$f"; \ - sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \ + sed -e 's/=V/$(release)/g; '\ +' s/=PRIO/$(alt_prio)/g' \ + < debian/libwxgtk-dev.$$f \ > debian/$(package_gtk_dev).$$f; \ done; @for f in postinst prerm; do \ echo "generating control file $(package_gtk_dbg).$$f"; \ - sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \ + sed -e 's/=V/$(release)/g; '\ +' s/=PRIO/$(alt_prio)/g' \ + < debian/libwxgtk-dbg.$$f \ > debian/$(package_gtk_dbg).$$f; \ done; @for f in docs postinst prerm; do \ echo "generating control file $(package_gtk_py_lib).$$f"; \ - sed -e 's/=PY/$(python_ver)/g; \ - s|=WXPYDIR|$(wxpydir)|g; \ - s/=V/$(release)/g; \ - s/=SOV/$(sorelease)/g' \ - < debian/libwxgtk-python.$$f \ + sed -e 's/=PY/$(python_ver)/g; '\ +' s|=WXPYDIR|$(wxpydir)|g; '\ +' s/=V/$(release)/g; '\ +' s/=PRIO/$(alt_prio)/g' \ + < debian/python-wxgtk.$$f \ > debian/$(package_gtk_py_lib).$$f; \ done; - @echo "generating control file $(package_gtk_py).menu"; \ - sed -e 's/=SOV/$(sorelease)/g' < debian/wxpython.menu \ - > debian/$(package_gtk_py).menu; - @for f in docs postinst; do \ + @for f in postinst prerm; do \ echo "generating control file $(package_gtk_dbg_py).$$f"; \ - sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SOV/$(sorelease)/g' \ - < debian/libwxgtk-python.$$f \ + sed -e 's/=PY/$(python_ver)/g; '\ +' s/=V/$(release)/g; '\ +' s/=PRIO/$(alt_prio)/g' \ + < debian/python-wxgtk-dbg.$$f \ > debian/$(package_gtk_dbg_py).$$f; \ done; - @echo "generating control file $(package_gtk_dbg_py).prerm"; \ - sed 's/=SOV/$(sorelease)/g' < debian/libwxgtk-dbg-python.prerm \ - > debian/$(package_gtk_dbg_py).prerm + @echo "generating control file $(package_gtk_dbg_py).docs"; + @cp debian/python-wxgtk.docs debian/$(package_gtk_dbg_py).docs; @for f in docs doc-base; do \ echo "generating control file $(package_doc).$$f"; \ sed -e 's/=V/$(release)/g' < debian/wx-doc.$$f \ @@ -180,19 +343,27 @@ control-files-stamp: debian/control done; @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 \ + sed -e 's/=V/$(release)/g; '\ +' s/=H/$(cross_host)/g; '\ +' s/=PRIO/$(alt_prio)/g' \ + < debian/libwxmsw-dev.$$f \ > debian/$(package_msw_dev).$$f; \ done; @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 \ + sed -e 's/=V/$(release)/g; '\ +' s/=H/$(cross_host)/g; '\ +' s/=PRIO/$(alt_prio)/g' \ + < debian/libwxmsw-dbg.$$f \ > debian/$(package_msw_dbg).$$f; \ done; # @echo "generating control file $(package_common).menu"; \ # sed -e 's/=V/$(release)/g' < debian/wx-common.menu \ # > debian/$(package_common).menu; @echo "generating control file lintian-override"; \ - sed -e 's/=V/$(release)/g' < debian/lintian-override.in \ + sed -e 's/=V/$(release)/g; '\ +' s/=SOV/$(sorelease)/g' \ + < debian/lintian-override.in \ > debian/lintian-override; \ touch $@ @@ -208,18 +379,43 @@ build_all: control-files-stamp $(build_stamps_native) build: build_arch +# The wx2.6 build system makes us run around in circles to get a separate +# libwxbase. We need to configure it here in order to get the correct +# config files to use it alone, but there is no point building it as the +# wxgtk build is going to do that again anyway. We'll move the relevant +# files out when that is done. + +configure-wxbase-shared-stamp: + dh_testdir + mkdir -p $(objdir_wxbase_shared) + cd $(objdir_wxbase_shared) \ + && ../configure $(BASE_CONFIGURE_OPTIONS) + touch $@ + +build-wxbase-shared-stamp: configure-wxbase-shared-stamp + dh_testdir + # Nothing to build here, move along... + #cd $(objdir_wxbase_shared) && $(FAST_MAKE) + touch $@ + +configure-wxbase-debug-stamp: + dh_testdir + mkdir -p $(objdir_wxbase_debug) + cd $(objdir_wxbase_debug) \ + && ../configure $(BASE_CONFIGURE_OPTIONS) --enable-debug + touch $@ + +build-wxbase-debug-stamp: configure-wxbase-debug-stamp + dh_testdir + # Nothing to build here, move along... + #cd $(objdir_wxbase_debug) && $(FAST_MAKE) + touch $@ + configure-gtk-shared-stamp: dh_testdir mkdir -p $(objdir_gtk_shared) cd $(objdir_gtk_shared) \ - && ../configure --prefix=/usr \ - --cache-file=$(config_cache) \ - --with-flavour=$(DEBIAN_WXFLAVOUR) \ - --with-gtk \ - --with-zlib=sys \ - --with-libjpeg=sys \ - --with-libpng=sys \ - --with-libtiff=sys + && ../configure $(GTK_CONFIGURE_OPTIONS) touch $@ build-gtk-shared-stamp: configure-gtk-shared-stamp @@ -232,15 +428,7 @@ configure-gtk-debug-stamp: dh_testdir mkdir -p $(objdir_gtk_debug) cd $(objdir_gtk_debug) \ - && ../configure --prefix=/usr \ - --cache-file=$(config_cache) \ - --with-flavour=$(DEBIAN_WXFLAVOUR) \ - --with-gtk \ - --enable-debug \ - --with-zlib=sys \ - --with-libjpeg=sys \ - --with-libpng=sys \ - --with-libtiff=sys + && ../configure $(GTK_CONFIGURE_OPTIONS) --enable-debug touch $@ build-gtk-debug-stamp: configure-gtk-debug-stamp @@ -253,7 +441,6 @@ build-gtk-shared-contrib-stamp: build-gtk-shared-stamp dh_testdir cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE) cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE) - #cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE) touch $@ @@ -275,27 +462,36 @@ build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py cd wxPython \ && $(python_ver) ./setup.py build \ WX_CONFIG='$(wxconfig)' \ - WXPORT=gtk2 \ - UNICODE=1 \ + WXPORT=$(pytoolkit) \ + $(PY_UNICODE) \ FLAVOUR=$(DEBIAN_WXFLAVOUR) touch $@ build-doc-stamp: build-gtk-shared-stamp dh_testdir - 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)/wx$(release)-manual.html \ - -twice -html - cp docs/latex/wx/*.gif $(objdir_doc) - rm -rf $(objdir_doc_cruft) - rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref} + # the tarball may already have the generated docs in it + if [ ! -e docs/html/wx/index.html ]; then \ + cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE); \ + cd -; \ + 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)/wx$(release)-manual.html \ + -twice -html; \ + cd -; \ + cp docs/latex/wx/*.gif $(objdir_doc); \ + rm -rf $(objdir_doc_cruft); \ + rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref}; \ + else \ + mkdir $(objdir_doc); \ + cp docs/html/wx/* $(objdir_doc); \ + mv $(objdir_doc)/index.html $(objdir_doc)/wx-$(release)-manual_contents.html; \ + fi touch $@ build-examples-stamp: build-gtk-shared-stamp @@ -317,6 +513,11 @@ build-examples-stamp: build-gtk-shared-stamp cp -a wxPython/demo $(objdir_examples)/wxPython + echo "generating install_examples.sh script"; + sed -e 's/=V/$(release)/g' < debian/unpack_examples.sh.in \ + > debian/unpack_examples.sh + chmod 755 debian/unpack_examples.sh + touch $@ build-i18n-stamp: build-gtk-shared-stamp @@ -342,8 +543,8 @@ build-gtk-dbg-py-stamp: build-gtk-debug-stamp purge-release-py cd wxPython \ && $(python_ver) ./setup.py build \ WX_CONFIG='$(wxconfig-dbg)' \ - WXPORT=gtk2 \ - UNICODE=1 \ + WXPORT=$(pytoolkit) \ + $(PY_UNICODE) \ FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg touch $@ @@ -418,12 +619,13 @@ clean: debian/control clean-py rm -f $(objdir_i18n)/*.mo dh_clean + rm -f debian/$(package_wxbase_lib).* + rm -f debian/$(package_wxbase_dev).* + rm -f debian/$(package_wxbase_dbg).* rm -f debian/$(package_gtk_lib).* rm -f debian/$(package_gtk_dev).* rm -f debian/$(package_gtk_dbg).* rm -f debian/$(package_gtk_py_lib).* - rm -f debian/$(package_gtk_py).* - rm -f debian/$(package_common).* rm -f debian/$(package_headers).* rm -f debian/$(package_i18n).* rm -f debian/$(package_doc).* @@ -432,11 +634,45 @@ clean: debian/control clean-py rm -f debian/$(package_msw_dev).* rm -f debian/$(package_msw_dbg).* rm -f debian/lintian-override + rm -f debian/unpack_examples.sh install_arch: build_arch $(install_all_arch) install: build_all $(install_all_native) + +install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib) +install-wxbase-lib: build-wxbase-shared-stamp install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_clean -k + @# No, this is not a typo, we steal these libs from the gtk build. + dh_install $(objdir_gtk_install)/lib/libwx_base*.so.* usr/lib + dh_installdirs usr/share/lintian/overrides + cp debian/lintian-override debian/$(package_wxbase_lib)/usr/share/lintian/overrides/$(package_wxbase_lib) + +install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev) +install-wxbase-dev: build-wxbase-shared-stamp install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_clean -k + @# No, this is not a typo, we steal these libs from the gtk build. + dh_install $(objdir_gtk_install)/lib/libwx_base*.so usr/lib + dh_install $(objdir_wxbase_shared)/lib/wx/include usr/lib/wx + dh_install $(objdir_wxbase_shared)/lib/wx/config/base* usr/lib/wx/config + +install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg) +install-wxbase-dbg: build-wxbase-debug-stamp + dh_testdir + dh_testroot + dh_clean -k + @# No, this is not a typo, we steal these libs from the gtk debug build. + dh_install $(objdir_gtk_debug)/lib/libwx_base* usr/lib + dh_install $(objdir_wxbase_debug)/lib/wx/include usr/lib/wx + dh_install $(objdir_wxbase_debug)/lib/wx/config/base* usr/lib/wx/config + dh_installdirs usr/share/lintian/overrides + cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg) + install-gtk-shared-stamp: build-gtk-shared-stamp build-gtk-shared-contrib-stamp dh_testdir mkdir -p $(objdir_gtk_install) @@ -451,16 +687,16 @@ install-gtk-lib: install-gtk-shared-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs - dh_install $(objdir_gtk_install)/lib/libwx_*.so.* usr/lib + dh_install $(objdir_gtk_install)/lib/libwx_gtk*.so.* usr/lib + dh_installdirs usr/share/lintian/overrides + cp debian/lintian-override debian/$(package_gtk_lib)/usr/share/lintian/overrides/$(package_gtk_lib) install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev) install-gtk-dev: install-gtk-shared-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs - dh_install $(objdir_gtk_install)/lib/libwx_*.so usr/lib + dh_install $(objdir_gtk_install)/lib/libwx_gtk*.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 @@ -469,10 +705,10 @@ 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)/lib/libwx_* usr/lib + dh_install $(objdir_gtk_debug)/lib/libwx_gtk* 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 + dh_installdirs usr/share/lintian/overrides cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg) @@ -481,31 +717,48 @@ install-gtk-py-lib: build-gtk-py-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs + dh_installdirs usr/lib/wx/python cd wxPython \ && $(python_ver) ./setup.py install \ --prefix=`pwd`/../debian/$(package_gtk_py_lib)/usr \ WX_CONFIG='$(wxconfig)' \ - WXPORT=gtk2 \ - UNICODE=1 \ + SYS_WX_CONFIG='$(py_wxconfig)' \ + WXPORT=$(pytoolkit) \ + $(PY_UNICODE) \ FLAVOUR=$(DEBIAN_WXFLAVOUR) + mv debian/$(package_gtk_py_lib)/$(pydir)/wx.pth \ + debian/$(package_gtk_py_lib)/usr/lib/wx/python/wx$(release).pth + find debian/$(package_gtk_py_lib)/$(pydir) -name '*.py?' -exec rm '{}' ';' # This is rather bogus, its included in the main copyright file now though. rm -f debian/$(package_gtk_py_lib)/$(wxpydir)/wx/tools/XRCed/license.txt -install-gtk-py: DH_OPTIONS=-p$(package_gtk_py) -install-gtk-py: install-gtk-py-lib +install-gtk-py-ver: DH_OPTIONS=-p$(package_gtk_py_ver) +install-gtk-py-ver: install-gtk-py-lib dh_testdir dh_testroot dh_clean -k - dh_installdirs - dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) \ - usr/bin \ - $(pydir)/{wxversion.py,wx.pth} - rm -r debian/$(package_gtk_py_lib)/usr/bin +ifndef DEBIAN_WX_DEFAULT_VERSION + + dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) $(pydir)/wxversion.py +else + rm debian/$(package_gtk_py_lib)/$(pydir)/wxversion.py +endif + + + +install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools) +install-gtk-py-tools: install-gtk-py-ver + dh_testdir + dh_testroot + dh_clean -k + +ifndef DEBIAN_WX_DEFAULT_VERSION + + dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) usr/bin dh_installman debian/wxPython-tools.1 dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1 \ @@ -520,23 +773,52 @@ install-gtk-py: install-gtk-py-lib usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1 \ usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywxrc.1 + dh_installdirs usr/share/lintian/overrides + cp debian/lintian-override debian/$(package_gtk_py_tools)/usr/share/lintian/overrides/$(package_gtk_py_tools) +endif + mkdir -p debian/$(package_gtk_py_tools)/usr/share/pixmaps + mkdir -p debian/$(package_gtk_py_tools)/usr/share/applications + + cp wxPython/wx/py/PyCrust_32.png debian/$(package_gtk_py_tools)/usr/share/pixmaps/pycrust.png + cp wxPython/wx/py/PyCrust_32.png debian/$(package_gtk_py_tools)/usr/share/pixmaps/pyshell.png + cp wxPython/wx/tools/XRCed/XRCed_32.png debian/$(package_gtk_py_tools)/usr/share/pixmaps/xrced.png + cp debian/pycrust.desktop debian/$(package_gtk_py_tools)/usr/share/applications + cp debian/pyshell.desktop debian/$(package_gtk_py_tools)/usr/share/applications + cp debian/xrced.desktop debian/$(package_gtk_py_tools)/usr/share/applications + + rm -r debian/$(package_gtk_py_lib)/usr/bin + +install-gtk-py-addons: DH_OPTIONS=-p$(package_gtk_py_addons) +install-gtk-py-addons: install-gtk-py-tools + dh_testdir + dh_testroot + dh_clean -k +ifndef DEBIAN_WX_DEFAULT_VERSION + + dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) $(pydir)/wxaddons +else + rm -r debian/$(package_gtk_py_lib)/$(pydir)/wxaddons +endif + + +install-gtk-py: install-gtk-py-addons + install-common: DH_OPTIONS=-p$(package_common) install-common: install-gtk-shared-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs - dh_install $(objdir_gtk_install)/share/aclocal usr/share - dh_installman debian/wx-config.1 + dh_install $(objdir_gtk_install)/share/bakefile/presets usr/share/bakefile + dh_install $(objdir_gtk_install)/share/bakefile/presets/wx*.bkl usr/share/bakefile/presets - dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin -# dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit usr/bin + dh_install $(objdir_gtk_install)/share/aclocal usr/share + dh_installman debian/wx-config.1 + dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin dh_installman debian/wxrc-tools.1 dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1 -# dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1 install-headers: DH_OPTIONS=-p$(package_headers) @@ -544,7 +826,6 @@ install-headers: install-gtk-shared-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs # The only way to be really sure we get the univ headers correct is to install # them. Do that in a scratch dirs, and move the gtk ones last, so at least @@ -561,7 +842,6 @@ install-i18n: build-i18n-stamp install-gtk-shared-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs dh_install $(objdir_gtk_install)/share/locale usr/share install-doc: DH_OPTIONS=-p$(package_doc) @@ -569,29 +849,36 @@ install-doc: build-doc-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs + + @# Link this monstrosity with an overly obfuscated name + @# to something that both people and browsers can expect to find. + dh_link usr/share/doc/$(package_doc)/wx-manual.html/wx-$(release)-manual_contents.html \ + usr/share/doc/$(package_doc)/wx-manual.html/index.html install-examples: DH_OPTIONS=-p$(package_examples) install-examples: build-examples-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs install-gtk-dbg-py: DH_OPTIONS=-p$(package_gtk_dbg_py) install-gtk-dbg-py: build-gtk-dbg-py-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs + dh_installdirs usr/lib/wx/python cd wxPython \ && $(python_ver) ./setup.py install \ --prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr \ WX_CONFIG='$(wxconfig-dbg)' \ - WXPORT=gtk2 \ - UNICODE=1 \ + SYS_WX_CONFIG='$(pyd_wxconfig)' \ + WXPORT=$(pytoolkit) \ + $(PY_UNICODE) \ FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg + mv debian/$(package_gtk_py_lib)/$(pydir)/wx.pth \ + debian/$(package_gtk_py_lib)/usr/lib/wx/python/wx$(release)-dbg.pth + find debian/$(package_gtk_dbg_py)/$(pydir) -name '*.py?' -exec rm '{}' ';' rm -rf usr/bin $(pydir)/{wxversion.py,wx.pth} @@ -604,7 +891,6 @@ install-msw-dev: build-msw-shared-stamp build-msw-static-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs 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/$(cross_host)/lib/wx/config @@ -629,7 +915,6 @@ install-msw-dbg: build-msw-dbg-stamp dh_testdir dh_testroot dh_clean -k - dh_installdirs 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/$(cross_host)/lib/wx/config @@ -677,7 +962,8 @@ binary-common: @# 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_msw_dev) -N$(package_msw_dbg) + dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \ + -N$(package_msw_dev) -N$(package_msw_dbg) dh_compress dh_fixperms @@ -685,12 +971,12 @@ binary-common: @# Don't do this for the dbg-py special build because dh_makeshlibs @# will crap out if it is called with no packages to act on. @if [ "x$(DH_OPTIONS)" != "-p$(package_gtk_dbg_py)" ]; then \ - echo "dh_makeshlibs -N$(package_gtk_py) -V"; \ - dh_makeshlibs -N$(package_gtk_py) -V; \ + echo "dh_makeshlibs -N$(package_gtk_py_lib) -V"; \ + dh_makeshlibs -N$(package_gtk_py_lib) -V; \ fi dh_installdeb - dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib + dh_shlibdeps -ldebian/$(package_wxbase_lib)/usr/lib:debian/$(package_wxbase_dbg)/usr/lib:debian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib dh_gencontrol dh_md5sums dh_builddeb @@ -700,18 +986,19 @@ binary-common: # building the arch specific package files needed to create them. binary-indep: build_all install $(MAKE) -f debian/rules \ - DH_OPTIONS="-i -N$(package_gtk_dbg_py) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \ + DH_OPTIONS="-i $(addprefix -N,$(extra_packages))" \ binary-common # Build just the architecture-dependent files here. binary-arch: build_arch install_arch $(MAKE) -f debian/rules \ - DH_OPTIONS="-a -N$(package_gtk_dbg_py) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \ + DH_OPTIONS="-a $(addprefix -N,$(extra_packages))" \ 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. @@ -737,17 +1024,21 @@ binary-dbg-py: control-files-stamp install-gtk-dbg-py # Debian policy. Do not distribute packages built with these rules, they # are currently useful for rapid in-house testing by developers only. +DH_OPTIONS_GTK := -p$(package_wxbase_lib) -p$(package_gtk_lib) -p$(package_headers) + # libwxgtk shared lib package -binary-gtk: control-files-stamp install-gtk-lib install-headers - $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_lib) -p$(package_headers)" binary-common +binary-gtk: control-files-stamp install-gtk-lib install-wxbase-lib install-headers + $(MAKE) -f debian/rules DH_OPTIONS="$(DH_OPTIONS_GTK)" binary-common -binary-gtk-dev: control-files-stamp install-gtk-dev install-headers +binary-gtk-dev: control-files-stamp install-gtk-dev install-wxbase-dev install-headers $(MAKE) -f debian/rules \ - DH_OPTIONS="-p$(package_gtk_lib) -p$(package_gtk_dev) -p$(package_headers)" \ - binary-common + DH_OPTIONS="-p$(package_wxbase_dev) -p$(package_gtk_dev) $(DH_OPTIONS_GTK)" \ + binary-common -binary-gtk-dbg: control-files-stamp install-gtk-dbg install-headers - $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_headers)" binary-common +binary-gtk-dbg: control-files-stamp install-gtk-dbg install-wxbase-dbg install-headers + $(MAKE) -f debian/rules \ + DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_gtk_dbg) -p$(package_headers)" \ + binary-common # docs package @@ -761,10 +1052,13 @@ binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers .PHONY: build build_all build_arch \ clean clean-py purge-release-py purge-dbg-py \ binary-indep binary-arch binary binary-common \ - binary-gtk binary-gtk-dev binary-gtk-dbg binary-doc binary-cross \ + binary-gtk binary-gtk-dev binary-gtk-dbg \ + binary-wxbase binary-wxbase-dev binary-wxbase-dbg \ + binary-doc binary-cross binary-dbg-py \ install install_arch install-gtk-lib install-gtk-dev \ install-gtk-dbg \ - install-gtk-py install-gtk-py-lib install-gtk-dbg-py \ + install-gtk-py install-gtk-py-tools install-gtk-py-ver \ + install-gtk-py-lib install-gtk-dbg-py \ install-common install-headers install-i18n install-doc \ install-examples install-msw-dev install-msw-dbg install-headers-msw