tests: move the pkgconfig test to a separate script

Author: khorben

project.conf

@@ -16,7 +16,7 @@ title=Release
 #targets
 [tests]
 type=command
-command=cd tests && (if [ -n "$(OBJDIR)" ]; then $(MAKE) OBJDIR="$(OBJDIR)tests/" "$(OBJDIR)tests/clint.log" "$(OBJDIR)tests/fixme.log" "$(OBJDIR)tests/pylint.log" "$(OBJDIR)tests/tests.log"; else $(MAKE) clint.log fixme.log pylint.log tests.log; fi)
+command=cd tests && (if [ -n "$(OBJDIR)" ]; then $(MAKE) OBJDIR="$(OBJDIR)tests/" "$(OBJDIR)tests/clint.log" "$(OBJDIR)tests/fixme.log" "$(OBJDIR)tests/pkgconfig.log" "$(OBJDIR)tests/pylint.log" "$(OBJDIR)tests/tests.log"; else $(MAKE) clint.log fixme.log pkgconfig.log pylint.log tests.log; fi)
 depends=all
 enabled=0
 phony=1

tests/pkgconfig.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2016 Pierre Pronchery <[email protected]>
+#Copyright (c) 2016-2025 Pierre Pronchery <[email protected]>
 #This file is part of DeforaOS Desktop libDesktop
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -23,35 +23,94 @@
 #OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+
 #variables
-PACKAGE="libSystem"
+CONFIGSH="${0%/pkgconfig.sh}/../config.sh"
 PKG_CONFIG_PATH="$OBJDIR../data:$PKG_CONFIG_PATH"
 PKG_CONFIG_PATH="${PKG_CONFIG_PATH%:}"
+PROGNAME="pkgconfig.sh"
 #executables
+ECHO="echo"
 PKGCONFIG="pkg-config"
+UNAME="uname"
+[ "$($UNAME -s)" != "Darwin" ] || ECHO="/bin/echo"
+
+[ -f "$CONFIGSH" ] && . "$CONFIGSH"
+
 
+#functions
+#pkgconfig
 _pkgconfig()
