grim/guifications3

adding some debug stuff and other utilities, commiting so elb can look at it really...
org.guifications.gf3
2009-10-23, Gary Kramlich
71ae11cebfd1
Parents 6aa03b22e94f
Children 3784633634953707becf4df7
adding some debug stuff and other utilities, commiting so elb can look at it really...
1 files changed, 34 insertions(+), 12 deletions(-)
  • +34 -12
    gflib/gflib-autogen.sh
    • --- a/gflib/gflib-autogen.sh Thu Oct 15 05:20:11 2009 -0500
    +++ b/gflib/gflib-autogen.sh Fri Oct 23 13:14:16 2009 -0600
    @@ -72,11 +72,13 @@
    }
    lreplace() {
    + set -x
    __listname=$1
    __listindex=$2
    __listvalue=$3
    eval "$__listname=\`catlist $__listname | sed -e '${__listindex}c\\\\
    $__listvalue'\`"
    + set +x
    }
    linsert() {
    @@ -100,15 +102,23 @@
    add_command () {
    CMD=${1}
    shift
    -
    - # we need to make sure to entry something into the array for args even if
    - # it's empty. If it is, we set it to NONE, which we check for later
    ARGS="${@}"
    lappend COMMANDS ${CMD}
    lappend FLAGS "\"${ARGS}\""
    }
    +insert_command () {
    + INSERT_POINT=${1}
    + COMMAND=${2}
    + shift 2
    + ARGS="${@}"
    +
    + INDEX=`lsearch COMMANDS ${INSERT_POINT}`
    + linsert COMMANDS ${INDEX} ${COMMAND}
    + linsert FLAGS ${INDEX} "${ARGS}"
    +}
    +
    check_config_file() {
    test "${ARGS_FILE}" || ARGS_FILE="autogen.args"
    @@ -214,10 +224,11 @@
    add_default_library_commands () {
    add_default_commands
    - INDEX=`lsearch COMMANDS aclocal`
    -
    - linsert COMMANDS ${INDEX} "gtkdocize"
    - linsert FLAGS ${INDEX} "--copy"
    + # gtkdocize needs be to run before aclocal, so we insert it before aclocal
    + insert_command "aclocal" "gtkdocize" "--copy"
    + #INDEX=`lsearch COMMANDS aclocal`
    + #linsert COMMANDS ${INDEX} " gtkdocize"
    + #linsert FLAGS ${INDEX} " --copy"
    }
    find_command () {
    @@ -230,12 +241,23 @@
    shift 2
    ARGS=${@}
    - INDEX=`find_command ${OLD_COMMAND}`
    + echo
    + echo "%%%%"
    + echo "Updating ${OLD_COMMAND} to ${NEW_COMMAND} with args '${ARGS}'"
    + echo
    +
    + INDEX=`lsearch COMMANDS ${OLD_COMMAND}`
    test ${INDEX} || return
    - COMMANDS[${INDEX}]=${NEW_COMMAND}
    + lreplace COMMANDS ${INDEX} ${NEW_COMMAND}
    - test ${ARGS} && FLAGS[${INDEX}]=${ARGS}
    + test -z "${ARGS}" || lreplace FLAGS ${INDEX} "${ARGS}"
    + echo "index: ${INDEX}"
    + catlist COMMANDS
    + echo "----"
    + catlist FLAGS
    + echo "----"
    +
    }
    ###############################################################################
    @@ -245,7 +267,7 @@
    SEQ_COMMAND="jot -"
    }
    -platform_osx () {
    +platform_darwin () {
    # run the bsd platform specific stuff too
    platform_bsd
    @@ -271,7 +293,7 @@
    platform_bsd
    ;;
    Darwin*)
    - platform_osx
    + platform_darwin
    ;;
    esac