Added static lib to shared build targets for wxMSW builds.

Added -dbg packages for msw-cross.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee 2001-11-03 13:00:52 +00:00
parent d685354062
commit 4fb788e466
14 changed files with 178 additions and 26 deletions

6
configure vendored
View File

@ -11907,11 +11907,11 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="preinstall_gl"
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
else
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
fi
PIC_FLAG=
PIC_FLAG=
;;
*-pc-os2_emx | *-pc-os2-emx )

View File

@ -2513,12 +2513,13 @@ if test "$wxUSE_SHARED" = "yes"; then
dnl install shared libs without symlinks
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="preinstall_gl"
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
else
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
fi
dnl -fPIC is not required for mingw build -- all code is already
dnl position independent
dnl position independent. Because of this we can (and do) build
dnl a static lib from the same object files as the dll.
PIC_FLAG=
;;

23
debian/README.Debian vendored
View File

@ -24,5 +24,28 @@ wxwin-examples wxWindows and wxPython demos and samples (source)
wxwin-i18n message catalogs for native language support
The following three can be built from the source package
with the mingw32 cross compiler, but are not currently
distributed by Debian. If you feel that should change,
please file a bug against the wxwindows2.2 package, or
append your views to a report already there if you're not
the first to do so.
[ you can check the current state of affairs at:
http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.2 ]
Oh and, please do *not* file bug reports for these packages
to the Debian bts. But do feel free to email be personally
if you find problems and/or have patches to fix them.
libwxmsw-dev mingw32-cross wxMSW libs.
libwxmsw-dbg mingw32-cross wxMSW (debug) libs.
libwxbase-msw-dev mingw32-cross wxBase libs.
libwxbase-msw-dbg mingw32-cross wxBase (debug) libs.
wxwin-headers-msw extra headers needed for wxMSW.
libwxgtk-univ wxUniversal for Gtk.
-- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030

13
debian/changelog vendored
View File

@ -1,6 +1,8 @@
wxwindows2.3 (2.3.2) unstable; urgency=low
* Major Overhaul. First serious release contender.
* Added .dll's to msw-cross packages.
* Added -dbg versions of the cross packages.
-- Ron Lee <ron@debian.org> Thu, 27 Sep 2001 05:55:07 -0700
@ -17,21 +19,26 @@ wxwindows2.3 (2.3.0) unstable; urgency=low
-- Ron Lee <ron@debian.org> Sat, 27 Jan 2001 01:51:24 -0800
wxwindows2.2 (2.2.8) unstable; urgency=low
wxwindows2.2 (2.2.8) unstable; urgency=medium
* 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 ;)
see README.Debian
* 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.
* added wx2.4 forward compatible event macros.
* added build fixes for IA64 from Jeff Licquia, and fixed clean
rules to pick up unnoticed strays that effected NMU builds.
Thanks Jeff. Closes: #101734, #104679 (fixed in NMU)
* Medium urgency since several other packages are waiting
for this to get into testing.
-- Ron Lee <ron@debian.org> Thu, 30 Aug 2001 15:41:49 -0700

22
debian/control.in vendored
View File

@ -227,6 +227,17 @@ Provides: libwxbase-msw-dev
Description: wxBase mingw32msvc-cross
mingw32msvc-cross wxBase libs.
Package: libwxbase-msw=V-dbg
Architecture: i386
Section: otherosfs
Depends: wxwin=V-headers-msw (= ${Source-Version})
Conflicts: libwxbase-msw-dbg
Replaces: libwxbase-msw-dbg
Provides: libwxbase-msw-dbg
Description: wxBase mingw32msvc-cross (debug)
mingw32msvc-cross wxBase libs.
__WXDEBUG__ version.
Package: libwxmsw=V-dev
Architecture: i386
Section: otherosfs
@ -237,6 +248,17 @@ Provides: libwxmsw-dev
Description: wxMSW mingw32msvc-cross
mingw32msvc-cross wxMSW libs.
Package: libwxmsw=V-dbg
Architecture: i386
Section: otherosfs
Depends: wxwin=V-headers-msw (= ${Source-Version})
Conflicts: libwxmsw-dbg
Replaces: libwxmsw-dbg
Provides: libwxmsw-dbg
Description: wxMSW mingw32msvc-cross (debug)
mingw32msvc-cross wxMSW libs.
__WXDEBUG__ version.
Package: wxwin=V-headers-msw
Architecture: i386
Section: otherosfs

4
debian/libwxbase-msw-dbg.dirs vendored Normal file
View File

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

2
debian/libwxbase-msw-dbg.links vendored Normal file
View File

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

7
debian/libwxbase-msw-dbg.postinst vendored Normal file
View File

@ -0,0 +1,7 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-=H-config 40
#DEBHELPER#

7
debian/libwxbase-msw-dbg.prerm vendored Normal file
View File

@ -0,0 +1,7 @@
#! /bin/sh
set -e
update-alternatives --remove wx-config /usr/bin/wxbased-=V-=H-config
#DEBHELPER#

4
debian/libwxmsw-dbg.dirs vendored Normal file
View File

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

2
debian/libwxmsw-dbg.links vendored Normal file
View File

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

7
debian/libwxmsw-dbg.postinst vendored Normal file
View File

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

7
debian/libwxmsw-dbg.prerm vendored Normal file
View File

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

93
debian/rules vendored
View File