-{
+{(
 	ret=0
+
+	_pkgconfig_do "EXISTS:" --exists "$PACKAGE"		|| return 2
+
+	_pkgconfig_do "VERSION:" --modversion "$PACKAGE"	|| ret=3
+	_pkgconfig_do "CFLAGS:	" --cflags "$PACKAGE"		|| ret=4
+	_pkgconfig_do "LIBS:	" --libs "$PACKAGE"		|| ret=5
+	_pkgconfig_do "PROVIDES:" --print-provides "$PACKAGE"	|| ret=6
+	_pkgconfig_do "REQUIRES:" --print-requires "$PACKAGE"	|| ret=7
+	return $ret
+)}
+
+_pkgconfig_do()
+{
 	caption="$1"
 	options="$2"
 	packages="$3"
 
-	echo -n "$caption"
-	output=$(PKG_CONFIG_PATH="$PKG_CONFIG_PATH" $PKGCONFIG $options "$packages")
-	ret=$?
-	echo "$output"
-	return $ret
+	$ECHO -n "$caption"
+	PKG_CONFIG_PATH="$PKG_CONFIG_PATH" $PKGCONFIG $options "$packages"
 }
 
-_pkgconfig "EXISTS:" --exists "$PACKAGE"			|| exit 2
 
-ret=0
+#usage
+_usage()
+{
+	echo "Usage: $PROGNAME [-c] target..." 1>&2
+	return 1
+}
 
-_pkgconfig "VERSION:" --modversion "$PACKAGE"			|| ret=3
-_pkgconfig "CFLAGS:	" --cflags "$PACKAGE"			|| ret=4
-_pkgconfig "LIBS:	" --libs "$PACKAGE"			|| ret=5
-_pkgconfig "PROVIDES:" --print-provides "$PACKAGE"		|| ret=6
-_pkgconfig "REQUIRES:" --print-requires "$PACKAGE"		|| ret=7
 
+#main
+clean=0
+while getopts "cO:P:" name; do
+	case "$name" in
+		c)
+			clean=1
+			;;
+		O)
+			export "${OPTARG%%=*}"="${OPTARG#*=}"
+			;;
+		P)
+			#XXX ignored for compatibility
+			;;
+		?)
+			_usage
+			exit $?
+			;;
+	esac
+done
+shift $((OPTIND - 1))
+if [ $# -lt 1 ]; then
+	_usage
+	exit $?
+fi
+
+#clean
+[ $clean -ne 0 ] && exit 0
+
+exec 3>&1
+ret=0
+while [ $# -gt 0 ]; do
+	target="$1"
+	dirname="${target%/*}"
+	shift
+
+	if [ -n "$dirname" -a "$dirname" != "$target" ]; then
+		$MKDIR -- "$dirname"				|| ret=$?
+	fi
+	_pkgconfig > "$target"					|| ret=$?
+done
 exit $ret

tests/project.conf

@@ -1,4 +1,4 @@
-targets=array,buffer,clint.log,config,coverage.log,error,event,fixme.log,includes,parser,pylint.log,string,variable,tests.log
+targets=array,buffer,clint.log,config,coverage.log,error,event,fixme.log,includes,parser,pkgconfig.log,pylint.log,string,variable,tests.log
 cppflags_force=-I ../include
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=-L$(OBJDIR)../src -L$(OBJDIR)../src/.libs -Wl,-rpath,$(OBJDIR)../src -lSystem `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l dl` `../tools/platform.sh -O DESTDIR="$(DESTDIR)" -l m`
@@ -56,6 +56,12 @@ sources=includes.c
 type=binary
 sources=parser.c
 
+[pkgconfig.log]
+type=script
+script=./pkgconfig.sh
+enabled=0
+depends=$(OBJDIR)../data/libSystem.pc,pkgconfig.sh
+
 [pylint.log]
 type=script
 script=./pylint.sh
@@ -70,7 +76,7 @@ sources=string.c
 type=script
 script=./tests.sh
 enabled=0
-depends=$(OBJDIR)array$(EXEEXT),$(OBJDIR)buffer$(EXEEXT),$(OBJDIR)config$(EXEEXT),config.conf,config-noeol.conf,$(OBJDIR)error$(EXEEXT),$(OBJDIR)event$(EXEEXT),$(OBJDIR)includes$(EXEEXT),$(OBJDIR)parser$(EXEEXT),pkgconfig.sh,python.sh,$(OBJDIR)string$(EXEEXT),tests.sh,$(OBJDIR)variable$(EXEEXT),$(OBJDIR)../src/libSystem.a,../src/python/libSystem.c
+depends=$(OBJDIR)array$(EXEEXT),$(OBJDIR)buffer$(EXEEXT),$(OBJDIR)config$(EXEEXT),config.conf,config-noeol.conf,$(OBJDIR)error$(EXEEXT),$(OBJDIR)event$(EXEEXT),$(OBJDIR)includes$(EXEEXT),$(OBJDIR)parser$(EXEEXT),python.sh,$(OBJDIR)string$(EXEEXT),tests.sh,$(OBJDIR)variable$(EXEEXT),$(OBJDIR)../src/libSystem.a,../src/python/libSystem.c
 
 [variable]
 type=binary

tests/tests.sh

@@ -125,12 +125,12 @@ failures=
 $PKGCONFIG --exists "python-2.7"
 case $? in
 	127)
-		failures="pkgconfig.sh python.sh"
+		failures="python.sh"
 		;;
 	0)
 		if [ -n "$PKG_CONFIG_SYSROOT_DIR" ]; then
 			#XXX cross-compiling
-			tests="pkgconfig.sh python.sh"
+			tests="python.sh"
 		fi
 		;;
 	*)