diff --git a/data/pkgconfig.sh b/data/pkgconfig.sh index cd4526c..61a50f6 100755 --- a/data/pkgconfig.sh +++ b/data/pkgconfig.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2011-2019 Pierre Pronchery +#Copyright (c) 2011-2020 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -27,14 +27,15 @@ #variables CONFIGSH="${0%/pkgconfig.sh}/../config.sh" PREFIX="/usr/local" -DEBUG="_debug" DEVNULL="/dev/null" PROGNAME="pkgconfig.sh" #executables +DEBUG="_debug" INSTALL="install -m 0644" MKDIR="mkdir -m 0755 -p" RM="rm -f" SED="sed" + [ -f "$CONFIGSH" ] && . "$CONFIGSH" @@ -150,10 +151,10 @@ while [ $# -gt 0 ]; do if [ "$PREFIX" != "/usr" ]; then RPATH="-Wl,-rpath-link,\${libdir} -Wl,-rpath,\${libdir}" case $(uname -s) in - Darwin) + "Darwin") RPATH="-Wl,-rpath,\${libdir}" ;; - SunOS) + "SunOS") RPATH="-Wl,-R\${libdir}" ;; esac diff --git a/doc/docbook.sh b/doc/docbook.sh index b247959..83bbf54 100755 --- a/doc/docbook.sh +++ b/doc/docbook.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2012-2017 Pierre Pronchery +#Copyright (c) 2012-2020 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -25,8 +25,8 @@ #variables +CONFIGSH="${0%/docbook.sh}/../config.sh" PREFIX="/usr/local" -[ -f "../config.sh" ] && . "../config.sh" PROGNAME="docbook.sh" #executables DEBUG="_debug" @@ -37,6 +37,8 @@ RM="rm -f" XMLLINT="xmllint" XSLTPROC="xsltproc --nonet --xinclude" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #debug diff --git a/doc/gtkdoc.sh b/doc/gtkdoc.sh index 0bdf102..6dc5b32 100755 --- a/doc/gtkdoc.sh +++ b/doc/gtkdoc.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/gtkdoc.sh}/../config.sh" PREFIX="/usr/local" PROGNAME="gtkdoc.sh" #executables @@ -41,7 +42,7 @@ RM="rm -f" RMDIR="rmdir" TOUCH="touch" -[ -f "../config.sh" ] && . "../config.sh" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" #functions diff --git a/tests/clint.sh b/tests/clint.sh index bf01d00..a7d22ba 100755 --- a/tests/clint.sh +++ b/tests/clint.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2016-2019 Pierre Pronchery +#Copyright (c) 2016-2020 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/clint.sh}/../config.sh" CFLAGS= CPPFLAGS= PROGNAME="clint.sh" @@ -35,16 +36,19 @@ DEBUG="_debug" FIND="find" GREP="grep" LINT="lint -g" +MKDIR="mkdir -p" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #clint _clint() { - ret=0 - subdirs="data doc src tests tools" + res=0 + subdirs= $DATE while read line; do @@ -58,6 +62,10 @@ _clint() ;; esac done < "$PROJECTCONF" + if [ ! -n "$subdirs" ]; then + _error "Could not locate directories to analyze" + return $? + fi for subdir in $subdirs; do [ -d "../$subdir" ] || continue for filename in $($FIND "../$subdir" -type f | $SORT); do @@ -79,13 +87,13 @@ _clint() if [ $? -ne 0 ]; then echo "FAIL" echo "$PROGNAME: $filename: FAIL" 1>&2 - ret=2 + res=2 else echo "OK" fi done done - return $ret + return $res } _clint_lint() @@ -117,6 +125,14 @@ _debug() } +#error +_error() +{ + echo "$PROGNAME: $@" 1>&2 + return 2 +} + + #usage _usage() { @@ -125,14 +141,6 @@ _usage() } -#warning -_warning() -{ - echo "$PROGNAME: $@" 1>&2 - return 2 -} - - #main clean=0 while getopts "cO:P:" name; do @@ -162,9 +170,15 @@ fi [ $clean -ne 0 ] && exit 0 exec 3>&1 +ret=0 while [ $# -gt 0 ]; do target="$1" + dirname="${target%/*}" shift - _clint > "$target" || exit 2 + if [ -n "$dirname" -a "$dirname" != "$target" ]; then + $MKDIR -- "$dirname" || ret=$? + fi + _clint > "$target" || ret=$? done +exit $ret diff --git a/tests/fixme.sh b/tests/fixme.sh index f4c921c..84319cf 100755 --- a/tests/fixme.sh +++ b/tests/fixme.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2017-2019 Pierre Pronchery +#Copyright (c) 2017-2020 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -25,23 +25,30 @@ #variables +CONFIGSH="${0%/fixme.sh}/../config.sh" PROGNAME="fixme.sh" PROJECTCONF="../project.conf" +REGEXP_ERROR="FIXME" +REGEXP_WARNING="\\(TODO\|XXX\\)" #executables DATE="date" DEBUG="_debug" FIND="find" GREP="grep" +HEAD="head" MKDIR="mkdir -p" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #fixme _fixme() { res=0 + subdirs= $DATE echo @@ -56,27 +63,14 @@ _fixme() ;; esac done < "$PROJECTCONF" + if [ ! -n "$subdirs" ]; then + _error "Could not locate directories to analyze" + return $? + fi for subdir in $subdirs; do [ -d "../$subdir" ] || continue for filename in $($FIND "../$subdir" -type f | $SORT); do - callback= - ext=${filename##*/} - ext=${ext%.in} - ext=${ext##*.} - case "$ext" in - asm|S) - callback="_fixme_asm" - ;; - c|cc|cpp|cxx|h|js) - callback="_fixme_c" - ;; - conf|sh) - callback="_fixme_sh" - ;; - htm|html|xml) - callback="_fixme_xml" - ;; - esac + callback=$(_fixme_callback "$filename") [ -n "$callback" ] || continue ($callback "$filename") 2>&1 if [ $? -ne 0 ]; then @@ -88,54 +82,114 @@ _fixme() return $res } -_fixme_asm() +_fixme_callback() +{ + filename="$1" + ext=${filename##*/} + ext=${ext%.in} + ext=${ext##*.} + callback= + + case "$ext" in + asm|S) + echo "_fixme_callback_asm" + return 0 + ;; + c|cc|cpp|cxx|h|js|v) + echo "_fixme_callback_c" + return 0 + ;; + conf|sh) + echo "_fixme_callback_sh" + return 0 + ;; + py) + echo "_fixme_callback_python" + return 0 + ;; + htm|html|xml|xsl) + echo "_fixme_callback_xml" + return 0 + ;; + esac + case $($HEAD -n 1 "$filename") in + "#!/bin/sh"*|"#! /bin/sh"*|\ + "#!/usr/bin/env bash"*|"#! /usr/bin/env bash"*) + echo "_fixme_callback_sh" + return 0 + ;; + "#!/usr/bin/env python"*|"#! /usr/bin/env python"*) + echo "_fixme_callback_python" + return 0 + ;; + "&2 + return 2 +} + + #usage _usage() { diff --git a/tests/pylint.sh b/tests/pylint.sh index 90885d1..6c5b99b 100755 --- a/tests/pylint.sh +++ b/tests/pylint.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2014-2017 Pierre Pronchery +#Copyright (c) 2014-2020 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -25,22 +25,27 @@ #variables +CONFIGSH="${0%/pylint.sh}/../config.sh" PROGNAME="pylint.sh" PROJECTCONF="../project.conf" #executables DATE="date" DEBUG="_debug" FIND="find" +MKDIR="mkdir -p" PYLINT="pep8" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #pylint _pylint() { - subdirs="data doc src tests tools" + res=0 + subdirs= $DATE while read line; do @@ -54,6 +59,10 @@ _pylint() ;; esac done < "$PROJECTCONF" + if [ ! -n "$subdirs" ]; then + _error "Could not locate directories to analyze" + return $? + fi for subdir in $subdirs; do [ -d "../$subdir" ] || continue for filename in $($FIND "../$subdir" -type f -a -name '*.py' | $SORT); do @@ -68,6 +77,7 @@ _pylint() fi done done + return $res } @@ -83,6 +93,14 @@ _debug() } +#error +_error() +{ + echo "$PROGNAME: $@" 1>&2 + return 2 +} + + #usage _usage() { @@ -120,9 +138,15 @@ fi [ $clean -ne 0 ] && exit 0 exec 3>&1 +ret=0 while [ $# -gt 0 ]; do target="$1" + dirname="${target%/*}" shift - _pylint > "$target" || exit 2 + if [ -n "$dirname" -a "$dirname" != "$target" ]; then + $MKDIR -- "$dirname" || ret=$? + fi + _pylint > "$target" || ret=$? done +exit $ret diff --git a/tests/shlint.sh b/tests/shlint.sh index 0178b4e..586d237 100755 --- a/tests/shlint.sh +++ b/tests/shlint.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2014-2017 Pierre Pronchery +#Copyright (c) 2014-2020 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -25,23 +25,27 @@ #variables +CONFIGSH="${0%/shlint.sh}/../config.sh" PROGNAME="shlint.sh" PROJECTCONF="../project.conf" #executables DATE="date" DEBUG="_debug" FIND="find" +MKDIR="mkdir -p" SHLINT="sh -n" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #shlint _shlint() { - ret=0 - subdirs="data doc src tests tools" + res=0 + subdirs= $DATE echo @@ -56,6 +60,10 @@ _shlint() ;; esac done < "$PROJECTCONF" + if [ ! -n "$subdirs" ]; then + _error "Could not locate directories to analyze" + return $? + fi for subdir in $subdirs; do [ -d "../$subdir" ] || continue for filename in $($FIND "../$subdir" -type f -a -name '*.sh' | $SORT); do @@ -64,11 +72,11 @@ _shlint() echo "$filename:" else echo "$PROGNAME: $filename: FAIL" 1>&2 - ret=2 + res=2 fi done done - return $ret + return $res } _shlint_file() @@ -88,7 +96,7 @@ _shlint_file() esac done < "$filename" if [ $warn -ne 0 ]; then - _warning "$filename: return instead of exit in the global scope" + _error "$filename: return instead of exit in the global scope" fi return 0 } @@ -106,6 +114,14 @@ _debug() } +#error +_error() +{ + echo "$PROGNAME: $@" 1>&2 + return 2 +} + + #usage _usage() { @@ -114,14 +130,6 @@ _usage() } -#warning -_warning() -{ - echo "$PROGNAME: $@" 1>&2 - return 2 -} - - #main clean=0 while getopts "cO:P:" name; do @@ -151,9 +159,15 @@ fi [ $clean -ne 0 ] && exit 0 exec 3>&1 +ret=0 while [ $# -gt 0 ]; do target="$1" + dirname="${target%/*}" shift - _shlint > "$target" || exit 2 + if [ -n "$dirname" -a "$dirname" != "$target" ]; then + $MKDIR -- "$dirname" || ret=$? + fi + _shlint > "$target" || ret=$? done +exit $ret diff --git a/tools/subst.sh b/tools/subst.sh index 855251f..b309b15 100755 --- a/tools/subst.sh +++ b/tools/subst.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2012-2019 Pierre Pronchery +#Copyright (c) 2012-2020 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -45,6 +45,7 @@ INSTALL="install" MKDIR="mkdir -m 0755 -p" RM="rm -f" SED="sed" + [ -f "$CONFIGSH" ] && . "$CONFIGSH"