Import the newer scripts from DeforaOS configure

This commit is contained in:
Pierre Pronchery 2025-01-26 01:24:03 +01:00
parent 435a312b8f
commit ba0f73b07d
3 changed files with 43 additions and 44 deletions

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,31 +1,26 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2020 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2020 Pierre Pronchery <khorben@defora.org>
#This file is part of DeforaOS System libSystem
#All rights reserved.
# #
#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 #modification, are permitted provided that the following conditions are met:
#met:
# #
#1. Redistributions of source code must retain the above copyright # * Redistributions of source code must retain the above copyright notice, this
# notice, this list of conditions and the following disclaimer. # list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# #
#2. Redistributions in binary form must reproduce the above copyright #THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# notice, this list of conditions and the following disclaimer in the #AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# documentation and/or other materials provided with the distribution. #IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# #DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS #FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
#IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED #DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
#TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A #SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
#PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT #CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
#HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, #OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
#SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED #OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
#PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
#LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
#NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
#SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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
;; ;;
@ -122,7 +122,7 @@ _fixme_callback()
echo "_fixme_callback_python" echo "_fixme_callback_python"
return 0 return 0
;; ;;
"<html"*|"<?xml"*) "<!DOCTYPE"*|"<!doctype"*|"<HTML"*|"<html"*|"<?xml"*)
echo "_fixme_callback_xml" echo "_fixme_callback_xml"
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
} }