From df68815cb5c07b74c85c46e0267dc8e57c82467d Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 19 Nov 2020 03:17:47 +0100 Subject: [PATCH] Import the newer scripts from DeforaOS configure --- data/pkgconfig.sh | 46 ++++++++++---- doc/gtkdoc.sh | 154 ++++++++++++++++++++++++++++++++------------- tests/fixme.sh | 156 ++++++++++++++++++++++++++++++++++++---------- 3 files changed, 269 insertions(+), 87 deletions(-) diff --git a/data/pkgconfig.sh b/data/pkgconfig.sh index 83479f5..61a50f6 100755 --- a/data/pkgconfig.sh +++ b/data/pkgconfig.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2011-2015 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: @@ -25,17 +25,19 @@ #variables +CONFIGSH="${0%/pkgconfig.sh}/../config.sh" PREFIX="/usr/local" -[ -f "../config.sh" ] && . "../config.sh" -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" + #functions #debug @@ -66,7 +68,7 @@ _usage() clean=0 install=0 uninstall=0 -while getopts "ciuP:" name; do +while getopts "ciuO:P:" name; do case $name in c) clean=1 @@ -79,6 +81,9 @@ while getopts "ciuP:" name; do install=0 uninstall=1 ;; + O) + export "${OPTARG%%=*}"="${OPTARG#*=}" + ;; P) PREFIX="$OPTARG" ;; @@ -89,7 +94,7 @@ while getopts "ciuP:" name; do esac done shift $(($OPTIND - 1)) -if [ $# -eq 0 ]; then +if [ $# -lt 0 ]; then _usage exit $? fi @@ -103,6 +108,16 @@ if [ -z "$VERSION" ]; then _error "The VERSION variable needs to be set" exit $? fi +[ -z "$BINDIR" ] && BINDIR="$PREFIX/bin" +[ -z "$DATADIR" ] && DATADIR="$PREFIX/share" +[ -z "$INCLUDEDIR" ] && INCLUDEDIR="$PREFIX/include" +[ -z "$LIBDIR" ] && LIBDIR="$PREFIX/lib" +[ -z "$LIBEXECDIR" ] && LIBEXECDIR="$PREFIX/libexec" +[ -z "$MANDIR" ] && MANDIR="$DATADIR/man" +if [ -z "$SYSCONFDIR" ]; then + SYSCONFDIR="$PREFIX/etc" + [ "$PREFIX" = "/usr" ] && SYSCONFDIR="/etc" +fi PKGCONFIG="$PREFIX/lib/pkgconfig" exec 3>&1 @@ -136,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 @@ -148,10 +163,19 @@ while [ $# -gt 0 ]; do #create source="${target#$OBJDIR}" source="${source}.in" - $DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;" \ - -e "s;@VERSION@;$VERSION;" \ - -e "s;@PREFIX@;$PREFIX;" \ - -e "s;@RPATH@;$RPATH;" \ + ([ -z "$OBJDIR" ] || $DEBUG $MKDIR -- "${target%/*}") || exit 2 + $DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;g" \ + -e "s;@VERSION@;$VERSION;g" \ + -e "s;@PREFIX@;$PREFIX;g" \ + -e "s;@BINDIR@;$BINDIR;g" \ + -e "s;@DATADIR@;$DATADIR;g" \ + -e "s;@INCLUDEDIR@;$INCLUDEDIR;g" \ + -e "s;@LIBDIR@;$LIBDIR;g" \ + -e "s;@LIBEXECDIR@;$LIBEXECDIR;g" \ + -e "s;@MANDIR@;$MANDIR;g" \ + -e "s;@PWD@;$PWD;g" \ + -e "s;@RPATH@;$RPATH;g" \ + -e "s;@SYSCONFDIR@;$SYSCONFDIR;g" \ -- "$source" > "$target" if [ $? -ne 0 ]; then $DEBUG $RM -- "$target" diff --git a/doc/gtkdoc.sh b/doc/gtkdoc.sh index b32791c..6dc5b32 100755 --- a/doc/gtkdoc.sh +++ b/doc/gtkdoc.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2012-2015 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,6 +25,7 @@ #variables +CONFIGSH="${0%/gtkdoc.sh}/../config.sh" PREFIX="/usr/local" PROGNAME="gtkdoc.sh" #executables @@ -38,9 +39,10 @@ GTKDOC_SCAN="gtkdoc-scan" INSTALL="install -m 0644" MKDIR="mkdir -m 0755 -p" RM="rm -f" +RMDIR="rmdir" TOUCH="touch" -[ -f "../config.sh" ] && . "../config.sh" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" #functions @@ -60,6 +62,77 @@ _error() } +#gtkdoc_fixxref +_gtkdoc_fixxref() +{ + module="$1" + moduledir="$2" + htmldir="$3" + outputdir="$4" + + (cd "$outputdir" && + $DEBUG $GTKDOC_FIXXREF \ + --module="$module" \ + --module-dir="$moduledir" \ + --html-dir="$htmldir") || exit 2 +} + + +#gtkdoc_mkdb +_gtkdoc_mkdb() +{ + module="$1" + sourcedir="$2" + outputdir="$3" + + (cd "$sourcedir" && + $DEBUG $GTKDOC_MKDB --module="$module" \ + --output-dir="$outputdir" \ + --output-format="xml" --tmpl-dir="tmpl") +} + + +#gtkdoc_mkhtml +_gtkdoc_mkhtml() +{ + module="$1" + path="$2" + driver="$3" + outputdir="$4" + + (cd "$outputdir" && + $DEBUG $GTKDOC_MKHTML --path "$path" "$module" "$driver") +} + + +#gtkdoc_mktmpl +_gtkdoc_mktmpl() +{ + module="$1" + sourcedir="$2" + outputdir="$3" + + (cd "$sourcedir" && + $DEBUG $GTKDOC_MKTMPL --module="$module" \ + --output-dir="$outputdir") +} + + +#gtkdoc_scan +_gtkdoc_scan() +{ + module="$1" + sourcedir="$2" + outputdir="$3" + + (cd ".." && + $DEBUG $GTKDOC_SCAN --module="$module" \ + --source-dir="$sourcedir" \ + --output-dir="$outputdir") +# --rebuild-types +} + + #usage _usage() { @@ -72,7 +145,7 @@ _usage() clean=0 install=0 uninstall=0 -while getopts "ciuP:" name; do +while getopts "ciO:uP:" name; do case "$name" in c) clean=1 @@ -81,6 +154,9 @@ while getopts "ciuP:" name; do uninstall=0 install=1 ;; + O) + export "${OPTARG%%=*}"="${OPTARG#*=}" + ;; u) install=0 uninstall=1 @@ -95,7 +171,7 @@ while getopts "ciuP:" name; do esac done shift $((OPTIND - 1)) -if [ $# -eq 0 ]; then +if [ $# -lt 1 ]; then _usage exit $? fi @@ -126,23 +202,28 @@ while [ $# -gt 0 ]; do file="${i##*/}" $DEBUG $RM -- "$instdir/$MODULE/$file" || exit 2 done + if [ -d "$instdir/$MODULE" ]; then + $DEBUG $RMDIR -- "$instdir/$MODULE" || exit 2 + fi continue fi #create case "$target" in gtkdoc/html.stamp) - driver="../$MODULE-docs.xml" - if [ -n "$OBJDIR" ]; then - driver="gtkdoc/$MODULE-docs.xml" - $DEBUG $CP -- "$driver" "${OBJDIR}gtkdoc" \ - || exit 2 - fi output="${OBJDIR}gtkdoc/html" $DEBUG $MKDIR -- "$output" || exit 2 - (cd "$output" && - $DEBUG $GTKDOC_MKHTML "$MODULE" \ - "${OBJDIR}$driver") + driver="$MODULE-docs.xml" + oldpath="$PWD" + [ -n "$OBJDIR" ] && for file in \ + "gtkdoc/$driver" \ + "gtkdoc/xml/gtkdocentities.ent"; do + [ -f "$file" ] || continue + $DEBUG $CP -- "$file" \ + "${OBJDIR}$file" || exit 2 + done + _gtkdoc_mkhtml "$MODULE" "${oldpath%/*}" "../$driver" \ + "$output" #detect when gtk-doc is not available res=$? if [ $res -eq 127 ]; then @@ -153,24 +234,7 @@ while [ $# -gt 0 ]; do exit 2 fi output="${OBJDIR}gtkdoc" - (cd "$output" && - $DEBUG $GTKDOC_FIXXREF \ - --module="$MODULE" \ - --module-dir="html" \ - --html-dir="$instdir") || exit 2 - ;; - gtkdoc/sgml.stamp) - output="xml" - if [ -n "$OBJDIR" ]; then - output="${OBJDIR}gtkdoc/xml" - $DEBUG $MKDIR -- "$output" || exit 2 - fi - (cd "${OBJDIR}gtkdoc" && - $DEBUG $GTKDOC_MKDB \ - --module="$MODULE" \ - --output-dir="$output" \ - --output-format="xml" \ - --tmpl-dir="tmpl") + _gtkdoc_fixxref "$MODULE" "html" "$instdir" "$output" ;; gtkdoc/tmpl.stamp) output="tmpl" @@ -178,22 +242,28 @@ while [ $# -gt 0 ]; do output="${OBJDIR}gtkdoc/tmpl" $DEBUG $MKDIR -- "$output" || exit 2 fi - (cd "${OBJDIR}gtkdoc" && - $DEBUG $GTKDOC_MKTMPL \ - --module="$MODULE" \ - --output-dir="$output") + _gtkdoc_mktmpl "$MODULE" "${OBJDIR}gtkdoc" "$output" + ;; + gtkdoc/xml.stamp) + output="xml" + if [ -n "$OBJDIR" ]; then + output="${OBJDIR}gtkdoc" + sections="gtkdoc/$MODULE-sections.txt" + $DEBUG $MKDIR -- "$output/xml" || exit 2 + $DEBUG $CP -- "$sections" "$output" \ + || exit 2 + _gtkdoc_scan "$MODULE" "include" "$output" + output="${OBJDIR}gtkdoc/xml" + fi + _gtkdoc_mkdb "$MODULE" "${OBJDIR}gtkdoc" "$output" ;; gtkdoc/*.types) - output="doc/gtkdoc" || exit 2 + output="$PWD/gtkdoc" || exit 2 if [ -n "$OBJDIR" ]; then output="${OBJDIR}gtkdoc" $DEBUG $MKDIR -- "$output" || exit 2 fi - (cd ".." && - $DEBUG $GTKDOC_SCAN \ - --module="$MODULE" \ - --source-dir="include" \ - --output-dir="$output") + _gtkdoc_scan "$MODULE" "include" "$output" ;; *) _error "$target: Unknown type" @@ -205,7 +275,7 @@ while [ $# -gt 0 ]; do _error "$target: Could not create documentation" install=0 fi - $TOUCH "$target" + $TOUCH "${OBJDIR}$target" #install if [ "$install" -eq 1 ]; then diff --git a/tests/fixme.sh b/tests/fixme.sh index b006fd0..84319cf 100755 --- a/tests/fixme.sh +++ b/tests/fixme.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2017 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,22 +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() { - ret=0 + res=0 + subdirs= $DATE echo @@ -55,68 +63,134 @@ _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= - case "$filename" in - *.asm|*.S) - callback="_fixme_asm" - ;; - *.c|*.h|*.js) - callback="_fixme_c" - ;; - *.conf|*.sh) - callback="_fixme_sh" - ;; - esac + callback=$(_fixme_callback "$filename") [ -n "$callback" ] || continue - $callback "$filename" 2>&1 + ($callback "$filename") 2>&1 if [ $? -ne 0 ]; then echo "$PROGNAME: $filename: FAIL" 1>&2 - ret=2 + res=2 fi done done - return $ret + return $res } -_fixme_asm() +_fixme_callback() { - retc=0 + 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() { @@ -169,9 +251,15 @@ fi [ $clean -ne 0 ] && exit 0 exec 3>&1 +ret=0 while [ $# -gt 0 ]; do target="$1" + dirname="${target%/*}" shift - _fixme > "$target" || exit 2 + if [ -n "$dirname" -a "$dirname" != "$target" ]; then + $MKDIR -- "$dirname" || ret=$? + fi + _fixme > "$target" || ret=$? done +exit $ret