From 4ec2a3a2f32ff26cbb27b7799025b43f97b76bf9 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Sat, 7 Jan 2012 17:39:43 +0000 Subject: [PATCH 1/6] Update build system --- README | 8 +++++--- config | 7 +++---- make.sh | 17 ++++++++--------- run-test.sh | 22 +++++++++++----------- scripts/.gitignore | 1 + scripts/functions.sh | 7 +++---- scripts/paths | 7 +++---- src/leaptable-compiler/build.app | 4 ++-- src/leaptable-compiler/build.install-app | 1 - src/leaptable-compiler/build.monolithic | 1 - src/share/build.install-files | 3 +-- version | 9 ++++----- 12 files changed, 41 insertions(+), 46 deletions(-) diff --git a/README b/README index f0de715..fecf338 100644 --- a/README +++ b/README @@ -1,8 +1,10 @@ leaptable-compiler ======================================================================== -(c)2009, Laurence Withers, . -Released under the GNU GPLv3. See file COPYING or -http://www.gnu.org/copyleft/gpl.html for details. +Copyright: ©2009–2012, Laurence Withers +Author: Laurence Withers +License: GPLv3 + +See file COPYING for detail license information. Really Quick Instructions ------------------------- diff --git a/config b/config index f535588..ba6680a 100644 --- a/config +++ b/config @@ -1,10 +1,9 @@ # leaptable-compiler/config -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: syntax=sh:expandtab:ts=4:sw=4 # -# (c)2009, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# Copyright: ©2009–2012, Laurence Withers +# Author: Laurence Withers +# License: GPLv3 # # This file contains options used to build leaptable-compiler. diff --git a/make.sh b/make.sh index a74f0c1..84d7cc0 100755 --- a/make.sh +++ b/make.sh @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # leaptable-compiler/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: ©2009–2012, Laurence Withers +# Author: Laurence Withers +# License: GPLv3 # @@ -15,19 +15,19 @@ then echo "Configuration file not found???" exit 1 fi -source "config" # don't fail on error, since last command in config might return false +source "./config" # don't fail on error, since last command in config might return false # Get version information -source version || exit 1 +source "./version" || exit 1 VERSION="${VERMAJOR}.${VERMINOR}.${VERMICRO}" # Get standard functions [ -z "${VERBOSE}" ] && VERBOSE="0" -source scripts/functions.sh || exit 1 +source "./scripts/functions.sh" || exit 1 # List of directories which will be emptied by clean. @@ -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 829a40b..6a5967f 100755 --- a/run-test.sh +++ b/run-test.sh @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # leaptable-compiler/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: ©2009–2012, Laurence Withers +# 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 } @@ -33,14 +33,15 @@ print_tests() { echo "---------------------------------------------------------------------" for EXE in obj/tests/* do - [ -x ${EXE} ] || continue - NAME=$(echo ${EXE} | sed 's,obj/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 4679984..375aed3 100644 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -1,8 +1,8 @@ # leaptable-compiler/scripts/functions.sh # -# (c)2009, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# Copyright: ©2009–2012, Laurence Withers +# 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 7637943..c1c18ac 100644 --- a/scripts/paths +++ b/scripts/paths @@ -1,8 +1,8 @@ # leaptable-compiler/scripts/paths # -# (c)2009, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# Copyright: ©2009–2012, Laurence Withers +# 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/leaptable-compiler/build.app b/src/leaptable-compiler/build.app index bccc580..b71a4f7 100644 --- a/src/leaptable-compiler/build.app +++ b/src/leaptable-compiler/build.app @@ -6,7 +6,8 @@ if [ -z ${leaptable_compiler_BUILT} ] then leaptable_compiler="obj/leaptable-compiler" - EXTRAS="-std=gnu99 -D_GNU_SOURCE ${LIBISO8601_CFLAGS} ${LIBISO8601_LIBS}" + EXTRAS="-std=gnu99 -D_GNU_SOURCE -DAPP_NAME=\"leaptable-compiler\" \ + ${LIBISO8601_CFLAGS} ${LIBISO8601_LIBS}" echo "Building application ${leaptable_compiler}..." @@ -37,5 +38,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/leaptable-compiler/build.install-app b/src/leaptable-compiler/build.install-app index 2c5485a..cd5b663 100644 --- a/src/leaptable-compiler/build.install-app +++ b/src/leaptable-compiler/build.install-app @@ -8,5 +8,4 @@ echo "Installing binaries into '${BINDIR}'" install_file "${leaptable_compiler}" "${BINDIR}" 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/leaptable-compiler/build.monolithic b/src/leaptable-compiler/build.monolithic index cba2726..aa41104 100644 --- a/src/leaptable-compiler/build.monolithic +++ b/src/leaptable-compiler/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/src/share/build.install-files b/src/share/build.install-files index 4f7f274..e7a3711 100644 --- a/src/share/build.install-files +++ b/src/share/build.install-files @@ -1,4 +1,4 @@ -FILES_INSTALL_DIR="${SHAREDIR}/libiso8601" +FILES_INSTALL_DIR="${SHAREDIR}/share" # @TODO@ # create destination directories echo "Installing files into ${FILES_INSTALL_DIR}" @@ -12,5 +12,4 @@ do done print_success "Files installed" -# 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 b641fa6..1afb79b 100644 --- a/version +++ b/version @@ -1,8 +1,8 @@ # leaptable-compiler/version -# -# (c)2009, Laurence Withers, . -# Released under the GNU GPLv3. See file COPYING or -# http://www.gnu.org/copyleft/gpl.html for details. +# +# Copyright: ©2009–2012, Laurence Withers +# Author: Laurence Withers +# License: GPLv3 # @@ -13,5 +13,4 @@ VERMAJOR=0 VERMINOR=3 VERMICRO=4 -# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: expandtab:ts=4:sw=4:syntax=sh From de1d803f6d01c02949f2d38ff288c264f15e0a4b Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Sat, 7 Jan 2012 17:42:15 +0000 Subject: [PATCH 2/6] Update for 2012-06-30 leap second --- src/share/leap-seconds | Bin 108 -> 112 bytes src/share/leap-seconds.txt | 1 + 2 files changed, 1 insertion(+) diff --git a/src/share/leap-seconds b/src/share/leap-seconds index 472e841f408777c69856d41b95bcb72edbfcb908..6d58a221f81e7eb0c68234c31d2a1c2908db147f 100644 GIT binary patch delta 23 ecmc~P;L-QD3`hxx@?>COketYqz{0?7?g;=xyaen3 delta 18 ZcmXTO;nDZE3`hxx@?>COkeJAm001oi1Y7_B diff --git a/src/share/leap-seconds.txt b/src/share/leap-seconds.txt index f5911de..23f78df 100644 --- a/src/share/leap-seconds.txt +++ b/src/share/leap-seconds.txt @@ -22,3 +22,4 @@ 1998-12-31 2005-12-31 2008-12-31 +2012-06-30 From f9dd1a307758ca44389e199d5c71f8b25eb5731d Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Sat, 7 Jan 2012 17:42:26 +0000 Subject: [PATCH 3/6] Bump version --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 1afb79b..8db5fc2 100644 --- a/version +++ b/version @@ -11,6 +11,6 @@ # expected to be in 'major.minor.micro' format. VERMAJOR=0 VERMINOR=3 -VERMICRO=4 +VERMICRO=5 # vim: expandtab:ts=4:sw=4:syntax=sh From a2aaf78ff239e2ec20a4a948afa42489de92220d Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 12 Jun 2015 11:08:27 +0100 Subject: [PATCH 4/6] Add 2015-06-30 leap second --- src/share/leap-seconds | Bin 112 -> 116 bytes src/share/leap-seconds.txt | 1 + 2 files changed, 1 insertion(+) diff --git a/src/share/leap-seconds b/src/share/leap-seconds index 6d58a221f81e7eb0c68234c31d2a1c2908db147f..4fb47616b50f7faa67f2999674a11a0e7b9c00d4 100644 GIT binary patch delta 23 ecmXRY;nDZE3`hxx@?>COkebMo!ot99Jplkj-~~hg delta 18 ZcmXRZ;L-QD3`hxx@?>COketYq0st+O1Ze;O diff --git a/src/share/leap-seconds.txt b/src/share/leap-seconds.txt index 23f78df..684cfae 100644 --- a/src/share/leap-seconds.txt +++ b/src/share/leap-seconds.txt @@ -23,3 +23,4 @@ 2005-12-31 2008-12-31 2012-06-30 +2015-06-30 From 37901258759de48d7fda22dae9fa7e771cf0c14b Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 12 Jun 2015 11:09:24 +0100 Subject: [PATCH 5/6] Bump version --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 8db5fc2..dbd567e 100644 --- a/version +++ b/version @@ -11,6 +11,6 @@ # expected to be in 'major.minor.micro' format. VERMAJOR=0 VERMINOR=3 -VERMICRO=5 +VERMICRO=6 # vim: expandtab:ts=4:sw=4:syntax=sh From 444bbe36427f92780e027312ddefbca6099f87f8 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 12 Jun 2015 11:13:18 +0100 Subject: [PATCH 6/6] Minor build system updates --- README | 4 ++-- src/leaptable-compiler/build.monolithic | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README b/README index fecf338..2e134d0 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ leaptable-compiler ======================================================================== -Copyright: ©2009–2012, Laurence Withers +Copyright: ©2009–2015, Laurence Withers Author: Laurence Withers License: GPLv3 -See file COPYING for detail license information. +See file COPYING for detailed license information. Really Quick Instructions ------------------------- diff --git a/src/leaptable-compiler/build.monolithic b/src/leaptable-compiler/build.monolithic index aa41104..85009e1 100644 --- a/src/leaptable-compiler/build.monolithic +++ b/src/leaptable-compiler/build.monolithic @@ -11,7 +11,6 @@ then make_monolithic ${SRC} C || return 1 leaptable_compiler_MONOLITHIC=1 - MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}" fi # vim: syntax=sh:expandtab:ts=4:sw=4