From 8dfd76956c0d7fdf9770c2105957d6196be9f63b Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 12 Feb 2025 23:29:20 +0100 Subject: [PATCH] Import the newer scripts from DeforaOS configure --- doc/docbook.sh | 25 +++++++++++++++---------- tests/clint.sh | 40 ++++++++++++++++++++++++---------------- tests/fixme.sh | 10 +++------- 3 files changed, 42 insertions(+), 33 deletions(-) diff --git a/doc/docbook.sh b/doc/docbook.sh index 83bbf54..7eab664 100755 --- a/doc/docbook.sh +++ b/doc/docbook.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2012-2020 Pierre Pronchery +#Copyright (c) 2012-2024 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -28,14 +28,17 @@ CONFIGSH="${0%/docbook.sh}/../config.sh" PREFIX="/usr/local" PROGNAME="docbook.sh" +XSL_HTML="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" +XSL_MAN="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" +XSL_PDF="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" #executables DEBUG="_debug" FOP="fop" INSTALL="install -m 0644" MKDIR="mkdir -m 0755 -p" RM="rm -f" -XMLLINT="xmllint" -XSLTPROC="xsltproc --nonet --xinclude" +XMLLINT="xmllint --noent --nonet --xinclude --path ${PWD}" +XSLTPROC="xsltproc --nonet --xinclude --path ${PWD}" [ -f "$CONFIGSH" ] && . "$CONFIGSH" @@ -60,18 +63,20 @@ _docbook() ext="${ext##.}" case "$ext" in html) - XSL="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" + XSL="$XSL_HTML" [ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl" [ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl" if [ -f "${target%.*}.css.xml" ]; then - XSLTPROC="$XSLTPROC --param custom.css.source \"${target%.*}.css.xml\" --param generate.css.header 1" + XSLTPROC_PARAMS="--param custom.css.source \"${target%.*}.css.xml\" --param generate.css.header 1" elif [ -f "${source%.*}.css.xml" ]; then - XSLTPROC="$XSLTPROC --param custom.css.source \"${source%.*}.css.xml\" --param generate.css.header 1" + XSLTPROC_PARAMS="--param custom.css.source \"${source%.*}.css.xml\" --param generate.css.header 1" + else + XSLTPROC_PARAMS= fi - $DEBUG $XSLTPROC -o "$target" "$XSL" "$source" + $DEBUG $XSLTPROC $XSLTPROC_PARAMS -o "$target" "$XSL" "$source" ;; pdf) - XSL="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" + XSL="$XSL_PDF" [ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl" [ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl" $DEBUG $XSLTPROC -o "${target%.*}.fo" "$XSL" "$source" && @@ -79,7 +84,7 @@ _docbook() $RM -- "${target%.*}.fo" ;; 1|2|3|4|5|6|7|8|9) - XSL="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" + XSL="$XSL_MAN" $DEBUG $XSLTPROC -o "$target" "$XSL" "$source" ;; *) @@ -170,7 +175,7 @@ while [ $# -gt 0 ]; do source="${target#$OBJDIR}" source="${source%.*}.xml" xpath="string(/refentry/refmeta/manvolnum)" - section=$($XMLLINT --xpath "$xpath" "$source") + section=$($DEBUG $XMLLINT --xpath "$xpath" "$source") if [ $? -eq 0 -a -n "$section" ]; then instdir="$MANDIR/html$section" fi diff --git a/tests/clint.sh b/tests/clint.sh index a7d22ba..04727c6 100755 --- a/tests/clint.sh +++ b/tests/clint.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2016-2020 Pierre Pronchery +#Copyright (c) 2016-2021 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -33,6 +33,7 @@ PROJECTCONF="../project.conf" #executables DATE="date" DEBUG="_debug" +ECHO="/bin/echo" FIND="find" GREP="grep" LINT="lint -g" @@ -68,41 +69,52 @@ _clint() fi for subdir in $subdirs; do [ -d "../$subdir" ] || continue - for filename in $($FIND "../$subdir" -type f | $SORT); do + while read filename; do + [ -n "$filename" ] || continue + r=0 case "$filename" in *.c) echo - (_clint_lint "$filename"; - _clint_rtrim "$filename") + _clint_lint "$filename" || r=$? + _clint_rtrim "$filename"|| r=$? ;; *.h) echo echo "$filename:" - (_clint_rtrim "$filename") + _clint_rtrim "$filename"|| r=$? ;; *) continue ;; esac - if [ $? -ne 0 ]; then + if [ $r -eq 0 ]; then + echo " OK" + echo "$PROGNAME: $filename: OK" 1>&2 + else echo "FAIL" echo "$PROGNAME: $filename: FAIL" 1>&2 res=2 - else - echo "OK" fi - done + done << EOF +$($FIND "../$subdir" -type f | $SORT) +EOF done return $res } _clint_lint() -{ +{( filename="$1" - echo -n "${filename%/*}/" + $ECHO -n "${filename%/*}/" $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() { @@ -118,10 +130,6 @@ _debug() { echo "$@" 1>&3 "$@" - res=$? - #ignore errors when the command is not available - [ $res -eq 127 ] && return 0 - return $res } diff --git a/tests/fixme.sh b/tests/fixme.sh index 84319cf..e5c85e3 100755 --- a/tests/fixme.sh +++ b/tests/fixme.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2017-2020 Pierre Pronchery +#Copyright (c) 2017-2022 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -95,7 +95,7 @@ _fixme_callback() echo "_fixme_callback_asm" return 0 ;; - c|cc|cpp|cxx|h|js|v) + c|cc|cpp|cxx|go|h|js|v) echo "_fixme_callback_c" return 0 ;; @@ -122,7 +122,7 @@ _fixme_callback() echo "_fixme_callback_python" return 0 ;; - "&3 "$@" - res=$? - #ignore errors when the command is not available - [ $res -eq 127 ] && return 0 - return $res }