Minor build system updates

README

@@ -1,8 +1,10 @@
 leaptable-compiler
 ========================================================================
-(c)2009, Laurence Withers, <l@lwithers.me.uk>.
-Released under the GNU GPLv3. See file COPYING or 
-http://www.gnu.org/copyleft/gpl.html for details.
+Copyright: ©2009–2015, Laurence Withers
+Author: Laurence Withers <l@lwithers.me.uk>
+License: GPLv3
+
+See file COPYING for detailed license information.
 
 Really Quick Instructions
 -------------------------

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, <l@lwithers.me.uk>.
-#  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 <l@lwithers.me.uk>
+#  License: GPLv3
 #
 # This file contains options used to build leaptable-compiler.
 

make.sh

@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 # leaptable-compiler/make.sh
-#
-#  (c)2009, Laurence Withers, <l@lwithers.me.uk>.
-#  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 <l@lwithers.me.uk>
+#  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

run-test.sh

@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 # leaptable-compiler/test.sh
-#
-#  (c)2009, Laurence Withers, <l@lwithers.me.uk>.
-#  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 <l@lwithers.me.uk>
+#  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

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

scripts/functions.sh

@@ -1,8 +1,8 @@
 # leaptable-compiler/scripts/functions.sh
 #
-#  (c)2009, Laurence Withers, <l@lwithers.me.uk>.
-#  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, <l@lwithers.me.uk>
+#  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

scripts/paths

@@ -1,8 +1,8 @@
 # leaptable-compiler/scripts/paths
 #
-#  (c)2009, Laurence Withers, <l@lwithers.me.uk>.
-#  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, <l@lwithers.me.uk>
+#  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

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

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

src/leaptable-compiler/build.monolithic

@@ -11,8 +11,6 @@ then
     make_monolithic ${SRC} C || return 1
 
     leaptable_compiler_MONOLITHIC=1
-    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

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

src/share/leap-seconds.txt

@@ -22,3 +22,5 @@
 1998-12-31
 2005-12-31
 2008-12-31
+2012-06-30
+2015-06-30

version

@@ -1,8 +1,8 @@
 # leaptable-compiler/version
-#
-#  (c)2009, Laurence Withers, <l@lwithers.me.uk>.
-#  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 <l@lwithers.me.uk>
+#  License: GPLv3
 #
 
 
@@ -11,7 +11,6 @@
 # expected to be in 'major.minor.micro' format.
 VERMAJOR=0
 VERMINOR=3
-VERMICRO=4
+VERMICRO=6
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: expandtab:ts=4:sw=4:syntax=sh