Import the newer scripts from DeforaOS configure

data/pkgconfig.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2011-2019 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2011-2020 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -27,14 +27,15 @@
 #variables
 CONFIGSH="${0%/pkgconfig.sh}/../config.sh"
 PREFIX="/usr/local"
-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"
 
 

doc/docbook.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2012-2017 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2012-2020 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -25,8 +25,8 @@
 
 
 #variables
+CONFIGSH="${0%/docbook.sh}/../config.sh"
 PREFIX="/usr/local"
-[ -f "../config.sh" ] && . "../config.sh"
 PROGNAME="docbook.sh"
 #executables
 DEBUG="_debug"
@@ -37,6 +37,8 @@ RM="rm -f"
 XMLLINT="xmllint"
 XSLTPROC="xsltproc --nonet --xinclude"
 
+[ -f "$CONFIGSH" ] && . "$CONFIGSH"
+
 
 #functions
 #debug

doc/gtkdoc.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2012-2017 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2012-2020 Pierre Pronchery <khorben@defora.org>
 #
 #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()
 {
@@ -129,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" &&
+			driver="$MODULE-docs.xml"
-				$DEBUG $GTKDOC_MKHTML "$MODULE" \
+			oldpath="$PWD"
-					"${OBJDIR}$driver")
+			[ -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
@@ -156,24 +234,7 @@ while [ $# -gt 0 ]; do
 				exit 2
 			fi
 			output="${OBJDIR}gtkdoc"
-			(cd "$output" &&
+			_gtkdoc_fixxref "$MODULE" "html" "$instdir" "$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/tmpl.stamp)
 			output="tmpl"
@@ -181,22 +242,28 @@ while [ $# -gt 0 ]; do
 				output="${OBJDIR}gtkdoc/tmpl"
 				$DEBUG $MKDIR -- "$output"	|| exit 2
 			fi
-			(cd "${OBJDIR}gtkdoc" &&
+			_gtkdoc_mktmpl "$MODULE" "${OBJDIR}gtkdoc" "$output"
-				$DEBUG $GTKDOC_MKTMPL \
+			;;
-					--module="$MODULE" \
+		gtkdoc/xml.stamp)
-					--output-dir="$output")
+			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 ".." &&
+			_gtkdoc_scan "$MODULE" "include" "$output"
-				$DEBUG $GTKDOC_SCAN \
-					--module="$MODULE" \
-					--source-dir="include" \
-					--output-dir="$output")
 			;;
 		*)
 			_error "$target: Unknown type"
@@ -208,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

po/gettext.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2010-2017 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2010-2020 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -25,8 +25,8 @@
 
 
 #variables
+CONFIGSH="${0%/gettext.sh}/../config.sh"
 PREFIX="/usr/local"
-[ -f "../config.sh" ] && . "../config.sh"
 LOCALEDIR="$PREFIX/share/locale"
 POTFILES="POTFILES"
 PROGNAME="gettext.sh"
@@ -40,6 +40,8 @@ MSGMERGE="msgmerge"
 RM="rm -f"
 XGETTEXT="xgettext --force-po"
 
+[ -f "$CONFIGSH" ] && . "$CONFIGSH"
+
 
 #functions
 #debug

tests/clint.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2016-2019 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2016-2020 Pierre Pronchery <khorben@defora.org>
 #
 #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%/clint.sh}/../config.sh"
 CFLAGS=
 CPPFLAGS=
 PROGNAME="clint.sh"
@@ -35,16 +36,19 @@ DEBUG="_debug"
 FIND="find"
 GREP="grep"
 LINT="lint -g"
+MKDIR="mkdir -p"
 SORT="sort -n"
 TR="tr"
 
+[ -f "$CONFIGSH" ] && . "$CONFIGSH"
+
 
 #functions
 #clint
 _clint()
 {
-	ret=0
+	res=0
-	subdirs="data doc src tests tools"
+	subdirs=
 
 	$DATE
 	while read line; do
@@ -58,6 +62,10 @@ _clint()
 				;;
 		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
@@ -79,13 +87,13 @@ _clint()
 			if [ $? -ne 0 ]; then
 				echo "FAIL"
 				echo "$PROGNAME: $filename: FAIL" 1>&2
-				ret=2
+				res=2
 			else
 				echo "OK"
 			fi
 		done
 	done
-	return $ret
+	return $res
 }
 
 _clint_lint()
@@ -117,6 +125,14 @@ _debug()
 }
 
 
+#error
+_error()
+{
+	echo "$PROGNAME: $@" 1>&2
+	return 2
+}
+
+
 #usage
 _usage()
 {
@@ -125,14 +141,6 @@ _usage()
 }
 
 
-#warning
-_warning()
-{
-	echo "$PROGNAME: $@" 1>&2
-	return 2
-}
-
-
 #main
 clean=0
 while getopts "cO:P:" name; do
@@ -162,9 +170,15 @@ fi
 [ $clean -ne 0 ] && exit 0
 
 exec 3>&1
+ret=0
 while [ $# -gt 0 ]; do
 	target="$1"
+	dirname="${target%/*}"
 	shift
 
-	_clint > "$target"					|| exit 2
+	if [ -n "$dirname" -a "$dirname" != "$target" ]; then
+		$MKDIR -- "$dirname"				|| ret=$?
+	fi
+	_clint > "$target"					|| ret=$?
 done
+exit $ret

tests/fixme.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2017-2019 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2017-2020 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -25,23 +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()
 {
 	res=0
+	subdirs=
 
 	$DATE
 	echo
@@ -56,27 +63,14 @@ _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=
+			callback=$(_fixme_callback "$filename")
-			ext=${filename##*/}
-			ext=${ext%.in}
-			ext=${ext##*.}
-			case "$ext" in
-				asm|S)
-					callback="_fixme_asm"
-					;;
-				c|cc|cpp|cxx|h|js)
-					callback="_fixme_c"
-					;;
-				conf|sh)
-					callback="_fixme_sh"
-					;;
-				htm|html|xml)
-					callback="_fixme_xml"
-					;;
-			esac
 			[ -n "$callback" ] || continue
 			($callback "$filename") 2>&1
 			if [ $? -ne 0 ]; then