@ -34,7 +34,9 @@ package_examples=wxwin$(release)-examples
package_gtk_univ=libwxgtk$(release)-univ
package_wxbase_msw_dev=libwxbase-msw$(release)-dev
package_wxbase_msw_dbg=libwxbase-msw$(release)-dbg
package_msw_dev=libwxmsw$(release)-dev
package_msw_dbg=libwxmsw$(release)-dbg
package_headers_msw=wxwin$(release)-headers-msw
# Build directories:
@ -51,13 +53,15 @@ objdir_i18n=locale
objdir_gtk_univ=objs_gtk_univ
objdir_wxbase_msw_static=objs_wxbase_msw_st
objdir_msw_static=objs_msw_st
objdir_wxbase_msw_dev=objs_wxbase_msw_dev
objdir_wxbase_msw_dev=objs_wxbase_msw_dbg
objdir_msw_dev=objs_msw_dev
objdir_msw_dev=objs_msw_dbg
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_wxbase_msw_static) $(objdir_msw_static)
$(objdir_wxbase_msw_dev) $(objdir_wxbase_msw_dbg) $(objdir_msw_dev) $(objdir_msw_dbg)
# note that the i18n package is actually arch indep (once built)
# but must be built (and installed) during the arch any phase as
@ -73,7 +77,7 @@ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
build_indep_stamps=build-examples-stamp build-doc-stamp
build_cross_stamps=build-wxbase-msw-dev-stamp build-msw-dev-stamp
build_cross_stamps=build-wxbase-msw-dev-stamp build-wxbase-msw-dbg-stamp build-msw-dev-stamp build-msw-dbg-stamp
build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
@ -88,7 +92,7 @@ install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
install_all_indep=install-examples install-doc
install_all_cross=install-wxbase-msw-dev install-msw-dev install-headers-msw
install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
install_all_native=$(install_all_arch) $(install_all_indep)
@ -175,11 +179,21 @@ control-files-stamp: debian/control
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_wxbase_msw_dbg).$$f"; \
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dbg.$$f \
> debian/$(package_wxbase_msw_dbg).$$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 links postinst prerm; do \
echo "generating control file $(package_msw_dbg).$$f"; \
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dbg.$$f \
> debian/$(package_msw_dbg).$$f; \
done;
@for f in dirs; do \
echo "generating control file $(package_headers_msw).$$f"; \
sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
@ -374,27 +388,49 @@ build-i18n-stamp: build-gtk-shared-stamp
build-wxbase-msw-dev-stamp:
dh_testdir
mkdir -p $(objdir_wxbase_msw_static)
cd $(objdir_wxbase_msw_static) \
mkdir -p $(objdir_wxbase_msw_dev)
cd $(objdir_wxbase_msw_dev) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=../config_deb.cache \
--host=$(cross_host) \
--build=$(cross_build) \
--disable-gui \
--disable-shared \
&& $(MAKE)
touch $@
build-wxbase-msw-dbg-stamp:
dh_testdir
mkdir -p $(objdir_wxbase_msw_dbg)
cd $(objdir_wxbase_msw_dbg) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=../config_deb.cache \
--host=$(cross_host) \
--build=$(cross_build) \
--disable-gui \
--enable-debug \
&& $(MAKE)
touch $@
build-msw-dev-stamp:
dh_testdir
mkdir -p $(objdir_msw_static)
cd $(objdir_msw_static) \
mkdir -p $(objdir_msw_dev)
cd $(objdir_msw_dev) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=../config_deb.cache \
--host=$(cross_host) \
--build=$(cross_build) \
--with-mingw \
--disable-shared \
&& $(MAKE)
touch $@
build-msw-dbg-stamp:
dh_testdir
mkdir -p $(objdir_msw_dbg)
cd $(objdir_msw_dbg) \
&& ../configure --prefix=/usr/$(cross_host) \
--cache-file=../config_deb.cache \
--host=$(cross_host) \
--build=$(cross_build) \
--enable-debug \
&& $(MAKE)
touch $@
@ -433,7 +469,9 @@ clean: debian/control
rm -f debian/$(package_doc).*
rm -f debian/$(package_examples).*
rm -f debian/$(package_wxbase_msw_dev).*
rm -f debian/$(package_wxbase_msw_dbg).*
rm -f debian/$(package_msw_dev).*
rm -f debian/$(package_msw_dbg).*
rm -f debian/$(package_headers_msw).*
install_arch: build_arch $(install_all_arch)
@ -579,20 +617,40 @@ install-wxbase-msw-dev: build-wxbase-msw-dev-stamp
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/
cp -a $(objdir_wxbase_msw_dev)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
cp $(objdir_wxbase_msw_dev)/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-wxbase-msw-dbg: DH_OPTIONS=-p$(package_wxbase_msw_dbg)
install-wxbase-msw-dbg: build-wxbase-msw-dbg-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
cp -a $(objdir_wxbase_msw_dbg)/lib/* debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib
cp $(objdir_wxbase_msw_dbg)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dbg)/usr/bin/
$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dbg)/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/
cp -a $(objdir_msw_dev)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
cp $(objdir_msw_dev)/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-msw-dbg: DH_OPTIONS=-p$(package_msw_dbg)
install-msw-dbg: build-msw-dbg-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
cp -a $(objdir_msw_dbg)/lib/* debian/$(package_msw_dbg)/usr/$(cross_host)/lib
cp $(objdir_msw_dbg)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dbg)/usr/bin/
$(cross_host)-strip --strip-debug debian/$(package_msw_dbg)/usr/$(cross_host)/lib/*.a
install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
install-headers-msw:
dh_testdir
@ -708,5 +766,6 @@ binary-doc: control-files-stamp install-doc
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-wxbase-msw-dev install-msw-dev install-headers-msw
install-wxbase-msw-dev install-msw-dev install-headers-msw \
install-wxbase-msw-dbg install-msw-dbg