diff --git a/doc/scripts/config.sh b/doc/scripts/config.sh new file mode 100644 index 0000000..72dd022 --- /dev/null +++ b/doc/scripts/config.sh @@ -0,0 +1 @@ +[ -f "../config.sh" ] && . "../config.sh" diff --git a/doc/scripts/data/pkgconfig.sh b/doc/scripts/data/pkgconfig.sh index 0dba39f..61a50f6 100755 --- a/doc/scripts/data/pkgconfig.sh +++ b/doc/scripts/data/pkgconfig.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2011-2019 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: @@ -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" diff --git a/doc/scripts/doc/docbook.sh b/doc/scripts/doc/docbook.sh index b247959..83bbf54 100755 --- a/doc/scripts/doc/docbook.sh +++ b/doc/scripts/doc/docbook.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2012-2017 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,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 diff --git a/doc/scripts/doc/gtkdoc.sh b/doc/scripts/doc/gtkdoc.sh index 0bdf102..6dc5b32 100755 --- a/doc/scripts/doc/gtkdoc.sh +++ b/doc/scripts/doc/gtkdoc.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/gtkdoc.sh}/../config.sh" PREFIX="/usr/local" PROGNAME="gtkdoc.sh" #executables @@ -41,7 +42,7 @@ RM="rm -f" RMDIR="rmdir" TOUCH="touch" -[ -f "../config.sh" ] && . "../config.sh" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" #functions diff --git a/doc/scripts/doc/markdown.sh b/doc/scripts/doc/markdown.sh index da3f013..fd23c5c 100755 --- a/doc/scripts/doc/markdown.sh +++ b/doc/scripts/doc/markdown.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2019 Pierre Pronchery +#Copyright (c) 2019-2020 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -36,6 +36,7 @@ MKDIR="mkdir -m 0755 -p" RM="rm -f" RST2HTML="rst2html5-2.7.py" RST2MAN="rst2man-2.7.py" + [ -f "$CONFIGSH" ] && . "$CONFIGSH" diff --git a/doc/scripts/po/gettext.sh b/doc/scripts/po/gettext.sh index 5f07dc2..d1b91a2 100755 --- a/doc/scripts/po/gettext.sh +++ b/doc/scripts/po/gettext.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2010-2017 Pierre Pronchery +#Copyright (c) 2010-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,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 diff --git a/doc/scripts/project.conf b/doc/scripts/project.conf index 3336560..6cd3ede 100644 --- a/doc/scripts/project.conf +++ b/doc/scripts/project.conf @@ -1,4 +1,4 @@ -dist=Makefile,data/pkgconfig.sh,doc/docbook.sh,doc/gtkdoc.sh,doc/manual.css.xml,doc/markdown.sh,po/gettext.sh,tests/clint.sh,tests/coverage.sh,tests/fixme.sh,tests/htmllint.sh,tests/phplint.sh,tests/pylint.sh,tests/shlint.sh,tests/xmllint.sh,tools/appbroker.sh,tools/platform.sh,tools/subst.sh,tools/template.sh +dist=Makefile,config.sh,data/pkgconfig.sh,doc/docbook.sh,doc/gtkdoc.sh,doc/manual.css.xml,doc/markdown.sh,po/gettext.sh,tests/clint.sh,tests/coverage.sh,tests/fixme.sh,tests/htmllint.sh,tests/phplint.sh,tests/pylint.sh,tests/shlint.sh,tests/xmllint.sh,tools/appbroker.sh,tools/platform.sh,tools/subst.sh,tools/template.sh #dist [data/pkgconfig.sh] diff --git a/doc/scripts/tests/clint.sh b/doc/scripts/tests/clint.sh index 1bf833f..a7d22ba 100755 --- a/doc/scripts/tests/clint.sh +++ b/doc/scripts/tests/clint.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/clint.sh}/../config.sh" CFLAGS= CPPFLAGS= PROGNAME="clint.sh" @@ -39,6 +40,8 @@ MKDIR="mkdir -p" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #clint diff --git a/doc/scripts/tests/coverage.sh b/doc/scripts/tests/coverage.sh index 13655f7..47ca517 100755 --- a/doc/scripts/tests/coverage.sh +++ b/doc/scripts/tests/coverage.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2018 Pierre Pronchery +#Copyright (c) 2018-2020 Pierre Pronchery #This file is part of DeforaOS System libSystem #All rights reserved. # @@ -30,6 +30,7 @@ #variables +CONFIGSH="${0%/coverage.sh}/../config.sh" CFLAGS= LDFLAGS= PROGNAME="coverage.sh" @@ -44,6 +45,8 @@ MKDIR="mkdir -p" MKTEMP="mktemp" RM="rm -f" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #coverage _coverage() diff --git a/doc/scripts/tests/fixme.sh b/doc/scripts/tests/fixme.sh index 3529a42..84319cf 100755 --- a/doc/scripts/tests/fixme.sh +++ b/doc/scripts/tests/fixme.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/fixme.sh}/../config.sh" PROGNAME="fixme.sh" PROJECTCONF="../project.conf" REGEXP_ERROR="FIXME" @@ -39,6 +40,8 @@ MKDIR="mkdir -p" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #fixme diff --git a/doc/scripts/tests/htmllint.sh b/doc/scripts/tests/htmllint.sh index 550b3f3..37975c3 100755 --- a/doc/scripts/tests/htmllint.sh +++ b/doc/scripts/tests/htmllint.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/htmllint.sh}/../config.sh" DEVNULL="/dev/null" PROGNAME="htmllint.sh" PROJECTCONF="../project.conf" @@ -37,6 +38,8 @@ MKDIR="mkdir -p" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #htmllint diff --git a/doc/scripts/tests/phplint.sh b/doc/scripts/tests/phplint.sh index 3ba82b9..1b53a1b 100755 --- a/doc/scripts/tests/phplint.sh +++ b/doc/scripts/tests/phplint.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/phplint.sh}/../config.sh" PROGNAME="phplint.sh" PROJECTCONF="../project.conf" #executables @@ -36,6 +37,8 @@ PHPLINT="php -l" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #phplint diff --git a/doc/scripts/tests/pylint.sh b/doc/scripts/tests/pylint.sh index 2f1fd96..6c5b99b 100755 --- a/doc/scripts/tests/pylint.sh +++ b/doc/scripts/tests/pylint.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/pylint.sh}/../config.sh" PROGNAME="pylint.sh" PROJECTCONF="../project.conf" #executables @@ -36,6 +37,8 @@ PYLINT="pep8" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #pylint diff --git a/doc/scripts/tests/shlint.sh b/doc/scripts/tests/shlint.sh index 8cf7e4c..586d237 100755 --- a/doc/scripts/tests/shlint.sh +++ b/doc/scripts/tests/shlint.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/shlint.sh}/../config.sh" PROGNAME="shlint.sh" PROJECTCONF="../project.conf" #executables @@ -36,6 +37,8 @@ SHLINT="sh -n" SORT="sort -n" TR="tr" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #shlint diff --git a/doc/scripts/tests/xmllint.sh b/doc/scripts/tests/xmllint.sh index c9302c0..6773845 100755 --- a/doc/scripts/tests/xmllint.sh +++ b/doc/scripts/tests/xmllint.sh @@ -25,6 +25,7 @@ #variables +CONFIGSH="${0%/xmllint.sh}/../config.sh" DEVNULL="/dev/null" PROGNAME="xmllint.sh" PROJECTCONF="../project.conf" @@ -37,6 +38,8 @@ SORT="sort -n" TR="tr" XMLLINT="xmllint --nonet" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #xmllint diff --git a/doc/scripts/tools/appbroker.sh b/doc/scripts/tools/appbroker.sh index c4c04bd..73e5af6 100755 --- a/doc/scripts/tools/appbroker.sh +++ b/doc/scripts/tools/appbroker.sh @@ -25,11 +25,14 @@ #variables +CONFIGSH="${0%/appbroker.sh}/../config.sh" PROGNAME="appbroker.sh" #executables APPBROKER="AppBroker" DEBUG="_debug" +[ -f "$CONFIGSH" ] && . "$CONFIGSH" + #functions #appbroker diff --git a/doc/scripts/tools/platform.sh b/doc/scripts/tools/platform.sh index dbd66fd..4348d40 100755 --- a/doc/scripts/tools/platform.sh +++ b/doc/scripts/tools/platform.sh @@ -33,6 +33,7 @@ PROGNAME="platform.sh" SOEXT= #executables UNAME="uname" + [ -f "$CONFIGSH" ] && . "$CONFIGSH" diff --git a/doc/scripts/tools/subst.sh b/doc/scripts/tools/subst.sh index 855251f..b309b15 100755 --- a/doc/scripts/tools/subst.sh +++ b/doc/scripts/tools/subst.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2012-2019 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: @@ -45,6 +45,7 @@ INSTALL="install" MKDIR="mkdir -m 0755 -p" RM="rm -f" SED="sed" + [ -f "$CONFIGSH" ] && . "$CONFIGSH" diff --git a/doc/scripts/tools/template.sh b/doc/scripts/tools/template.sh index cc037a8..fb2e5d7 100755 --- a/doc/scripts/tools/template.sh +++ b/doc/scripts/tools/template.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2019 Pierre Pronchery +#Copyright (c) 2019-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,7 +25,7 @@ #variables -CONFIGSH="${0%/template.sh}/../../config.sh" +CONFIGSH="${0%/template.sh}/../config.sh" PREFIX="/usr/local" DATABASEDIR="../data" PROGNAME="template.sh" @@ -34,6 +34,7 @@ DEBUG="_debug" INSTALL="install -m 0644" RM="rm -f" SED="sed" + [ -f "$CONFIGSH" ] && . "$CONFIGSH"