X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1687ed8ad23506f7c36a5e2ad2afa7eb4f112e2..0ecfbbea128f8e0e1039cbde373e7d976a06a2ec:/debian/rules diff --git a/debian/rules b/debian/rules index 99d207dcf7..cfe426fe8a 100755 --- a/debian/rules +++ b/debian/rules @@ -55,6 +55,7 @@ objdir_examples=docs/examples objdir_i18n=locale objdir_gtk_univ=objs_gtk_univ +objdir_univ_install=objs_univ_install objdir_wxbase_msw_shared=objs_wxbase_msw_sh objdir_wxbase_msw_static=objs_wxbase_msw_st @@ -65,7 +66,7 @@ objdir_msw_dbg=objs_msw_d objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \ $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) $(objdir_gtk_univ) \ - $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \ + $(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \ $(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static) $(objdir_wxbase_msw_dbg) \ $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg) @@ -77,10 +78,12 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \ build-wxbase-debug-stamp build-gtk-shared-stamp \ build-gtk-static-stamp build-gtk-debug-stamp \ - build-gtk-univ-stamp \ build-contrib-shared-stamp build-contrib-static-stamp \ build-gtk-py-stamp build-i18n-stamp +# disable gtk-univ build, we'll replace it with x11-univ later. +# build-gtk-univ-stamp + build_indep_stamps=build-examples-stamp build-doc-stamp build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \ @@ -94,10 +97,12 @@ build_stamps=$(build_stamps_native) $(build_cross_stamps) # Install targets: install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ install-gtk-lib install-gtk-dev install-gtk-dbg \ - install-gtk-univ \ install-gtk-contrib install-gtk-contrib-dev install-gtk-py \ install-headers install-i18n +# disable gtk-univ build, we'll replace it with x11-univ later. +# install-gtk-univ + install_all_indep=install-examples install-doc install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw @@ -271,6 +276,7 @@ build-gtk-shared-stamp: --with-libjpeg=sys \ --with-libpng=sys \ --with-libtiff=sys \ + --enable-dynamic-loader \ && $(MAKE) touch $@ @@ -287,6 +293,7 @@ build-gtk-static-stamp: --with-libjpeg=sys \ --with-libpng=sys \ --with-libtiff=sys \ + --enable-dynamic-loader \ && $(MAKE) touch $@ @@ -304,6 +311,7 @@ build-gtk-debug-stamp: --with-libjpeg=sys \ --with-libpng=sys \ --with-libtiff=sys \ + --enable-dynamic-loader \ && $(MAKE) touch $@ @@ -321,6 +329,7 @@ build-gtk-univ-stamp: --with-libjpeg=sys \ --with-libpng=sys \ --with-libtiff=sys \ + --enable-dynamic-loader \ && $(MAKE) touch $@ @@ -479,14 +488,18 @@ clean: debian/control rm -f $(objdir_i18n)/*.mo cd wxPython \ - && ./setup.py clean \ && rm -rf licence \ && rm -rf build \ + && rm -rf contrib/gizmos/contrib \ && rm -rf contrib/ogl/contrib \ && rm -rf contrib/stc/contrib \ && rm -rf contrib/xrc/contrib \ && rm -rf *.pyc +# We do the equivalent of this above by removing build, unfortunately +# its not enough by itself to get the tree properly clean again. +# && ./setup.py clean + dh_clean rm -f debian/$(package_wxbase_lib).* rm -f debian/$(package_wxbase_dev).* @@ -557,7 +570,8 @@ install-gtk-dev: build-gtk-static-stamp install-gtk-lib dh_clean -k dh_installdirs dh_movefiles --sourcedir=debian/$(package_gtk_lib) - cp $(objdir_gtk_static)/lib/libwx_gtk*.a debian/$(package_gtk_dev)/usr/lib + cp $(objdir_gtk_static)/lib/libwx_gtk-*.a debian/$(package_gtk_dev)/usr/lib + cp $(objdir_gtk_static)/lib/libwx_gtk_gl-*.a debian/$(package_gtk_dev)/usr/lib install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg) install-gtk-dbg: build-gtk-debug-stamp @@ -596,7 +610,8 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev dh_installdirs dh_movefiles --sourcedir=debian/$(package_gtk_contrib) cp $(objdir_gtk_static)/lib/*.a debian/$(package_gtk_contrib_dev)/usr/lib - rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk*.a + rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk-*.a + rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk_gl-*.a install-gtk-py: DH_OPTIONS=-p$(package_gtk_py) install-gtk-py: build-gtk-py-stamp @@ -605,24 +620,39 @@ install-gtk-py: build-gtk-py-stamp dh_clean -k dh_installdirs cd wxPython \ - && ./setup.py install --prefix=`pwd`/../debian/$(package_gtk_py)/usr + && ./setup.py install \ + --prefix=`pwd`/../debian/$(package_gtk_py)/usr \ + WX_CONFIG='$(wxconfig)' find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \ -name '*.py?' -exec rm '{}' ';' + dh_installman debian/wxPython-tools.1 + dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 + install-headers: DH_OPTIONS=-p$(package_headers) install-headers: install-gtk-lib 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 +# they win in the result of any uncaught conflict. + +# cd $(objdir_gtk_univ) \ +# && $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr + +# dh_movefiles --sourcedir=$(objdir_univ_install) dh_movefiles --sourcedir=debian/$(package_gtk_lib) - dh_installmanpages \ - ansi2knr.1 \ - jpegtran.1 \ - libpng.3 \ - libpngpf.3 \ - zlib.3 \ - png.5 + + dh_installman debian/wx-config.1 install-i18n: DH_OPTIONS=-p$(package_i18n) install-i18n: build-i18n-stamp install-gtk-lib @@ -715,6 +745,7 @@ binary-common: dh_installdocs dh_installchangelogs dh_installexamples + dh_installmenu dh_link @# Don't strip debug libs at all, and strip cross libs elsewhere @@ -737,13 +768,13 @@ 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_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \ + DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \ binary-common # Build just the architecture-dependent files here. binary-arch: build_arch install_arch $(MAKE) -f debian/rules \ - DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \ + DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \ binary-common # Build all packages target. @@ -799,6 +830,9 @@ binary-univ: control-files-stamp install-gtk-univ binary-doc: control-files-stamp install-doc $(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common +binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers install-headers-msw + $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_msw_dev) -p$(package_headers) -p$(package_headers_msw)" binary-common + .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 \