From f611c2acf7992bb07ddeefaa486f5cf9c226e91b Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Tue, 2 Oct 2012 09:54:56 +0000 Subject: [PATCH] Update build system --- README | 10 ++++++---- config | 7 +++---- make.sh | 9 ++++----- run-test.sh | 16 ++++++++-------- scripts/.gitignore | 1 + scripts/functions.sh | 7 +++---- scripts/paths | 7 +++---- src/daemonitor/build.app | 3 +-- src/daemonitor/build.install-app | 1 - src/daemonitor/build.monolithic | 1 - version | 9 ++++----- 11 files changed, 33 insertions(+), 38 deletions(-) diff --git a/README b/README index 41e1684..4c9c22a 100644 --- a/README +++ b/README @@ -1,8 +1,10 @@ daemonitor -============================================================================== -(c)2007, Laurence Withers, . -Released under the GNU GPLv3. See file COPYING or -http://www.gnu.org/copyleft/gpl.html for details. +======================================================================== +Copyright: ©2007–2012, Güralp Systems Limited +Author: Laurence Withers +License: GPLv3 + +See file COPYING for detail license information. Really Quick Instructions ------------------------- diff --git a/config b/config index ca23c9e..246b047 100644 --- a/config +++ b/config @@ -1,10 +1,9 @@ # daemonitor/config -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: syntax=sh:expandtab:ts=4:sw=4 # -# (c)2007, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# Copyright: ©2007–2012, Güralp Systems Limited +# Author: Laurence Withers +# License: GPLv3 # # This file contains options used to build daemonitor. diff --git a/make.sh b/make.sh index 499cbcc..e33fc32 100755 --- a/make.sh +++ b/make.sh @@ -1,9 +1,9 @@ #!/bin/bash # daemonitor/make.sh -# -# (c)2009, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# +# Copyright: ©2007–2012, Güralp Systems Limited +# Author: Laurence Withers +# License: GPLv3 # @@ -292,5 +292,4 @@ done exit 0 -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: expandtab:ts=4:sw=4 diff --git a/run-test.sh b/run-test.sh index 074457c..c54a0e4 100755 --- a/run-test.sh +++ b/run-test.sh @@ -1,9 +1,9 @@ #!/bin/bash # daemonitor/test.sh -# -# (c)2009, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# +# Copyright: ©2007–2012, Güralp Systems Limited +# Author: Laurence Withers +# License: GPLv3 # # Running this script on its own will display a summary of all the @@ -21,7 +21,7 @@ run_test() { return 1 fi - LD_LIBRARY_PATH="obj" "${EXE}" "$@" || return 1 + LD_LIBRARY_PATH="obj:${LD_LIBRARY_PATH}" "${EXE}" "$@" || return 1 return 0 } @@ -36,11 +36,12 @@ print_tests() { [ -x "${EXE}" ] || continue NAME="$(echo "${EXE}" | sed 's,obj/tests/,,')" echo -ne "${NAME}\t" - LD_LIBRARY_PATH="obj" "${EXE}" --print-summary + LD_LIBRARY_PATH="obj:${LD_LIBRARY_PATH}" "${EXE}" --print-summary done } + # Main script if [ $# -eq 0 ] then @@ -48,7 +49,6 @@ then exit 0 fi -run_test $* +run_test "$@" -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: expandtab:ts=4:sw=4 diff --git a/scripts/.gitignore b/scripts/.gitignore index edcbbeb..b9fcf56 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -7,6 +7,7 @@ build.docs.none build.files.none build.firmware.gpasm build.firmware.sdcc +build.header.c build.lib.c build.lib.c++ build.make.none diff --git a/scripts/functions.sh b/scripts/functions.sh index d16f446..81c05f1 100644 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -1,8 +1,8 @@ # daemonitor/scripts/functions.sh # -# (c)2007, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# Copyright: ©2007–2012, Güralp Systems Limited +# Author: Laurence Withers, +# License: GPLv3 # # Common functions @@ -63,5 +63,4 @@ do_cmd_redir() { fi } -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: expandtab:ts=4:sw=4 diff --git a/scripts/paths b/scripts/paths index 484627c..8f905a4 100644 --- a/scripts/paths +++ b/scripts/paths @@ -1,8 +1,8 @@ # daemonitor/scripts/paths # -# (c)2007, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# Copyright: ©2007–2012, Güralp Systems Limited +# Author: Laurence Withers, +# License: GPLv3 # # Default path setup. Not meant for editing; use environment variables # to override values if needed. @@ -60,5 +60,4 @@ fi [ -z "${WEBDIR}" ] && WEBDIR="${SRVDIR}/http" [ -z "${CGIDIR}" ] && CGIDIR="${WEBDIR}/cgi-bin" -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/src/daemonitor/build.app b/src/daemonitor/build.app index 41d452e..4d47da9 100644 --- a/src/daemonitor/build.app +++ b/src/daemonitor/build.app @@ -6,7 +6,7 @@ if [ -z ${daemonitor_BUILT} ] then daemonitor="obj/daemonitor" - EXTRAS="-D_GNU_SOURCE" + EXTRAS="-std=gnu99 -D_GNU_SOURCE -DAPP_NAME=\"daemonitor\"" echo "Building application ${daemonitor}..." @@ -37,5 +37,4 @@ then fi -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/src/daemonitor/build.install-app b/src/daemonitor/build.install-app index c4a44be..ee06605 100644 --- a/src/daemonitor/build.install-app +++ b/src/daemonitor/build.install-app @@ -8,5 +8,4 @@ echo "Installing binaries into '${SBINDIR}'" install_file "${daemonitor}" "${SBINDIR}" 0755 || return 1 print_success "Done" -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/src/daemonitor/build.monolithic b/src/daemonitor/build.monolithic index 8db384e..0f3e681 100644 --- a/src/daemonitor/build.monolithic +++ b/src/daemonitor/build.monolithic @@ -14,5 +14,4 @@ then MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}" fi -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: syntax=sh:expandtab:ts=4:sw=4 diff --git a/version b/version index 6d353e9..eee5d05 100644 --- a/version +++ b/version @@ -1,8 +1,8 @@ # daemonitor/version -# -# (c)2007, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# +# Copyright: ©2007–2012, Güralp Systems Limited +# Author: Laurence Withers +# License: GPLv3 # @@ -13,5 +13,4 @@ VERMAJOR=1 VERMINOR=0 VERMICRO=2 -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: expandtab:ts=4:sw=4:syntax=sh