From 04e8f21cd20622e8657602113ba34cbefbae6ce8 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 12 Mar 2025 17:09:57 +0100 Subject: [PATCH] App: provide the path to the plug-ins --- include/App/{app.h => app.h.in} | 4 + include/App/apptransport.h | 4 + include/App/project.conf | 16 ++- tools/project.conf | 2 +- tools/subst.sh | 213 ++++++++++++++++++++++++++++++++ 5 files changed, 233 insertions(+), 6 deletions(-) rename include/App/{app.h => app.h.in} (94%) create mode 100755 tools/subst.sh diff --git a/include/App/app.h b/include/App/app.h.in similarity index 94% rename from include/App/app.h rename to include/App/app.h.in index 2c19e70..e57e04f 100644 --- a/include/App/app.h +++ b/include/App/app.h.in @@ -25,4 +25,8 @@ typedef struct _App App; typedef struct _AppMessage AppMessage; + +/* constants */ +# define APP_PATH "@LIBDIR@/App" + #endif /* !LIBAPP_APP_APP_H */ diff --git a/include/App/apptransport.h b/include/App/apptransport.h index 309a8ef..7729d95 100644 --- a/include/App/apptransport.h +++ b/include/App/apptransport.h @@ -84,4 +84,8 @@ struct _AppTransportPluginDefinition AppTransportClient * client, AppMessage * message); }; + +/* constants */ +# define APP_TRANSPORT_PATH APP_PATH "/transport" + #endif /* !LIBAPP_APP_APPTRANSPORT_H */ diff --git a/include/App/project.conf b/include/App/project.conf index d01db43..de03f52 100644 --- a/include/App/project.conf +++ b/include/App/project.conf @@ -1,9 +1,8 @@ -includes=app.h,appclient.h,appmessage.h,appserver.h,appstatus.h,apptransport.h -dist=Makefile - -[app.h] -install=$(INCLUDEDIR)/System/App +includes=appclient.h,appmessage.h,appserver.h,appstatus.h,apptransport.h +targets=app.h +dist=Makefile,app.h.in +#includes [appclient.h] install=$(INCLUDEDIR)/System/App @@ -18,3 +17,10 @@ install=$(INCLUDEDIR)/System/App [apptransport.h] install=$(INCLUDEDIR)/System/App + +#targets +[app.h] +type=script +script=../../tools/subst.sh +install=$(INCLUDEDIR)/System/App +depends=app.h.in,../../config.sh diff --git a/tools/project.conf b/tools/project.conf index 55841ef..327ccfe 100644 --- a/tools/project.conf +++ b/tools/project.conf @@ -5,7 +5,7 @@ cflags_force=`pkg-config --cflags libSystem libMarshall` cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector ldflags_force=-L$(OBJDIR)../src `pkg-config --libs libSystem libMarshall` -lApp ldflags=-pie -Wl,-z,relro -Wl,-z,now -dist=Makefile +dist=Makefile,tools.sh #targets [AppBroker] diff --git a/tools/subst.sh b/tools/subst.sh new file mode 100755 index 0000000..680fa15 --- /dev/null +++ b/tools/subst.sh @@ -0,0 +1,213 @@ +#!/bin/sh +#$Id$ +#Copyright (c) 2012-2022 Pierre Pronchery +# +#Redistribution and use in source and binary forms, with or without +#modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +#AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +#IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +#DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +#FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +#DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +#SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +#OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +#OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +#variables +CONFIGSH="${0%/subst.sh}/../config.sh" +PREFIX="/usr/local" +BINDIR= +DATADIR= +DEVNULL="/dev/null" +INCLUDEDIR= +LDSO= +LIBDIR= +LIBEXECDIR= +MANDIR= +PROGNAME="subst.sh" +SBINDIR= +SYSCONFDIR= +#executables +CHMOD="chmod" +DATE="date" +DEBUG="_debug" +INSTALL="install" +MKDIR="mkdir -m 0755 -p" +RM="rm -f" +SED="sed" + +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + + +#functions +#subst +_subst() +{ + #check the variables + if [ -z "$PACKAGE" ]; then + _error "The PACKAGE variable needs to be set" + return $? + fi + if [ -z "$VERSION" ]; then + _error "The VERSION variable needs to be set" + return $? + fi + [ -z "$BINDIR" ] && BINDIR="$PREFIX/bin" + [ -z "$DATADIR" ] && DATADIR="$PREFIX/share" + [ -z "$INCLUDEDIR" ] && INCLUDEDIR="$PREFIX/include" + if [ -z "$LDSO" ]; then + case "$(uname -s)" in + FreeBSD) + LDSO="/libexec/ld-elf.so.1" + ;; + Linux) + LDSO="/lib/ld-linux-$(uname -m | tr _ -).so.2" + ;; + *) + LDSO="/libexec/ld.elf_so" + ;; + esac + fi + [ -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 + [ -z "$SBINDIR" ] && SBINDIR="$PREFIX/sbin" + + while [ $# -gt 0 ]; do + target="$1" + shift + + #clean + [ "$clean" -ne 0 ] && continue + + #uninstall + if [ "$uninstall" -eq 1 ]; then + $DEBUG $RM -- "$PREFIX/$target" || return 2 + continue + fi + + #install + if [ "$install" -eq 1 ]; then + source="${target#$OBJDIR}" + $DEBUG $MKDIR -- "$PREFIX" || return 2 + mode="-m 0644" + [ -x "${source}.in" ] && mode="-m 0755" + $DEBUG $INSTALL $mode "$target" "$PREFIX/$source" \ + || return 2 + continue + fi + + #create + source="${target#$OBJDIR}" + source="${source}.in" + ([ -z "$OBJDIR" ] || $DEBUG $MKDIR -- "${target%/*}") \ + || return 2 + $DEBUG $SED -e "s;@VENDOR@;$VENDOR;g" \ + -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;@DATE@;$DATE;g" \ + -e "s;@INCLUDEDIR@;$INCLUDEDIR;g" \ + -e "s;@LDSO@;$LDSO;g" \ + -e "s;@LIBDIR@;$LIBDIR;g" \ + -e "s;@LIBEXECDIR@;$LIBEXECDIR;g" \ + -e "s;@MANDIR@;$MANDIR;g" \ + -e "s;@PWD@;$PWD;g" \ + -e "s;@SBINDIR@;$SBINDIR;g" \ + -e "s;@SYSCONFDIR@;$SYSCONFDIR;g" \ + -- "$source" > "$target" + if [ $? -ne 0 ]; then + $RM -- "$target" 2> "$DEVNULL" + return 2 + elif [ -x "$source" ]; then + $DEBUG $CHMOD -- 0755 "$target" + fi + done + return 0 +} + + +#debug +_debug() +{ + echo "$@" 1>&3 + "$@" +} + + +#error +_error() +{ + echo "$PROGNAME: $@" 1>&2 + return 2 +} + + +#usage +_usage() +{ + echo "Usage: $PROGNAME [-c|-i|-u][-P prefix] target..." 1>&2 + return 1 +} + + +#main +clean=0 +install=0 +uninstall=0 +while getopts "ciuO:P:" name; do + case $name in + c) + clean=1 + ;; + i) + uninstall=0 + install=1 + ;; + u) + install=0 + uninstall=1 + ;; + O) + export "${OPTARG%%=*}"="${OPTARG#*=}" + ;; + P) + PREFIX="$OPTARG" + ;; + ?) + _usage + exit $? + ;; + esac +done +shift $(($OPTIND - 1)) +if [ $# -lt 1 ]; then + _usage + exit $? +fi + +if [ -n "$SOURCE_DATE_EPOCH" ]; then + DATE="$($DATE -d "@$SOURCE_DATE_EPOCH" '+%B %d, %Y')" +else + DATE="$($DATE '+%B %d, %Y')" +fi + +exec 3>&1 +_subst "$@"