Unify the scripts some more

This commit is contained in:
Pierre Pronchery 2020-11-19 02:18:01 +01:00
parent 3ba2c65efc
commit a06e4715e4
19 changed files with 51 additions and 13 deletions

1
doc/scripts/config.sh Normal file
View File

@ -0,0 +1 @@
[ -f "../config.sh" ] && . "../config.sh"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$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 #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -27,14 +27,15 @@
#variables #variables
CONFIGSH="${0%/pkgconfig.sh}/../config.sh" CONFIGSH="${0%/pkgconfig.sh}/../config.sh"
PREFIX="/usr/local" PREFIX="/usr/local"
DEBUG="_debug"
DEVNULL="/dev/null" DEVNULL="/dev/null"
PROGNAME="pkgconfig.sh" PROGNAME="pkgconfig.sh"
#executables #executables
DEBUG="_debug"
INSTALL="install -m 0644" INSTALL="install -m 0644"
MKDIR="mkdir -m 0755 -p" MKDIR="mkdir -m 0755 -p"
RM="rm -f" RM="rm -f"
SED="sed" SED="sed"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"

View File

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

View File

@ -25,6 +25,7 @@
#variables #variables
CONFIGSH="${0%/gtkdoc.sh}/../config.sh"
PREFIX="/usr/local" PREFIX="/usr/local"
PROGNAME="gtkdoc.sh" PROGNAME="gtkdoc.sh"
#executables #executables
@ -41,7 +42,7 @@ RM="rm -f"
RMDIR="rmdir" RMDIR="rmdir"
TOUCH="touch" TOUCH="touch"
[ -f "../config.sh" ] && . "../config.sh" [ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2019 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2019-2020 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -36,6 +36,7 @@ MKDIR="mkdir -m 0755 -p"
RM="rm -f" RM="rm -f"
RST2HTML="rst2html5-2.7.py" RST2HTML="rst2html5-2.7.py"
RST2MAN="rst2man-2.7.py" RST2MAN="rst2man-2.7.py"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"

View File

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

View File

@ -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 #dist
[data/pkgconfig.sh] [data/pkgconfig.sh]

View File

@ -25,6 +25,7 @@
#variables #variables
CONFIGSH="${0%/clint.sh}/../config.sh"
CFLAGS= CFLAGS=
CPPFLAGS= CPPFLAGS=
PROGNAME="clint.sh" PROGNAME="clint.sh"
@ -39,6 +40,8 @@ MKDIR="mkdir -p"
SORT="sort -n" SORT="sort -n"
TR="tr" TR="tr"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
#clint #clint

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2018 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2018-2020 Pierre Pronchery <khorben@defora.org>
#This file is part of DeforaOS System libSystem #This file is part of DeforaOS System libSystem
#All rights reserved. #All rights reserved.
# #
@ -30,6 +30,7 @@
#variables #variables
CONFIGSH="${0%/coverage.sh}/../config.sh"
CFLAGS= CFLAGS=
LDFLAGS= LDFLAGS=
PROGNAME="coverage.sh" PROGNAME="coverage.sh"
@ -44,6 +45,8 @@ MKDIR="mkdir -p"
MKTEMP="mktemp" MKTEMP="mktemp"
RM="rm -f" RM="rm -f"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#coverage #coverage
_coverage() _coverage()

View File

@ -25,6 +25,7 @@
#variables #variables
CONFIGSH="${0%/fixme.sh}/../config.sh"
PROGNAME="fixme.sh" PROGNAME="fixme.sh"
PROJECTCONF="../project.conf" PROJECTCONF="../project.conf"
REGEXP_ERROR="FIXME" REGEXP_ERROR="FIXME"
@ -39,6 +40,8 @@ MKDIR="mkdir -p"
SORT="sort -n" SORT="sort -n"
TR="tr" TR="tr"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
#fixme #fixme

View File

@ -25,6 +25,7 @@
#variables #variables
CONFIGSH="${0%/htmllint.sh}/../config.sh"
DEVNULL="/dev/null" DEVNULL="/dev/null"
PROGNAME="htmllint.sh" PROGNAME="htmllint.sh"
PROJECTCONF="../project.conf" PROJECTCONF="../project.conf"
@ -37,6 +38,8 @@ MKDIR="mkdir -p"
SORT="sort -n" SORT="sort -n"
TR="tr" TR="tr"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
#htmllint #htmllint

View File

@ -25,6 +25,7 @@
#variables #variables
CONFIGSH="${0%/phplint.sh}/../config.sh"
PROGNAME="phplint.sh" PROGNAME="phplint.sh"
PROJECTCONF="../project.conf" PROJECTCONF="../project.conf"
#executables #executables
@ -36,6 +37,8 @@ PHPLINT="php -l"
SORT="sort -n" SORT="sort -n"
TR="tr" TR="tr"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
#phplint #phplint

View File

@ -25,6 +25,7 @@
#variables #variables
CONFIGSH="${0%/pylint.sh}/../config.sh"
PROGNAME="pylint.sh" PROGNAME="pylint.sh"
PROJECTCONF="../project.conf" PROJECTCONF="../project.conf"
#executables #executables
@ -36,6 +37,8 @@ PYLINT="pep8"
SORT="sort -n" SORT="sort -n"
TR="tr" TR="tr"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
#pylint #pylint

View File

@ -25,6 +25,7 @@
#variables #variables
CONFIGSH="${0%/shlint.sh}/../config.sh"
PROGNAME="shlint.sh" PROGNAME="shlint.sh"
PROJECTCONF="../project.conf" PROJECTCONF="../project.conf"
#executables #executables
@ -36,6 +37,8 @@ SHLINT="sh -n"
SORT="sort -n" SORT="sort -n"
TR="tr" TR="tr"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
#shlint #shlint

View File

@ -25,6 +25,7 @@
#variables #variables
CONFIGSH="${0%/xmllint.sh}/../config.sh"
DEVNULL="/dev/null" DEVNULL="/dev/null"
PROGNAME="xmllint.sh" PROGNAME="xmllint.sh"
PROJECTCONF="../project.conf" PROJECTCONF="../project.conf"
@ -37,6 +38,8 @@ SORT="sort -n"
TR="tr" TR="tr"
XMLLINT="xmllint --nonet" XMLLINT="xmllint --nonet"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
#xmllint #xmllint

View File

@ -25,11 +25,14 @@
#variables #variables
CONFIGSH="${0%/appbroker.sh}/../config.sh"
PROGNAME="appbroker.sh" PROGNAME="appbroker.sh"
#executables #executables
APPBROKER="AppBroker" APPBROKER="AppBroker"
DEBUG="_debug" DEBUG="_debug"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
#appbroker #appbroker

View File

@ -33,6 +33,7 @@ PROGNAME="platform.sh"
SOEXT= SOEXT=
#executables #executables
UNAME="uname" UNAME="uname"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2012-2019 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 #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -45,6 +45,7 @@ INSTALL="install"
MKDIR="mkdir -m 0755 -p" MKDIR="mkdir -m 0755 -p"
RM="rm -f" RM="rm -f"
SED="sed" SED="sed"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2019 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2019-2020 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -25,7 +25,7 @@
#variables #variables
CONFIGSH="${0%/template.sh}/../../config.sh" CONFIGSH="${0%/template.sh}/../config.sh"
PREFIX="/usr/local" PREFIX="/usr/local"
DATABASEDIR="../data" DATABASEDIR="../data"
PROGNAME="template.sh" PROGNAME="template.sh"
@ -34,6 +34,7 @@ DEBUG="_debug"
INSTALL="install -m 0644" INSTALL="install -m 0644"
RM="rm -f" RM="rm -f"
SED="sed" SED="sed"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"