@@ -88,54 +82,114 @@ _fixme()
 	return $res
 }
 
-_fixme_asm()
+_fixme_callback()
+{
+	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
+			;;
+		"<html"*|"<?xml"*)
+			echo "_fixme_callback_xml"
+			return 0
+			;;
+	esac
+	return 2
+}
+
+_fixme_callback_asm()
 {
 	res=0
 	filename="$1"
 
 	#warnings
-	$GREP -nH '/\*.*\(TODO\|XXX\)' "$filename"
+	$GREP -nH "/\\*.*$REGEXP_WARNING" "$filename"
 	#failures
-	$GREP -nH '/\*.*FIXME' "$filename" && res=2
+	$GREP -nH "/\\*.*$REGEXP_ERROR" "$filename" && res=2
 	return $res
 }
 
-_fixme_c()
+_fixme_callback_c()
 {
 	res=0
 	filename="$1"
 
 	#warnings
-	$GREP -nH '/\(/\|\*\).*\(TODO\|XXX\)' "$filename"
+	$GREP -nH "/\\(/\\|\\*\\).*$REGEXP_WARNING" "$filename"
 	#failures
-	$GREP -nH '/\(/\|\*\).*FIXME' "$filename" && res=2
+	$GREP -nH "/\\(/\\|\\*\\).*$REGEXP_ERROR" "$filename" && res=2
 	return $res
 }
 
-_fixme_sh()
+_fixme_callback_python()
 {
 	res=0
 	filename="$1"
-	#XXX avoid matching the regexp
 	comment="#"
 
 	#warnings
-	$GREP -nH "$comment.*\\(TODO\\|XXX\\)" "$filename"
+	$GREP -nH "$comment.*$REGEXP_WARNING" "$filename"
 	#failures
-	$GREP -nH "$comment.*FIXME" "$filename" && res=2
+	$GREP -nH "$comment.*$REGEXP_ERROR" "$filename" && res=2
 	return $res
 }
 
-_fixme_xml()
+_fixme_callback_sh()
+{
+	res=0
+	filename="$1"
+	comment="#"
+
+	#warnings
+	$GREP -nH "$comment.*$REGEXP_WARNING" "$filename"
+	#failures
+	$GREP -nH "$comment.*$REGEXP_ERROR" "$filename" && res=2
+	return $res
+}
+
+_fixme_callback_xml()
 {
 	res=0
 	filename="$1"
 
 	#XXX limited to a single line
 	#warnings
-	$GREP -nH '<!--.*\(TODO\|XXX\)' "$filename"
+	$GREP -nH "<!--.*$REGEXP_WARNING" "$filename"
 	#failures
-	$GREP -nH '<!--.*FIXME' "$filename" && res=2
+	$GREP -nH "<!--.*$REGEXP_ERROR" "$filename" && res=2
 	return $res
 }
 
@@ -152,6 +206,14 @@ _debug()
 }
 
 
+#error
+_error()
+{
+	echo "$PROGNAME: $@" 1>&2
+	return 2
+}
+
+
 #usage
 _usage()
 {

tests/xmllint.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2014-2017 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2014-2020 Pierre Pronchery <khorben@defora.org>
 #
 #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%/xmllint.sh}/../config.sh"
 DEVNULL="/dev/null"
 PROGNAME="xmllint.sh"
 PROJECTCONF="../project.conf"
@@ -32,16 +33,20 @@ PROJECTCONF="../project.conf"
 DATE="date"
 DEBUG="_debug"
 FIND="find"
+MKDIR="mkdir -p"
 SORT="sort -n"
 TR="tr"
 XMLLINT="xmllint --nonet"
 
+[ -f "$CONFIGSH" ] && . "$CONFIGSH"
+
 
 #functions
 #xmllint
 _xmllint()
 {
-	ret=0
+	res=0
+	subdirs=
 
 	$DATE
 	echo
@@ -56,6 +61,10 @@ _xmllint()
 				;;
 		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 -a \( -name '*.xml' -o -name '*.xsl' \) | $SORT); do
@@ -64,11 +73,11 @@ _xmllint()
 				echo "$filename:"
 			else
 				echo "$PROGNAME: $filename: FAIL" 1>&2
-				ret=2
+				res=2
 			fi
 		done
 	done
-	return $ret
+	return $res
 }
 
 
@@ -84,6 +93,14 @@ _debug()
 }
 
 
+#error
+_error()
+{
+	echo "$PROGNAME: $@" 1>&2
+	return 2
+}
+
+
 #usage
 _usage()
 {
@@ -121,9 +138,15 @@ fi
 [ $clean -ne 0 ] && exit 0
 
 exec 3>&1
+ret=0
 while [ $# -gt 0 ]; do
 	target="$1"
+	dirname="${target%/*}"
 	shift
 
-	_xmllint > "$target"					|| exit 2
+	if [ -n "$dirname" -a "$dirname" != "$target" ]; then
+		$MKDIR -- "$dirname"				|| ret=$?
+	fi
+	_xmllint > "$target"					|| ret=$?
 done
+exit $ret