Update build system

This commit is contained in:
Laurence Withers 2012-10-02 09:54:56 +00:00
parent 4a50315f12
commit f611c2acf7
11 changed files with 33 additions and 38 deletions

10
README
View File

@ -1,8 +1,10 @@
daemonitor daemonitor
============================================================================== ========================================================================
(c)2007, Laurence Withers, <l@lwithers.me.uk>. Copyright: ©20072012, Güralp Systems Limited
Released under the GNU GPLv3. See file COPYING or Author: Laurence Withers <lwithers@guralp.com>
http://www.gnu.org/copyleft/gpl.html for details. License: GPLv3
See file COPYING for detail license information.
Really Quick Instructions Really Quick Instructions
------------------------- -------------------------

7
config
View File

@ -1,10 +1,9 @@
# daemonitor/config # daemonitor/config
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
# vim: syntax=sh:expandtab:ts=4:sw=4 # vim: syntax=sh:expandtab:ts=4:sw=4
# #
# (c)2007, Laurence Withers, <l@lwithers.me.uk>. # Copyright: ©20072012, Güralp Systems Limited
# Released under the GNU GPLv3. See file COPYING or # Author: Laurence Withers <lwithers@guralp.com>
# http://www.gnu.org/copyleft/gpl.html for details. # License: GPLv3
# #
# This file contains options used to build daemonitor. # This file contains options used to build daemonitor.

View File

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
# daemonitor/make.sh # daemonitor/make.sh
# #
# (c)2009, Laurence Withers, <l@lwithers.me.uk>. # Copyright: ©20072012, Güralp Systems Limited
# Released under the GNU GPLv3. See file COPYING or # Author: Laurence Withers <lwithers@guralp.com>
# http://www.gnu.org/copyleft/gpl.html for details. # License: GPLv3
# #
@ -292,5 +292,4 @@ done
exit 0 exit 0
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
# vim: expandtab:ts=4:sw=4 # vim: expandtab:ts=4:sw=4

View File

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
# daemonitor/test.sh # daemonitor/test.sh
# #
# (c)2009, Laurence Withers, <l@lwithers.me.uk>. # Copyright: ©20072012, Güralp Systems Limited
# Released under the GNU GPLv3. See file COPYING or # Author: Laurence Withers <lwithers@guralp.com>
# http://www.gnu.org/copyleft/gpl.html for details. # License: GPLv3
# #
# Running this script on its own will display a summary of all the # Running this script on its own will display a summary of all the
@ -21,7 +21,7 @@ run_test() {
return 1 return 1
fi fi
LD_LIBRARY_PATH="obj" "${EXE}" "$@" || return 1 LD_LIBRARY_PATH="obj:${LD_LIBRARY_PATH}" "${EXE}" "$@" || return 1
return 0 return 0
} }
@ -36,11 +36,12 @@ print_tests() {
[ -x "${EXE}" ] || continue [ -x "${EXE}" ] || continue
NAME="$(echo "${EXE}" | sed 's,obj/tests/,,')" NAME="$(echo "${EXE}" | sed 's,obj/tests/,,')"
echo -ne "${NAME}\t" echo -ne "${NAME}\t"
LD_LIBRARY_PATH="obj" "${EXE}" --print-summary LD_LIBRARY_PATH="obj:${LD_LIBRARY_PATH}" "${EXE}" --print-summary
done done
} }
# Main script # Main script
if [ $# -eq 0 ] if [ $# -eq 0 ]
then then
@ -48,7 +49,6 @@ then
exit 0 exit 0
fi fi
run_test $* run_test "$@"
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
# vim: expandtab:ts=4:sw=4 # vim: expandtab:ts=4:sw=4

1
scripts/.gitignore vendored
View File

@ -7,6 +7,7 @@ build.docs.none
build.files.none build.files.none
build.firmware.gpasm build.firmware.gpasm
build.firmware.sdcc build.firmware.sdcc
build.header.c
build.lib.c build.lib.c
build.lib.c++ build.lib.c++
build.make.none build.make.none

View File

@ -1,8 +1,8 @@
# daemonitor/scripts/functions.sh # daemonitor/scripts/functions.sh
# #
# (c)2007, Laurence Withers, <l@lwithers.me.uk>. # Copyright: ©20072012, Güralp Systems Limited
# Released under the GNU GPLv3. See file COPYING or # Author: Laurence Withers, <lwithers@guralp.com>
# http://www.gnu.org/copyleft/gpl.html for details. # License: GPLv3
# #
# Common functions # Common functions
@ -63,5 +63,4 @@ do_cmd_redir() {
fi fi
} }
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
# vim: expandtab:ts=4:sw=4 # vim: expandtab:ts=4:sw=4

