Add extra^2 debug mode to wx-config for brute force one pass debugging
of new platforms. Import $EGREP from configure, posix `grep -E` is not endemic yet. Clean up debian/rules for removed afm files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
parent
cb4b09661b
commit
8ec45325ea
17
debian/changelog
vendored
17
debian/changelog
vendored
@ -1,3 +1,20 @@
|
||||
wxwidgets2.5 (2.5.4.0) unstable; urgency=low
|
||||
|
||||
* Experimental snapshot.
|
||||
* More bakefile bogosity manually patched. Closes: #294998
|
||||
* Fix stray conflicts with 2.4. Closes: #287623
|
||||
* Fixes lack of version checking in wxPython examples.
|
||||
Closes: #287772
|
||||
* Fixes FTBFS on ppc. Closes: #285186
|
||||
|
||||
-- Ron Lee <ron@debian.org> Sun, 13 Feb 2005 16:52:38 +1030
|
||||
|
||||
wxwidgets2.5 (2.5.3.3) unstable; urgency=low
|
||||
|
||||
* Experimental snapshot.
|
||||
|
||||
-- Ron Lee <ron@debian.org> Tue, 8 Feb 2005 12:30:45 +1030
|
||||
|
||||
wxwidgets2.5 (2.5.3.2) unstable; urgency=low
|
||||
|
||||
* This time, really now.
|
||||
|
||||
3
debian/rules
vendored
3
debian/rules
vendored
@ -569,9 +569,6 @@ install-common: install-gtk-shared-stamp
|
||||
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
|
||||
|
||||
|
||||
173
samples/tab/Makefile.in
Normal file
173
samples/tab/Makefile.in
Normal file
@ -0,0 +1,173 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
||||
@MAKE_SET@
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
INSTALL = @INSTALL@
|
||||
EXEEXT = @EXEEXT@
|
||||
RESCOMP = @RESCOMP@
|
||||
SETFILE = @SETFILE@
|
||||
NM = @NM@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
top_builddir = @top_builddir@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
|
||||
TOOLKIT = @TOOLKIT@
|
||||
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
||||
TOOLKIT_VERSION = @TOOLKIT_VERSION@
|
||||
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.5
|
||||
WX_VERSION = $(WX_RELEASE).4
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
TAB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
|
||||
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
TAB_OBJECTS = \
|
||||
$(__tab_os2_lib_res) \
|
||||
tab_tab.o \
|
||||
$(__tab___win32rc)
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
|
||||
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
||||
@COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
|
||||
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
|
||||
COND_PLATFORM_OS2_1___tab___os2_emxbindcmd = $(NM) tab$(EXEEXT) | if grep -q \
|
||||
pmwin.763 ; then emxbind -ep tab$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__tab___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___tab___os2_emxbindcmd)
|
||||
@COND_PLATFORM_OS2_1@__tab_os2_lib_res = \
|
||||
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
||||
@COND_PLATFORM_MACOSX_1@__tab_bundle___depname = tab_bundle
|
||||
@COND_TOOLKIT_COCOA@____tab_BUNDLE_TGT_REF_DEP = tab.app/Contents/PkgInfo
|
||||
@COND_TOOLKIT_MAC@____tab_BUNDLE_TGT_REF_DEP = tab.app/Contents/PkgInfo
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
COND_MONOLITHIC_0___WXLIB_BASE_p = \
|
||||
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
|
||||
@COND_PLATFORM_WIN32_1@__tab___win32rc = tab_tab_rc.o
|
||||
COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
|
||||
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
|
||||
@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
|
||||
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
|
||||
$(srcdir)/../../samples -i $(top_srcdir)/include -o tab$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: tab$(EXEEXT) $(__tab_bundle___depname)
|
||||
|
||||
install: all
|
||||
|
||||
uninstall:
|
||||
|
||||
install-strip: install
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f tab$(EXEEXT)
|
||||
rm -rf tab.app
|
||||
|
||||
distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc)
|
||||
$(CXX) -o $@ $(TAB_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
|
||||
$(__tab___mac_rezcmd)
|
||||
$(__tab___mac_setfilecmd)
|
||||
$(__tab___os2_emxbindcmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
mkdir -p tab.app/Contents
|
||||
mkdir -p tab.app/Contents/MacOS
|
||||
mkdir -p tab.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/tab/" \
|
||||
-e "s/VERSION/$(WX_VERSION)/" \
|
||||
$(top_srcdir)/src/mac/carbon/Info.plist.in >tab.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >tab.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f tab$(EXEEXT) tab.app/Contents/MacOS/tab
|
||||
|
||||
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc tab.app/Contents/Resources/tab.rsrc
|
||||
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns tab.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@tab_bundle: $(____tab_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
tab_tab.o: $(srcdir)/tab.cpp
|
||||
$(CXXC) -c -o $@ $(TAB_CXXFLAGS) $(srcdir)/tab.cpp
|
||||
|
||||
tab_tab_rc.o: $(srcdir)/tab.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all install uninstall clean distclean tab_bundle
|
||||
12
wx-config.in
12
wx-config.in
@ -17,6 +17,9 @@
|
||||
# Licence: wxWindows licence
|
||||
############################################################################
|
||||
|
||||
# Extra^2 debug mode, for if things ever get really wierd.
|
||||
[ -z "$WXDEBUG_X" ] || set -x
|
||||
|
||||
# We expect a posix shell, so if this is a Bourne shell,
|
||||
# and apparently a few still exist, try for bash or ksh.
|
||||
|
||||
@ -91,6 +94,9 @@ EOF
|
||||
[ $# -gt 0 ] || usage 1
|
||||
|
||||
|
||||
# Contentious tools determined by configure.
|
||||
EGREP="@EGREP@"
|
||||
|
||||
|
||||
# For the people who know what they want, or think they do:
|
||||
# Divide the valid arguments into functional groups for later examination,
|
||||
@ -450,11 +456,11 @@ fi
|
||||
# find_eligible_delegates _mask
|
||||
# Outputs all the config files installed which match the
|
||||
# (extended regex) _mask passed as an argument.
|
||||
find_eligible_delegates() { echo "$installed_configs" | grep -E "$1" 2> /dev/null; }
|
||||
find_eligible_delegates() { echo "$installed_configs" | $EGREP "$1" 2> /dev/null; }
|
||||
|
||||
# user_mask_fits _config
|
||||
# Returns true if the string _config satisfies the user specified mask.
|
||||
user_mask_fits() { echo "$1" | grep -E "$configmask" > /dev/null 2>&1; }
|
||||
user_mask_fits() { echo "$1" | $EGREP "$configmask" > /dev/null 2>&1; }
|
||||
|
||||
# count_fields _word
|
||||
# Returns the number of IFS split fields in _word
|
||||
@ -600,7 +606,7 @@ find_best_legacy_config()
|
||||
if [ -n "$_legacy_configs" ]; then
|
||||
_legacy_mask=$(get_legacy_mask)
|
||||
for d in $_legacy_configs; do
|
||||
if echo $d | grep -E $_legacy_mask > /dev/null 2>&1 ; then
|
||||
if echo $d | $EGREP $_legacy_mask > /dev/null 2>&1 ; then
|
||||
echo "$d"
|
||||
return
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user