Compare commits

..

No commits in common. "master" and "0.3.4" have entirely different histories.

14 changed files with 48 additions and 44 deletions

8
README
View File

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

7
config
View File

@ -1,9 +1,10 @@
# leaptable-compiler/config # leaptable-compiler/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
# #
# Copyright: ©20092012, Laurence Withers # (c)2009, Laurence Withers, <l@lwithers.me.uk>.
# Author: Laurence Withers <l@lwithers.me.uk> # Released under the GNU GPLv3. See file COPYING or
# License: GPLv3 # http://www.gnu.org/copyleft/gpl.html for details.
# #
# This file contains options used to build leaptable-compiler. # This file contains options used to build leaptable-compiler.

17
make.sh
View File

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/sh
# leaptable-compiler/make.sh # leaptable-compiler/make.sh
# #
# Copyright: ©20092012, Laurence Withers # (c)2009, Laurence Withers, <l@lwithers.me.uk>.
# Author: Laurence Withers <l@lwithers.me.uk> # Released under the GNU GPLv3. See file COPYING or
# License: GPLv3 # http://www.gnu.org/copyleft/gpl.html for details.
# #
@ -15,19 +15,19 @@ then
echo "Configuration file not found???" echo "Configuration file not found???"
exit 1 exit 1
fi 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 # Get version information
source "./version" || exit 1 source version || exit 1
VERSION="${VERMAJOR}.${VERMINOR}.${VERMICRO}" VERSION="${VERMAJOR}.${VERMINOR}.${VERMICRO}"
# Get standard functions # Get standard functions
[ -z "${VERBOSE}" ] && VERBOSE="0" [ -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. # List of directories which will be emptied by clean.
@ -292,4 +292,5 @@ 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/sh
# leaptable-compiler/test.sh # leaptable-compiler/test.sh
# #
# Copyright: ©20092012, Laurence Withers # (c)2009, Laurence Withers, <l@lwithers.me.uk>.
# Author: Laurence Withers <l@lwithers.me.uk> # Released under the GNU GPLv3. See file COPYING or
# License: GPLv3 # http://www.gnu.org/copyleft/gpl.html for details.
# #
# 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:${LD_LIBRARY_PATH}" "${EXE}" "$@" || return 1 LD_LIBRARY_PATH="obj" "${EXE}" "$@" || return 1
return 0 return 0
} }
@ -33,15 +33,14 @@ print_tests() {
echo "---------------------------------------------------------------------" echo "---------------------------------------------------------------------"
for EXE in obj/tests/* for EXE in obj/tests/*
do do
[ -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:${LD_LIBRARY_PATH}" "${EXE}" --print-summary LD_LIBRARY_PATH="obj" ${EXE} --print-summary
done done
} }
# Main script # Main script
if [ $# -eq 0 ] if [ $# -eq 0 ]
then then
@ -49,6 +48,7 @@ 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,7 +7,6 @@ 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 @@
# leaptable-compiler/scripts/functions.sh # leaptable-compiler/scripts/functions.sh
# #
# Copyright: ©20092012, Laurence Withers # (c)2009, Laurence Withers, <l@lwithers.me.uk>.
# Author: Laurence Withers, <l@lwithers.me.uk> # Released under the GNU GPLv3. See file COPYING or
# License: GPLv3 # http://www.gnu.org/copyleft/gpl.html for details.
# #
# Common functions # Common functions
@ -63,4 +63,5 @@ 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 @@
# leaptable-compiler/scripts/paths # leaptable-compiler/scripts/paths
# #
# Copyright: ©20092012, Laurence Withers # (c)2009, Laurence Withers, <l@lwithers.me.uk>.
# Author: Laurence Withers, <l@lwithers.me.uk> # Released under the GNU GPLv3. See file COPYING or
# License: GPLv3 # http://www.gnu.org/copyleft/gpl.html for details.
# #
# 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,4 +60,5 @@ 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,8 +6,7 @@
if [ -z ${leaptable_compiler_BUILT} ] if [ -z ${leaptable_compiler_BUILT} ]
then then
leaptable_compiler="obj/leaptable-compiler" leaptable_compiler="obj/leaptable-compiler"
EXTRAS="-std=gnu99 -D_GNU_SOURCE -DAPP_NAME=\"leaptable-compiler\" \ EXTRAS="-std=gnu99 -D_GNU_SOURCE ${LIBISO8601_CFLAGS} ${LIBISO8601_LIBS}"
${LIBISO8601_CFLAGS} ${LIBISO8601_LIBS}"
echo "Building application ${leaptable_compiler}..." echo "Building application ${leaptable_compiler}..."
@ -38,4 +37,5 @@ 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,4 +8,5 @@ echo "Installing binaries into '${BINDIR}'"
install_file "${leaptable_compiler}" "${BINDIR}" 0755 || return 1 install_file "${leaptable_compiler}" "${BINDIR}" 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

@ -11,6 +11,8 @@ then
make_monolithic ${SRC} C || return 1 make_monolithic ${SRC} C || return 1
leaptable_compiler_MONOLITHIC=1 leaptable_compiler_MONOLITHIC=1
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,4 +1,4 @@
FILES_INSTALL_DIR="${SHAREDIR}/share" # @TODO@ FILES_INSTALL_DIR="${SHAREDIR}/libiso8601"
# create destination directories # create destination directories
echo "Installing files into ${FILES_INSTALL_DIR}" echo "Installing files into ${FILES_INSTALL_DIR}"
@ -12,4 +12,5 @@ do
done done
print_success "Files installed" print_success "Files installed"
# 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

Binary file not shown.

View File

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

11
version
View File

@ -1,8 +1,8 @@
# leaptable-compiler/version # leaptable-compiler/version
# #
# Copyright: ©20092012, Laurence Withers # (c)2009, Laurence Withers, <l@lwithers.me.uk>.
# Author: Laurence Withers <l@lwithers.me.uk> # Released under the GNU GPLv3. See file COPYING or
# License: GPLv3 # http://www.gnu.org/copyleft/gpl.html for details.
# #
@ -11,6 +11,7 @@
# expected to be in 'major.minor.micro' format. # expected to be in 'major.minor.micro' format.
VERMAJOR=0 VERMAJOR=0
VERMINOR=3 VERMINOR=3
VERMICRO=6 VERMICRO=4
# 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