AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for legacy 2.4 installs to wx-config.

Browse Source 
Add /utils/wxrc to the dist target and fix some things that still
think it is in contrib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee 2004-10-01 13:28:25 +00:00
parent 10c5f652b9
commit a13a7f891a
8 changed files with 127 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.in
View File

@ -21848,12 +21848,16 @@ UTILS_DIST: ALL_GUI_DIST
cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
mkdir $(DISTDIR)/utils/hhp2cached
cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached
cp $(UTILSDIR)/hhp2cached/Makefile.in $(DISTDIR)/utils/hhp2cached
cp $(UTILSDIR)/hhp2cached/*.cpp $(DISTDIR)/utils/hhp2cached
cp $(UTILSDIR)/hhp2cached/*.rc $(DISTDIR)/utils/hhp2cached
mkdir $(DISTDIR)/utils/HelpGen
mkdir $(DISTDIR)/utils/HelpGen/src
cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src
cp $(UTILSDIR)/HelpGen/src/Makefile.in $(DISTDIR)/utils/HelpGen/src
cp $(UTILSDIR)/HelpGen/src/*.h $(DISTDIR)/utils/HelpGen/src
cp $(UTILSDIR)/HelpGen/src/*.cpp $(DISTDIR)/utils/HelpGen/src
mkdir $(DISTDIR)/utils/helpview
mkdir $(DISTDIR)/utils/helpview/src
@ -21865,6 +21869,11 @@ UTILS_DIST: ALL_GUI_DIST
cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src
cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
mkdir $(DISTDIR)/utils/wxrc
cp $(UTILSDIR)/wxrc/Makefile.in $(DISTDIR)/utils/wxrc
cp $(UTILSDIR)/wxrc/*.cpp $(DISTDIR)/utils/wxrc
cp $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc
MISC_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/misc
mkdir $(DISTDIR)/misc/afm

9
autoconf_inc.m4
View File

@ -2,9 +2,6 @@ dnl This macro was generated by
dnl Bakefile 0.1.4 (http://bakefile.sourceforge.net)
dnl Do not modify, all changes will be overwritten!
dnl Conditions:
dnl ### begin block 00_header ###
dnl
dnl This macro was generated by
@ -650,6 +647,12 @@ dnl ### begin block 1_COND_USE_SOVERSOLARIS_1 ###
COND_USE_SOVERSOLARIS_1=""
fi
AC_SUBST(COND_USE_SOVERSOLARIS_1)
dnl ### begin block 1_COND_USE_XRC_1 ###
COND_USE_XRC_1="#"
if test "x$USE_XRC" = "x1" ; then
COND_USE_XRC_1=""
fi
AC_SUBST(COND_USE_XRC_1)
dnl ### begin block 1_COND_WITH_PLUGIN_SDL_1 ###
COND_WITH_PLUGIN_SDL_1="#"
if test "x$WITH_PLUGIN_SDL" = "x1" ; then

13
build/bakefiles/make_dist.mk
View File

@ -938,12 +938,16 @@ UTILS_DIST: ALL_GUI_DIST
cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
mkdir $(DISTDIR)/utils/hhp2cached
cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached
cp $(UTILSDIR)/hhp2cached/Makefile.in $(DISTDIR)/utils/hhp2cached
cp $(UTILSDIR)/hhp2cached/*.cpp $(DISTDIR)/utils/hhp2cached
cp $(UTILSDIR)/hhp2cached/*.rc $(DISTDIR)/utils/hhp2cached
mkdir $(DISTDIR)/utils/HelpGen
mkdir $(DISTDIR)/utils/HelpGen/src
cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src
cp $(UTILSDIR)/HelpGen/src/Makefile.in $(DISTDIR)/utils/HelpGen/src
cp $(UTILSDIR)/HelpGen/src/*.h $(DISTDIR)/utils/HelpGen/src
cp $(UTILSDIR)/HelpGen/src/*.cpp $(DISTDIR)/utils/HelpGen/src
mkdir $(DISTDIR)/utils/helpview
mkdir $(DISTDIR)/utils/helpview/src
@ -955,6 +959,11 @@ UTILS_DIST: ALL_GUI_DIST
cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src
cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
mkdir $(DISTDIR)/utils/wxrc
cp $(UTILSDIR)/wxrc/Makefile.in $(DISTDIR)/utils/wxrc
cp $(UTILSDIR)/wxrc/*.cpp $(DISTDIR)/utils/wxrc
cp $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc
MISC_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/misc
mkdir $(DISTDIR)/misc/afm

10
configure vendored
View File

File diff suppressed because one or more lines are too long

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
wxwidgets2.5 (2.5.2.9) experimental; urgency=low
wxwidgets2.5 (2.5.3.0) experimental; urgency=low
* Experimental prerelease.

2
debian/control.in vendored
View File

@ -69,7 +69,7 @@ Architecture: any
Section: libs
Depends: ${shlibs:Depends}
Conflicts: wx-common
Replaces: wx-common
Replaces: wx-common, wxwin2.4-headers
Provides: wx-common
Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
wxWidgets (formerly known as wxWindows) is a class library for C++ providing

4
debian/rules vendored
View File

@ -281,7 +281,7 @@ build-gtk-debug-stamp: configure-gtk-debug-stamp
build-gtk-shared-contrib-stamp: build-gtk-shared-stamp
dh_testdir
cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
cd $(objdir_gtk_shared)/contrib/utils/wxrc && $(FAST_MAKE)
cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE)
#cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
touch $@
@ -553,7 +553,7 @@ install-common: install-gtk-shared-stamp
dh_install $(objdir_gtk_install)/share/aclocal usr/share
dh_installman debian/wx-config.1
dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc usr/bin
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

99
wx-config.in
View File

@ -534,6 +534,48 @@ find_best_delegate()
}
# Legacy wx-config helpers.
# -------------------------
# get_legacy_mask
# Returns a mask in the format used by wx2.4.
get_legacy_mask()
{
[ $# -gt 0 ] || set m
eval [ "x\${$1_chartype}" != "xunicode" ] || _unicode_flag=u
eval [ "x\${$1_debugtype}" != "xdebug" ] || _debug_flag=d
eval echo "wx\${$1_toolkit}${_unicode_flag}${_debug_flag}-\${$1_version}\${$1_host}-config"
}
# find_legacy_configs
# Returns a list of configs installed by wx2.4 releases.
find_legacy_configs()
{
cd "$prefix/bin" 2> /dev/null && \
ls wx*-2.4-config | grep -v ^wxbase; \
ls wx*-2.4-config | grep ^wxbase
}
# find_best_legacy_config
# Returns the best legacy config for a given specification.
# This assumes no matching new style config has been found.
find_best_legacy_config()
{
_legacy_configs=$(find_legacy_configs)
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
echo "$d"
return
fi
done
fi
false
}
# The only action we can perform authoritatively prior to delegation
# is to list all the possible delegates.
# --------------------------------------------------------------
@ -552,10 +594,11 @@ if [ -n "$output_option_list" ]; then
_best_delegate=$(find_best_delegate)
if [ "x$WXDEBUG" = "xverbose" ]; then
echo " all = $_remains_in_prefix"
echo " matching = $_delegates"
echo " best = $_best_delegate"
echo " this = $this_config"
decho
decho " all = $_remains_in_prefix"
decho " matching = $_delegates"
decho " best = $_best_delegate"
decho " this = $this_config"
fi
for d in $_delegates; do
@ -587,7 +630,14 @@ if [ -n "$output_option_list" ]; then
elif [ -z "$_delegates" ]; then
cat <<-EOF
_last_chance=$(find_best_legacy_config)
if [ -n "$_last_chance" ]; then
echo " Specification matches legacy config: $_last_chance"
else
cat <<-EOF
No config found to match: $config_spec
in $wxconfdir
@ -597,6 +647,8 @@ if [ -n "$output_option_list" ]; then
EOF
fi
else
echo " Specification was ambiguous. Use additional feature options"
echo " to choose between alternate matches."
@ -619,6 +671,15 @@ if [ -n "$output_option_list" ]; then
done
fi
_legacy_configs=$(find_legacy_configs)
if [ -n "$_legacy_configs" ]; then
echo
echo " Legacy configs available in $prefix:"
for d in $_legacy_configs; do
echo " ${d%-config}"
done
fi
echo
exit
fi
@ -660,7 +721,22 @@ if ! user_mask_fits "$this_config" ; then
fi
if [ $_numdelegates -eq 0 ]; then
cat 1>&2 <<-EOF
_last_chance=$(find_best_legacy_config)
if [ -n "$_last_chance" ]; then
if [ -n "$WXDEBUG" ]; then
decho " found a suitable legacy delegate: $_last_chance"
decho "--> $prefix/bin/$_last_chance $*"
fi
export WXCONFIG_DELEGATED=yes
$prefix/bin/$_last_chance $*
exit
else
cat 1>&2 <<-EOF
Warning: No config found to match: $config_spec
in $wxconfdir
@ -672,12 +748,13 @@ if ! user_mask_fits "$this_config" ; then
EOF
# PIPEDREAM: This will probably give Vadim an aneurysm if I
# mention it out of context, but from here we are actually
# just a teensy step from simply building the missing config
# for the user on the fly if this is an in tree wx-config.
# PIPEDREAM: This will probably give Vadim an aneurysm if I
# mention it out of context, but from here we are actually
# just a teensy step from simply building the missing config
# for the user on the fly if this is an in tree wx-config.
exit 1
exit 1
fi
fi
if [ $_numdelegates -gt 1 ]; then