]> git.saurik.com Git - wxWidgets.git/blobdiff - debian/rules
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Unicode compilation fix
[wxWidgets.git] / debian / rules
diff --git a/debian/rules b/debian/rules
index 22015de76176cf166114b8d204e3296f91e38e86..18cc33a03063c49ceefa82e8e1f6017d836c994c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,9 @@ 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))
 
 soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/')
 sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
 
+pydir     := usr/lib/$(python_ver)/site-packages
+wxpydir   := $(pydir)/wx-$(release)-gtk2-unicode
+
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
 
@@ -67,7 +70,6 @@ package_headers_msw     = wx$(release)-headers-msw
 
 # Build directories:
 objdir_gtk_shared          = objs_gtk_sh
 
 # Build directories:
 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_doc_cruft           = objs_doc_con
 objdir_gtk_debug           = objs_gtk_d
 objdir_gtk_install         = objs_gtk_install
 objdir_doc_cruft           = objs_doc_con
@@ -80,8 +82,7 @@ objdir_msw_static          = objs_msw_st
 objdir_msw_dbg             = objs_msw_d
 objdir_msw_install         = objs_msw_install
 
 objdir_msw_dbg             = objs_msw_d
 objdir_msw_install         = objs_msw_install
 
-objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)   \
-         $(objdir_gtk_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)
          $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
          $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)     \
          $(objdir_msw_install)
@@ -93,7 +94,6 @@ objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)   \
 
 # Build stamps:
 build_arch_stamps = build-gtk-shared-stamp build-gtk-shared-contrib-stamp \
 
 # Build stamps:
 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
 
                     build-gtk-debug-stamp build-gtk-debug-contrib-stamp   \
                     build-i18n-stamp build-gtk-py-stamp
 
@@ -121,8 +121,8 @@ install_all_native = $(install_all_arch) $(install_all_indep)
 install_all = $(install_all_native) $(install_all_cross)
 
 
 install_all = $(install_all_native) $(install_all_cross)
 
 
-wxconfig     := $(shell pwd)/$(objdir_gtk_shared)/wx-config
-wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config
+wxconfig     := $(shell pwd)/$(objdir_gtk_shared)/wx-config --no_rpath
+wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config --no_rpath
 
 #contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
 
 
 #contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
 
@@ -150,7 +150,10 @@ control-files-stamp: debian/control
        done;
        @for f in docs postinst prerm; do                                    \
                echo "generating control file $(package_gtk_py_lib).$$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/=V/$(release)/g;s/=SOV/$(sorelease)/g' \
+               sed -e 's/=PY/$(python_ver)/g;                               \
+                       s|=WXPYDIR|$(wxpydir)|g;                             \
+                       s/=V/$(release)/g;                                   \
+                       s/=SOV/$(sorelease)/g'                               \
                        < debian/libwxgtk-python.$$f                         \
                        > debian/$(package_gtk_py_lib).$$f;                  \
        done;
                        < debian/libwxgtk-python.$$f                         \
                        > debian/$(package_gtk_py_lib).$$f;                  \
        done;
@@ -213,15 +216,13 @@ configure-gtk-shared-stamp:
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
-                               --enable-gtk2                           \
-                               --enable-unicode                        \
                                --with-opengl                           \
                                --with-opengl                           \
+                               --with-gnomeprint                       \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --with-libtiff=sys                      \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --with-libtiff=sys                      \
-                               --enable-dynamic-loader                 \
-                               --enable-std_iostreams
+                               --enable-unicode
        touch $@
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
        touch $@
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
@@ -229,30 +230,6 @@ build-gtk-shared-stamp: configure-gtk-shared-stamp
        cd $(objdir_gtk_shared) && $(FAST_MAKE)
        touch $@
 
        cd $(objdir_gtk_shared) && $(FAST_MAKE)
        touch $@
 
-configure-gtk-static-stamp:
-       dh_testdir
-       mkdir -p $(objdir_gtk_static)
-       cd $(objdir_gtk_static) \
-               && ../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 $@
-
-build-gtk-static-stamp: configure-gtk-static-stamp
-       dh_testdir
-       cd $(objdir_gtk_static) && $(FAST_MAKE)
-       touch $@
 
 configure-gtk-debug-stamp:
        dh_testdir
 
 configure-gtk-debug-stamp:
        dh_testdir
@@ -262,16 +239,14 @@ configure-gtk-debug-stamp:
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
-                               --enable-gtk2                           \
-                               --enable-unicode                        \
                                --with-opengl                           \
                                --with-opengl                           \
