X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5636172bce061bb9d370cfa08aefbbc3fd8f4192..18a82b9cd35b9c91ff381b6b34922788a8d9b897:/wx-config.in diff --git a/wx-config.in b/wx-config.in index 889e418857..8f0d03d715 100755 --- a/wx-config.in +++ b/wx-config.in @@ -28,8 +28,14 @@ decho() { echo "$*" 1>&2; } # usage _exitcode # Outputs a usage message to stderr and exits with _exitcode. -# Try to keep this to a single page. We can add alternate help -# targets if people want more detail from interactive help. +# Try to keep this to a single page (ie. < 25 lines). We can add +# alternate or interactive help targets if people want more detail. +# +# Exit codes are now subject to a more strict interpretation. +# wx-config should return 0 upon successful operation, 1 if the +# reqested operation could not be completed successfully, and 2 +# if the requested operation is not supported by this version of +# wx-config. usage() { cat 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; } - - -# Next chance for another satisfied customer then -# -# If we want to get really polished here we can do plural checking, -# but we should probably leave that until the day we gettextise it. -# If we have cpu cycles to spare for glitz, we could run the -# find_best_delegate function over the list and mark the one that -# would be used by default if no further disambiguation was to occur. -# FIXME: This is probably useful to do in any case, but lets not -# tangle them up until things settle down again. -if [ -n "$output_option_list" ]; then - - _delegates="$(find_eligible_delegates $configmask)" - - if user_mask_fits "$this_config" ; then - - echo - echo " This config ($this_config) will be used for output." - - if match_field "$this_config" $_delegates ; then - _delegates=$(remove_field $this_config $_delegates) - else - echo " though it is not installed in:" - echo " $wxconfdir" - fi - - if [ -n "$_delegates" ]; then - echo - echo " You can select from the following alternates by explicitly" - echo " specifying additional features to wx-config:" - fi - - elif [ -z "$_delegates" ]; then - - cat <<-EOF - - No config found to match: - $configmask - in $wxconfdir - - This config is: $this_config - - Please install the desired library build, or use --list - without any feature specifiers to see the available configs - for this host. wx-config --list --host=?.* will list all - installed configs including cross builds for other hosts. - - EOF - exit 1 - - else - echo - echo " The following installed configurations match your specification:" - fi - - echo - for i in $_delegates; do echo " $i"; done - [ -z "$_delegates" ] || echo - - exit -fi - - - - - -# From here, we now need to figure out a delegation target. -# -------------------------------------------------------------- +# From here on, we'll need to be able to figure out a delegation target. +# ----------------------------------------------------------------------- # The rules for delegation are: # @@ -492,6 +426,15 @@ fi # But first, more sugar to keep what follows clear and legible. # -------------------------------------------------------------- +# 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; } + +# 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; } + # count_fields _word # Returns the number of IFS split fields in _word count_fields() { return $#; } @@ -601,11 +544,162 @@ 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 2> /dev/null | grep -v ^wxbase; \ + ls wx*-2.4-config 2> /dev/null | 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. +# -------------------------------------------------------------- + +config_spec="$0 $*" +[ -z "$WXDEBUG" ] || config_spec=$configmask + +# Next chance for another satisfied customer then +# +# If we want to get really polished here we can do plural checking, +# but we should probably leave that until the day we gettextise it. +if [ -n "$output_option_list" ]; then + + _remains_in_prefix=$installed_configs + _delegates=$(find_eligible_delegates $configmask) + _best_delegate=$(find_best_delegate) + + if [ "x$WXDEBUG" = "xverbose" ]; then + decho + decho " all = $_remains_in_prefix" + decho " matching = $_delegates" + decho " best = $_best_delegate" + decho " this = $this_config" + fi + + for d in $_delegates; do + _remains_in_prefix=$(remove_field $d $_remains_in_prefix) + done + + echo + echo " Default config is $this_config" + echo + + if user_mask_fits "$this_config" ; then + + echo " Default config ${this_exec_prefix+in $this_exec_prefix }will be used for output" + + if match_field "$this_config" $_delegates ; then + _delegates=$(remove_field $this_config $_delegates) + else + echo " though it is not installed in: $prefix" + if [ -n "$_best_delegate" ] && [ "x$_best_delegate" != "x$this_config" ]; then + echo + echo " Best alternate in $prefix:" + echo " $_best_delegate" + fi + fi + + elif [ -n "$_best_delegate" ]; then + + echo " Specification best match: $_best_delegate" + + elif [ -z "$_delegates" ]; then + + _last_chance=$(find_best_legacy_config) + if [ -n "$_last_chance" ]; then -# And finally some cereal to sprinkle it all on. + echo " Specification matches legacy config: $_last_chance" + + else + + cat <<-EOF + No config found to match: $config_spec + in $wxconfdir + + Please install the desired library build, or specify a different + prefix where it may be found. If the library is not installed + you may call its wx-config directly by specifying its full path. + + EOF + + fi + + else + echo " Specification was ambiguous. Use additional feature options" + echo " to choose between alternate matches." + fi + + _delegates=$(remove_field "$_best_delegate" $_delegates) + + if [ -n "$_delegates" ]; then + echo + echo " Alternate matches:" + for d in $_delegates; do + echo " $d" + done + fi + if [ -n "$_remains_in_prefix" ]; then + echo + echo " Also available in $prefix:" + for d in $_remains_in_prefix; do + echo " $d" + 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 + + + +# ... so if that wasn't what they wanted, then we need to know for +# certain, can this config satisfy the user specification? # -------------------------------------------------------------- -# No more messing around, can this config satisfy the user specification? if ! user_mask_fits "$this_config" ; then # No? Then lets see if it knows anybody who can. @@ -619,7 +713,7 @@ if ! user_mask_fits "$this_config" ; then decho decho " to: $0" decho " ($this_config) cannot satisfy:" - decho " $configmask" + decho " $config_spec" decho " Someone has been terribly careless." decho exit 1 @@ -637,21 +731,57 @@ if ! user_mask_fits "$this_config" ; then fi if [ $_numdelegates -eq 0 ]; then - cat 1>&2 <<-EOF - No config found to match: $configmask - in $wxconfdir - Please install the desired library build, or use --list - without any feature specifiers to see all available configs. + _last_chance=$(find_best_legacy_config) + if [ -n "$_last_chance" ]; then + + for arg; do + case "$arg" in + --prefix*|--exec-prefix*| \ + --version|--release|--basename| \ + --static|--libs|--gl_libs| \ + --cppflags|--cflags|--cxxflags| \ + --cc|--cxx|--ld| \ + --rezflags|--inplace) + _legacy_args="$_legacy_args $arg" + ;; + + --static|--static=y*|--static=Y*) + _legacy_args="$_legacy_args --static" + ;; + esac + done + + if [ -n "$WXDEBUG" ]; then + decho " found a suitable legacy delegate: $_last_chance" + decho "--> $prefix/bin/$_last_chance $_legacy_args" + fi + + export WXCONFIG_DELEGATED=yes + $prefix/bin/$_last_chance $_legacy_args + exit + + else + + cat 1>&2 <<-EOF + + Warning: No config found to match: $config_spec + in $wxconfdir + If you require this configuration, please install the desired + library build. If this is part of an automated configuration + test and no other errors occur, you may safely ignore it. + You may use wx-config --list to see all configs available in + the default prefix. 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 @@ -673,7 +803,8 @@ if ! user_mask_fits "$this_config" ; then fi decho - decho " Specification was ambiguous." + decho " *** Error: Specification is ambiguous" + decho " as $config_spec" decho " Use additional feature options to choose between:" for i in $(find_eligible_delegates "$configmask"); do decho " $i" @@ -695,22 +826,18 @@ fi - - # If we are still here, then from now on we are responsible for # all the user's needs. Time to rustle up some output for them. # -------------------------------------------------------------- [ -z "$WXDEBUG" ] || decho " using this config" -if [ -n "$flag_option_inplace" ]; then - # If the user supplied a prefix, then the in tree config did not - # delegate out to anything in the user supplied prefix so reset - # the prefixes back to provide the correct compile options for - # this uninstalled wx build. - prefix=$this_prefix - exec_prefix=$this_exec_prefix -fi +# If the user supplied a prefix, and the in tree config did not +# delegate out to anything in that prefix, then reset the build +# tree prefix to provide the correct output for using this +# uninstalled wx build. Or put more simply: +prefix=${this_prefix-$prefix} +exec_prefix=${this_exec_prefix-$exec_prefix} includedir="@includedir@" libdir="@libdir@" @@ -722,10 +849,11 @@ libdir="@libdir@" [ -z "$output_option_version" ] || echo "@WX_VERSION@" [ -z "$output_option_version_full" ] || echo "@WX_SUBVERSION@" [ -z "$output_option_basename" ] || echo "@WX_LIBRARY_BASENAME_GUI@" -[ -z "$output_option_rezflags" ] || echo $(eval echo @MACRESWXCONFIG@) +[ -z "$output_option_rezflags" ] || echo $(eval echo "@MACRESWXCONFIG@") [ -z "$output_option_cc" ] || echo "@CC@" [ -z "$output_option_cxx" ] || echo "@CXX@" [ -z "$output_option_ld" ] || echo "@EXE_LINKER@" +[ -z "$input_option_utility" ] || echo "${input_option_utility}-@WX_RELEASE@@WX_FLAVOUR@" # The rest are going to need a little more work. @@ -746,7 +874,6 @@ ldlibs_xml="@EXTRALIBS_XML@" ldlibs_odbc="@EXTRALIBS_ODBC@" ldlibs_adv="@EXTRALIBS_SDL@" - # lib_flags_for _liblist # This function returns a list of flags suitable to return with the # output of --libs for all of the libraries in _liblist. You can @@ -812,6 +939,32 @@ lib_flags_for() echo $_all_ldflags $_wxlibs $_all_libs } +# this is the strict subset of the above function which returns only the +# (static) libraries themselves: this is used for linkdeps output which should +# output the list of libraries the main program should depend on +# +# of course, this duplication is bad but I'll leave to somebody else the care +# of refactoring this as I don't see any way to do it +link_deps_for() +{ + _wxlibs='' + + ! is_cross || _target="-${target}" + + for lib; do + if match_field "$lib" @CORE_BASE_LIBS@ ; then + _libname="@WX_LIBRARY_BASENAME_NOGUI@" + else + _libname="@WX_LIBRARY_BASENAME_GUI@" + fi + [ $lib = base ] || _libname="${_libname}_$lib" + _libname="${_libname}-@WX_RELEASE@$_target" + + _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a" + done + + echo $_wxlibs +} # Sanity check the list of libs the user provided us, if any. # -------------------------------------------------------------- @@ -831,7 +984,8 @@ if is_monolithic; then # We still need the core lib deps for a static build though if [ "x$this_linkage" = "x-static" ]; then - wx_libs="$wx_libs ${libdir}/libwx_@TOOLCHAIN_NAME@.a $ldlibs_core @LIBS@" + link_deps="${libdir}/libwx_@TOOLCHAIN_NAME@.a" + wx_libs="$wx_libs $link_deps $ldlibs_core @LIBS@" else wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@" fi @@ -840,22 +994,18 @@ if is_monolithic; then else # MONOLITHIC = 0 - # Import everything by default, and base if it was omitted. + # Import everything by default, expand std if specified, or add base if omitted. if [ -z "$wx_libs" ]; then wx_libs="@CORE_GUI_LIBS@ @CORE_BASE_LIBS@" - elif ! match_field base $wx_libs ; then - wx_libs="$wx_libs base" - fi - - # Expand the magic library 'std' to the default set. - # Only add those not already specified to future-proof - # against changes to std which would otherwise break - # people's builds. - if match_field std $wx_libs; then + elif match_field std $wx_libs; then + # Bubble any libs that were already specified to the end + # of the list and ensure static linking order is retained. wx_libs=$(remove_field std $wx_libs) for i in @CORE_GUI_LIBS@ @CORE_BASE_LIBS@; do - match_field "$i" $wx_libs || wx_libs="$wx_libs $i" + wx_libs="$(remove_field $i $wx_libs) $i" done + elif ! match_field base $wx_libs ; then + wx_libs="$wx_libs base" fi using_gui=no @@ -868,6 +1018,9 @@ else # MONOLITHIC = 0 match_field "$i" @CORE_BASE_LIBS@ || using_gui=yes done + if [ "x$this_linkage" = "x-static" ]; then + link_deps=$(link_deps_for $wx_libs) + fi wx_libs="$_guildflags @WXCONFIG_RPATH@ $(lib_flags_for $wx_libs)" fi @@ -883,37 +1036,23 @@ fi # Endgame. Nothing left to discover now. # -------------------------------------------------------------- -# cppflags -# This function exists for no other reason than to make conditional -# something that we may not use on several occasions. It outputs -# the basic cppflags determined from information gleaned above. -# Nothing below here will change what it outputs, only whether it -# does or not. -cppflags() -{ - _cppflags="-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" - - if [ -n "$flag_option_inplace" ]; then - # Bring in all the headers as if the whole tree had been installed. - _cppflags="$_cppflags -I$includedir -I${prefix}/contrib/include" - else - _cppflags="$_cppflags -I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" - fi - - _cppflags="$_cppflags @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@" +[ -n "$this_linkage" ] || _static_cppflags="@TOOLCHAIN_DLL_DEFS@" +[ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0" - [ -n "$this_linkage" ] || _cppflags="$_cppflags @TOOLCHAIN_DLL_DEFS@" - [ "$using_gui" = "yes" ] || _cppflags="$_cppflags -DwxUSE_GUI=0" - - echo $_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@" -} +if [ -n "$this_prefix" ]; then + _include_cppflags="-I${includedir} -I${prefix}/contrib/include" +else + _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" +fi +_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@") # now without further ado, we can answer these too. -[ -z "$output_option_cppflags" ] || echo $(cppflags) -[ -z "$output_option_cflags" ] || echo $(cppflags) "@CODE_GEN_FLAGS@" -[ -z "$output_option_cxxflags" ] || echo $(cppflags) "@CODE_GEN_FLAGS@" "@CODE_GEN_FLAGS_CXX@" +[ -z "$output_option_cppflags" ] || echo $_cppflags +[ -z "$output_option_cflags" ] || echo $_cppflags "@CODE_GEN_FLAGS@" +[ -z "$output_option_cxxflags" ] || echo $_cppflags "@CODE_GEN_FLAGS@" "@CODE_GEN_FLAGS_CXX@" [ -z "$output_option_gl_libs" ] || echo $(lib_flags_for gl) +[ -z "$output_option_linkdeps" ] || echo $link_deps if [ -n "$output_option_libs" ]; then