DeforaOS/Todo
DeforaOS/Todo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import the newer scripts from DeforaOS configure

Browse Source
This commit is contained in:
Pierre Pronchery 2024-10-07 02:43:32 +02:00
parent 54a7c76395
commit ddb116a047
5 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
doc/docbook.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2012-2020 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2012-2024 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:
@ -28,14 +28,17 @@
CONFIGSH="${0%/docbook.sh}/../config.sh" CONFIGSH="${0%/docbook.sh}/../config.sh"
PREFIX="/usr/local" PREFIX="/usr/local"
PROGNAME="docbook.sh" 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 #executables
DEBUG="_debug" DEBUG="_debug"
FOP="fop" 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 --noent --nonet --xinclude --path ${PWD}"
XSLTPROC="xsltproc --nonet --xinclude" XSLTPROC="xsltproc --nonet --xinclude --path ${PWD}"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"
@ -60,18 +63,20 @@ _docbook()
ext="${ext##.}" ext="${ext##.}"
case "$ext" in case "$ext" in
html) html)
XSL="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" XSL="$XSL_HTML"
[ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl" [ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl"
[ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl" [ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl"
if [ -f "${target%.*}.css.xml" ]; then 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 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 fi
$DEBUG $XSLTPROC -o "$target" "$XSL" "$source" $DEBUG $XSLTPROC $XSLTPROC_PARAMS -o "$target" "$XSL" "$source"
;; ;;
pdf) pdf)
XSL="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" XSL="$XSL_PDF"
[ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl" [ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl"
[ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl" [ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl"
$DEBUG $XSLTPROC -o "${target%.*}.fo" "$XSL" "$source" && $DEBUG $XSLTPROC -o "${target%.*}.fo" "$XSL" "$source" &&
@ -79,7 +84,7 @@ _docbook()
$RM -- "${target%.*}.fo" $RM -- "${target%.*}.fo"
;; ;;
1|2|3|4|5|6|7|8|9) 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" $DEBUG $XSLTPROC -o "$target" "$XSL" "$source"
;; ;;
*) *)
@ -170,7 +175,7 @@ while [ $# -gt 0 ]; do
source="${target#$OBJDIR}" source="${target#$OBJDIR}"
source="${source%.*}.xml" source="${source%.*}.xml"
xpath="string(/refentry/refmeta/manvolnum)" xpath="string(/refentry/refmeta/manvolnum)"
section=$($XMLLINT --xpath "$xpath" "$source") section=$($DEBUG $XMLLINT --xpath "$xpath" "$source")
if [ $? -eq 0 -a -n "$section" ]; then if [ $? -eq 0 -a -n "$section" ]; then
instdir="$MANDIR/html$section" instdir="$MANDIR/html$section"
fi fi

40
tests/clint.sh
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
} }

10
tests/fixme.sh
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
} }

23
tests/xmllint.sh
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:
@ -32,11 +32,12 @@ 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"
SORT="sort -n" SORT="sort -n"
TR="tr" TR="tr"
XMLLINT="xmllint --nonet" XMLLINT="xmllint --nonet --xinclude"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"
@ -49,7 +50,6 @@ _xmllint()
subdirs= subdirs=
$DATE $DATE
echo
while read line; do while read line; do
case "$line" in case "$line" in
"["*) "["*)
@ -67,15 +67,22 @@ _xmllint()
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 '*.xml' -o -name '*.xsl' \) | $SORT); do while read filename; do
[ -n "$filename" ] || continue
echo
$ECHO -n "$filename:"
$DEBUG $XMLLINT "$filename" 2>&1 > "$DEVNULL" $DEBUG $XMLLINT "$filename" 2>&1 > "$DEVNULL"
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 '*.xml' -o -iname '*.xsl' \) | $SORT)
EOF
done done
return $res return $res
} }
@ -86,10 +93,6 @@ _debug()
{ {
echo "$@" 1>&3 echo "$@" 1>&3
"$@" "$@"
res=$?
#ignore errors when the command is not available
[ $res -eq 127 ] && return 0
return $res
} }

11
tools/subst.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2012-2020 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2012-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:
@ -29,18 +29,19 @@ CONFIGSH="${0%/subst.sh}/../config.sh"
PREFIX="/usr/local" PREFIX="/usr/local"
BINDIR= BINDIR=
DATADIR= DATADIR=
DEVNULL="/dev/null"
INCLUDEDIR= INCLUDEDIR=
LDSO= LDSO=
LIBDIR= LIBDIR=
LIBEXECDIR= LIBEXECDIR=
MANDIR= MANDIR=
PROGNAME="subst.sh" PROGNAME="subst.sh"
SBINDIR=
SYSCONFDIR= SYSCONFDIR=
#executables #executables
CHMOD="chmod" CHMOD="chmod"
DATE="date" DATE="date"
DEBUG="_debug" DEBUG="_debug"
DEVNULL="/dev/null"
INSTALL="install" INSTALL="install"
MKDIR="mkdir -m 0755 -p" MKDIR="mkdir -m 0755 -p"
RM="rm -f" RM="rm -f"
@ -85,6 +86,7 @@ _subst()
SYSCONFDIR="$PREFIX/etc" SYSCONFDIR="$PREFIX/etc"
[ "$PREFIX" = "/usr" ] && SYSCONFDIR="/etc" [ "$PREFIX" = "/usr" ] && SYSCONFDIR="/etc"
fi fi
[ -z "$SBINDIR" ] && SBINDIR="$PREFIX/sbin"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
target="$1" target="$1"
@ -115,7 +117,8 @@ _subst()
source="${source}.in" source="${source}.in"
([ -z "$OBJDIR" ] || $DEBUG $MKDIR -- "${target%/*}") \ ([ -z "$OBJDIR" ] || $DEBUG $MKDIR -- "${target%/*}") \
|| return 2 || return 2
$DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;g" \ $DEBUG $SED -e "s;@VENDOR@;$VENDOR;g" \
-e "s;@PACKAGE@;$PACKAGE;g" \
-e "s;@VERSION@;$VERSION;g" \ -e "s;@VERSION@;$VERSION;g" \
-e "s;@PREFIX@;$PREFIX;g" \ -e "s;@PREFIX@;$PREFIX;g" \
-e "s;@BINDIR@;$BINDIR;g" \ -e "s;@BINDIR@;$BINDIR;g" \
@ -127,6 +130,7 @@ _subst()
-e "s;@LIBEXECDIR@;$LIBEXECDIR;g" \ -e "s;@LIBEXECDIR@;$LIBEXECDIR;g" \
-e "s;@MANDIR@;$MANDIR;g" \ -e "s;@MANDIR@;$MANDIR;g" \
-e "s;@PWD@;$PWD;g" \ -e "s;@PWD@;$PWD;g" \
-e "s;@SBINDIR@;$SBINDIR;g" \
-e "s;@SYSCONFDIR@;$SYSCONFDIR;g" \ -e "s;@SYSCONFDIR@;$SYSCONFDIR;g" \
-- "$source" > "$target" -- "$source" > "$target"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -139,6 +143,7 @@ _subst()
return 0 return 0
} }
#debug #debug
_debug() _debug()
{ {