-                               --enable-debug                          \
+                               --with-gnomeprint                       \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --with-libtiff=sys                      \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --with-libtiff=sys                      \
-                               --enable-dynamic-loader                 \
-                               --enable-std_iostreams
+                               --enable-debug                          \
+                               --enable-unicode
        touch $@
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
        touch $@
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
@@ -284,13 +259,8 @@ 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)
        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 $@
 
        touch $@
 
-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
 
 build-gtk-debug-contrib-stamp: build-gtk-debug-stamp
        dh_testdir
@@ -490,7 +460,7 @@ install-gtk-lib: install-gtk-shared-stamp
        dh_install $(objdir_gtk_install)/lib/libwx_*.so.*       usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
        dh_install $(objdir_gtk_install)/lib/libwx_*.so.*       usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
-install-gtk-dev: build-gtk-static-stamp build-gtk-static-contrib-stamp install-gtk-shared-stamp
+install-gtk-dev: install-gtk-shared-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_testdir
        dh_testroot
        dh_clean -k
@@ -498,9 +468,6 @@ install-gtk-dev: build-gtk-static-stamp build-gtk-static-contrib-stamp install-g
        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_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
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
@@ -528,11 +495,10 @@ install-gtk-py-lib: build-gtk-py-stamp
                              UNICODE=1                                         \
                              FLAVOUR=$(DEBIAN_WXFLAVOUR)
 
                              UNICODE=1                                         \
                              FLAVOUR=$(DEBIAN_WXFLAVOUR)
 
-       find debian/$(package_gtk_py_lib)/usr/lib/$(python_ver)/site-packages   \
-               -name '*.py?' -exec rm '{}' ';'
+       find debian/$(package_gtk_py_lib)/$(pydir) -name '*.py?' -exec rm '{}' ';'
 
        # This is rather bogus, its included in the main copyright file now though.
 
        # This is rather bogus, its included in the main copyright file now though.
-       rm -f debian/$(package_gtk_py_lib)/usr/lib/$(python_ver)/site-packages/wx-$(sorelease)/wx/tools/XRCed/license.txt
+       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: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: install-gtk-py-lib
@@ -541,9 +507,9 @@ install-gtk-py: install-gtk-py-lib
        dh_clean -k
        dh_installdirs
 
        dh_clean -k
        dh_installdirs
 
-       dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) usr/bin           \
-               usr/lib/$(python_ver)/site-packages/wxversion.py                \
-               usr/lib/$(python_ver)/site-packages/wx.pth
+       dh_movefiles --sourcedir=debian/$(package_gtk_py_lib)                   \
+               usr/bin                                                         \
+               $(pydir)/{wxversion.py,wx.pth}
        rm -r debian/$(package_gtk_py_lib)/usr/bin
 
        dh_installman debian/wxPython-tools.1
        rm -r debian/$(package_gtk_py_lib)/usr/bin
 
        dh_installman debian/wxPython-tools.1
@@ -556,7 +522,8 @@ install-gtk-py: install-gtk-py-lib
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
+               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
 
 
 install-common: DH_OPTIONS=-p$(package_common)
 
 
 install-common: DH_OPTIONS=-p$(package_common)
@@ -566,18 +533,12 @@ install-common: install-gtk-shared-stamp
        dh_clean -k
        dh_installdirs
 
        dh_clean -k
        dh_installdirs
 
-#      We don't need the afm metrics for gtk2, but we might need them to support
-#      the 2.4 release for a while still and any other ports we might build.
-       dh_install $(objdir_gtk_install)/share/wx       usr/share
        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_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_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
        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)
 
 
 install-headers: DH_OPTIONS=-p$(package_headers)
@@ -633,15 +594,11 @@ install-gtk-dbg-py: build-gtk-dbg-py-stamp
                              UNICODE=1                                         \
                              FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
 
                              UNICODE=1                                         \
                              FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
 
-       find debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages   \
-               -name '*.py?' -exec rm '{}' ';'
-
-       rm -rf usr/bin                                                          \
-              usr/lib/$(python_ver)/site-packages/wxversion.py                 \
-              usr/lib/$(python_ver)/site-packages/wx.pth
+       find debian/$(package_gtk_dbg_py)/$(pydir) -name '*.py?' -exec rm '{}' ';'
+       rm -rf usr/bin $(pydir)/{wxversion.py,wx.pth}
 
        # This is rather bogus, its included in the main copyright file now though.
 
        # This is rather bogus, its included in the main copyright file now though.
-       rm -f debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages/wx-$(sorelease)/wx/tools/XRCed/license.txt
+       rm -f debian/$(package_gtk_dbg_py)/$(wxpydir)/wx/tools/XRCed/license.txt
 
 
 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
 
 
 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
wxWidgets (Impactor)