View File

@ -1,8 +1,8 @@
# daemonitor/scripts/paths # daemonitor/scripts/paths
# #
# (c)2007, Laurence Withers, <l@lwithers.me.uk>. # Copyright: ©20072012, Güralp Systems Limited
# Released under the GNU GPLv3. See file COPYING or # Author: Laurence Withers, <lwithers@guralp.com>
# http://www.gnu.org/copyleft/gpl.html for details. # License: GPLv3
# #
# Default path setup. Not meant for editing; use environment variables # Default path setup. Not meant for editing; use environment variables
# to override values if needed. # to override values if needed.
@ -60,5 +60,4 @@ fi
[ -z "${WEBDIR}" ] && WEBDIR="${SRVDIR}/http" [ -z "${WEBDIR}" ] && WEBDIR="${SRVDIR}/http"
[ -z "${CGIDIR}" ] && CGIDIR="${WEBDIR}/cgi-bin" [ -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 # vim: syntax=sh:expandtab:ts=4:sw=4

View File

@ -6,7 +6,7 @@
if [ -z ${daemonitor_BUILT} ] if [ -z ${daemonitor_BUILT} ]
then then
daemonitor="obj/daemonitor" daemonitor="obj/daemonitor"
EXTRAS="-D_GNU_SOURCE" EXTRAS="-std=gnu99 -D_GNU_SOURCE -DAPP_NAME=\"daemonitor\""
echo "Building application ${daemonitor}..." echo "Building application ${daemonitor}..."
@ -37,5 +37,4 @@ then
fi fi
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
# vim: syntax=sh:expandtab:ts=4:sw=4 # vim: syntax=sh:expandtab:ts=4:sw=4

View File

@ -8,5 +8,4 @@ echo "Installing binaries into '${SBINDIR}'"
install_file "${daemonitor}" "${SBINDIR}" 0755 || return 1 install_file "${daemonitor}" "${SBINDIR}" 0755 || return 1
print_success "Done" print_success "Done"
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
# vim: syntax=sh:expandtab:ts=4:sw=4 # vim: syntax=sh:expandtab:ts=4:sw=4

View File

@ -14,5 +14,4 @@ then
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}" MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
fi fi
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
# vim: syntax=sh:expandtab:ts=4:sw=4 # vim: syntax=sh:expandtab:ts=4:sw=4

View File

@ -1,8 +1,8 @@
# daemonitor/version # daemonitor/version
# #
# (c)2007, Laurence Withers, <l@lwithers.me.uk>. # Copyright: ©20072012, Güralp Systems Limited
# Released under the GNU GPLv3. See file COPYING or # Author: Laurence Withers <lwithers@guralp.com>
# http://www.gnu.org/copyleft/gpl.html for details. # License: GPLv3
# #
@ -13,5 +13,4 @@ VERMAJOR=1
VERMINOR=0 VERMINOR=0
VERMICRO=2 VERMICRO=2
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
# vim: expandtab:ts=4:sw=4:syntax=sh # vim: expandtab:ts=4:sw=4:syntax=sh