From 4e0b07dfd25fe0669b78a9f07d7c60df7760806f Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 28 Jul 2006 09:12:59 +0100 Subject: [PATCH 1/4] Don't refer to non-existent header file. --- scripts/build.sdcc.firmware/build.monolithic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sdcc.firmware/build.monolithic b/scripts/build.sdcc.firmware/build.monolithic index 1475349..cd0120f 100644 --- a/scripts/build.sdcc.firmware/build.monolithic +++ b/scripts/build.sdcc.firmware/build.monolithic @@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic" if [ -z "${@CNAME@_MONOLITHIC}" ] then - MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)" + MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)" make_monolithic ${SRC} C || return 1 @CNAME@_MONOLITHIC=1 From c6eb191b49a48cfbaeda52c2b1b095fce1846dac Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 28 Jul 2006 10:54:59 +0100 Subject: [PATCH 2/4] Update release script --- scripts/release.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 8f7f63e..9e7d760 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,7 +1,7 @@ #!/bin/bash -# @P@/scripts/release.sh +# lw-build-system/scripts/release.sh # -# (c)2006, @AUTHOR@, <@EMAIL@>. +# (c)2006, Laurence Withers, . # Released under the GNU GPLv2. See file COPYING or # http://www.gnu.org/copyleft/gpl.html for details. # @@ -22,13 +22,13 @@ source "${REPOS}/scripts/functions.sh" || exit 1 # Get version etc. if [ $# -ne 2 ] then - echo "Usage: scripts/release.sh " + echo "Usage: $0 " exit 1 fi VER=$1 DIR=$2 -PKGNAME="@P@-${VER}" +PKGNAME="$(basename ${REPOS})-${VER}" @@ -76,5 +76,5 @@ gpg -a -b "${PKGNAME}-doc.tar.bz2" # clean up rm -rf "${PKGNAME}" "${PKGNAME}-doc" -# kate: @KATE_MODELINE@ -# vim: @VIM_MODELINE@ +# kate: replace-trailing-space-save true; space-indent true; tab-width 4; +# vim: ts=4:sw=4:expandtab From 267b583388602d6a23aae6e1278255db287a1f67 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 28 Jul 2006 10:55:07 +0100 Subject: [PATCH 3/4] Add in SDCCFLAGS todo. --- scripts/build.sdcc.firmware/build.firmware | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build.sdcc.firmware/build.firmware b/scripts/build.sdcc.firmware/build.firmware index 33ce002..fbb6940 100644 --- a/scripts/build.sdcc.firmware/build.firmware +++ b/scripts/build.sdcc.firmware/build.firmware @@ -26,6 +26,7 @@ then then echo " Compiling..." + SDCCFLAGS="" # @TODO@ do_cmd ${SDCC} ${SDCCFLAGS} -o "${@CNAME@}" ${SRC} ${EXTRAS} || return 1 print_success "Firmware built" From 7be4f696b05df45c78b78504610a7f9d059518bd Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 28 Jul 2006 10:57:44 +0100 Subject: [PATCH 4/4] Fix a couple of bugs in the C test template. --- scripts/build.c.tests/build.tests | 2 +- scripts/build.c.tests/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.c.tests/build.tests b/scripts/build.c.tests/build.tests index b810139..89c80ea 100644 --- a/scripts/build.c.tests/build.tests +++ b/scripts/build.c.tests/build.tests @@ -12,7 +12,7 @@ then echo "Building test programs..." do_cmd mkdir -p obj/tests || return 1 - for SRC in src/@NAME@/*.cpp + for SRC in src/@NAME@/*.c do TEST="obj/tests/$(basename ${SRC} | sed -e 's,.c$,,')" MODIFIED=0 diff --git a/scripts/build.c.tests/template b/scripts/build.c.tests/template index cde078e..f304a54 100644 --- a/scripts/build.c.tests/template +++ b/scripts/build.c.tests/template @@ -6,7 +6,7 @@ */ @TEST_HEADERS@ -#include +#include