Import the newer scripts from DeforaOS configure

This commit is contained in:
Pierre Pronchery 2022-08-25 02:49:27 +02:00
parent c19f3f8335
commit 582eab193f
5 changed files with 51 additions and 42 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2012-2020 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2012-2021 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -34,7 +34,7 @@ FOP="fop"
INSTALL="install -m 0644" INSTALL="install -m 0644"
MKDIR="mkdir -m 0755 -p" MKDIR="mkdir -m 0755 -p"
RM="rm -f" RM="rm -f"
XMLLINT="xmllint" XMLLINT="xmllint --nonet --xinclude"
XSLTPROC="xsltproc --nonet --xinclude" XSLTPROC="xsltproc --nonet --xinclude"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2016-2020 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2016-2021 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -33,6 +33,7 @@ PROJECTCONF="../project.conf"
#executables #executables
DATE="date" DATE="date"
DEBUG="_debug" DEBUG="_debug"
ECHO="/bin/echo"
FIND="find" FIND="find"
GREP="grep" GREP="grep"
LINT="lint -g" LINT="lint -g"
@ -68,41 +69,52 @@ _clint()
fi fi
for subdir in $subdirs; do for subdir in $subdirs; do
[ -d "../$subdir" ] || continue [ -d "../$subdir" ] || continue
for filename in $($FIND "../$subdir" -type f | $SORT); do while read filename; do
[ -n "$filename" ] || continue
r=0
case "$filename" in case "$filename" in
*.c) *.c)
echo echo
(_clint_lint "$filename"; _clint_lint "$filename" || r=$?
_clint_rtrim "$filename") _clint_rtrim "$filename"|| r=$?
;; ;;
*.h) *.h)
echo echo
echo "$filename:" echo "$filename:"
(_clint_rtrim "$filename") _clint_rtrim "$filename"|| r=$?
;; ;;
*) *)
continue continue
;; ;;
esac esac
if [ $? -ne 0 ]; then if [ $r -eq 0 ]; then
echo " OK"
echo "$PROGNAME: $filename: OK" 1>&2
else
echo "FAIL" echo "FAIL"
echo "$PROGNAME: $filename: FAIL" 1>&2 echo "$PROGNAME: $filename: FAIL" 1>&2
res=2 res=2
else
echo "OK"
fi fi
done done << EOF
$($FIND "../$subdir" -type f | $SORT)
EOF
done done
return $res return $res
} }
_clint_lint() _clint_lint()
{ {(
filename="$1" filename="$1"
echo -n "${filename%/*}/" $ECHO -n "${filename%/*}/"
$DEBUG $LINT $CPPFLAGS $CFLAGS "$filename" 2>&1 $DEBUG $LINT $CPPFLAGS $CFLAGS "$filename" 2>&1
} ret=$?
if [ $ret -eq 127 ]; then
#XXX ignore errors when $LINT is not available
ret=0
fi
return $ret
)}
_clint_rtrim() _clint_rtrim()
{ {
@ -118,10 +130,6 @@ _debug()
{ {
echo "$@" 1>&3 echo "$@" 1>&3
"$@" "$@"
res=$?
#ignore errors when the command is not available
[ $res -eq 127 ] && return 0
return $res
} }

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2017-2020 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2017-2022 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -95,7 +95,7 @@ _fixme_callback()
echo "_fixme_callback_asm" echo "_fixme_callback_asm"
return 0 return 0
;; ;;
c|cc|cpp|cxx|h|js|v) c|cc|cpp|cxx|go|h|js|v)
echo "_fixme_callback_c" echo "_fixme_callback_c"
return 0 return 0
;; ;;
@ -199,10 +199,6 @@ _debug()
{ {
echo "$@" 1>&3 echo "$@" 1>&3
"$@" "$@"
res=$?
#ignore errors when the command is not available
[ $res -eq 127 ] && return 0
return $res
} }

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2014-2020 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2014-2021 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -31,9 +31,10 @@ PROJECTCONF="../project.conf"
#executables #executables
DATE="date" DATE="date"
DEBUG="_debug" DEBUG="_debug"
ECHO="/bin/echo"
FIND="find" FIND="find"
MKDIR="mkdir -p" MKDIR="mkdir -p"
PYLINT="pep8" PYLINT="flake8"
SORT="sort -n" SORT="sort -n"
TR="tr" TR="tr"
@ -65,17 +66,22 @@ _pylint()
fi fi
for subdir in $subdirs; do for subdir in $subdirs; do
[ -d "../$subdir" ] || continue [ -d "../$subdir" ] || continue
for filename in $($FIND "../$subdir" -type f -a -name '*.py' | $SORT); do while read filename; do
[ -n "$filename" ] || continue
echo echo
echo "Testing: $filename" $ECHO -n "$filename:"
$DEBUG $PYLINT -- "$filename" 2>&1 $DEBUG $PYLINT -- "$filename" 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo " OK"
echo "$PROGNAME: $filename: OK" 1>&2 echo "$PROGNAME: $filename: OK" 1>&2
else else
#XXX ignore errors #XXX ignore errors
echo "FAIL"
echo "$PROGNAME: $filename: FAIL" 1>&2 echo "$PROGNAME: $filename: FAIL" 1>&2
fi fi
done done << EOF
$($FIND "../$subdir" -type f -a -iname '*.py' | $SORT)
EOF
done done
return $res return $res
} }
@ -86,10 +92,6 @@ _debug()
{ {
echo "$@" 1>&3 echo "$@" 1>&3
"$@" "$@"
res=$?
#ignore errors when the command is not available
[ $res -eq 127 ] && return 0
return $res
} }

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2014-2020 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2014-2021 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -31,6 +31,7 @@ PROJECTCONF="../project.conf"
#executables #executables
DATE="date" DATE="date"
DEBUG="_debug" DEBUG="_debug"
ECHO="/bin/echo"
FIND="find" FIND="find"
MKDIR="mkdir -p" MKDIR="mkdir -p"
SHLINT="sh -n" SHLINT="sh -n"
@ -48,7 +49,6 @@ _shlint()
subdirs= subdirs=
$DATE $DATE
echo
while read line; do while read line; do
case "$line" in case "$line" in
"["*) "["*)
@ -66,15 +66,22 @@ _shlint()
fi fi
for subdir in $subdirs; do for subdir in $subdirs; do
[ -d "../$subdir" ] || continue [ -d "../$subdir" ] || continue
for filename in $($FIND "../$subdir" -type f -a -name '*.sh' | $SORT); do while read filename; do
[ -n "$filename" ] || continue
echo
$ECHO -n "$filename:"
_shlint_file "$filename" _shlint_file "$filename"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$filename:" echo " OK"
echo "$PROGNAME: $filename: OK" 1>&2
else else
echo "FAIL"
echo "$PROGNAME: $filename: FAIL" 1>&2 echo "$PROGNAME: $filename: FAIL" 1>&2
res=2 res=2
fi fi
done done << EOF
$($FIND "../$subdir" -type f -a -iname '*.sh' | $SORT)
EOF
done done
return $res return $res
} }
@ -107,10 +114,6 @@ _debug()
{ {
echo "$@" 1>&3 echo "$@" 1>&3
"$@" "$@"
res=$?
#ignore errors when the command is not available
[ $res -eq 127 ] && return 0
return $res
} }