diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release index 00bd8eee95..0b4434c93a 100755 --- a/misc/scripts/inc_release +++ b/misc/scripts/inc_release @@ -8,52 +8,7 @@ # Licence: wxWindows licence ############################################################################## -error() { - echo "$progname: $*" >&2 -} - -msg() { - echo "$progname: $*" -} - -msgn() { - echo -n "$progname: $*" -} - -msgc() { - echo "$*" -} - -run_sed() { - filename=$1 - shift - cmd= - while [ $# -gt 0 ]; do - cmd="$cmd-e \"$1\" " - shift - done - - msgn " processing $filename ... " - eval "sed $cmd $filename" > $filename.$$ - if cmp -s $filename $filename.$$; then - rm $filename.$$ - msgc "unchanged" - else - mv $filename.$$ $filename - msgc "done" - fi -} - -progname=`basename $0` - -# we must be run from wx directory -if [ ! -f wxwin.m4 ]; then - error "must be ran from root wx directory" - exit 1 -fi - -# exit on any error -set -e +. `dirname $0`/run_sed_common.sh # the primary source of information is wx/version.h ver_string=`grep '#define wxVERSION_STRING ' include/wx/version.h | sed 's/^.*"wxWidgets \(.*\)")/\1/'` diff --git a/misc/scripts/run_sed_common.sh b/misc/scripts/run_sed_common.sh new file mode 100644 index 0000000000..419028c63f --- /dev/null +++ b/misc/scripts/run_sed_common.sh @@ -0,0 +1,54 @@ +############################################################################## +# Name: misc/scripts/run_sed_common.sh +# Purpose: Common helpers for scripts using sed for automatic updates +# Created: 2019-04-21 (extracted from misc/scripts/inc_release) +# Copyright: (c) 2007,2019 Vadim Zeitlin +# Licence: wxWindows licence +############################################################################## + +error() { + echo "$progname: $*" >&2 +} + +msg() { + echo "$progname: $*" +} + +msgn() { + echo -n "$progname: $*" +} + +msgc() { + echo "$*" +} + +run_sed() { + filename=$1 + shift + cmd= + while [ $# -gt 0 ]; do + cmd="$cmd-e \"$1\" " + shift + done + + msgn " processing $filename ... " + eval "sed $cmd $filename" > $filename.$$ + if cmp -s $filename $filename.$$; then + rm $filename.$$ + msgc "unchanged" + else + mv $filename.$$ $filename + msgc "done" + fi +} + +progname=`basename $0` + +# we must be run from wx directory +if [ ! -f wxwin.m4 ]; then + error "must be ran from root wx directory" + exit 1 +fi + +# exit on any error +set -e