Merge branch 'master' of lwithers.me.uk:git/lw-build-system

This commit is contained in:
Laurence Withers 2006-07-28 18:12:21 +01:00
commit f367b2e1aa
5 changed files with 10 additions and 9 deletions

View File

@ -12,7 +12,7 @@ then
echo "Building test programs..." echo "Building test programs..."
do_cmd mkdir -p obj/tests || return 1 do_cmd mkdir -p obj/tests || return 1
for SRC in src/@NAME@/*.cpp for SRC in src/@NAME@/*.c
do do
TEST="obj/tests/$(basename ${SRC} | sed -e 's,.c$,,')" TEST="obj/tests/$(basename ${SRC} | sed -e 's,.c$,,')"
MODIFIED=0 MODIFIED=0

View File

@ -6,7 +6,7 @@
*/ */
@TEST_HEADERS@ @TEST_HEADERS@
#include <iostream> #include <stdio.h>

View File

@ -26,6 +26,7 @@ then
then then
echo " Compiling..." echo " Compiling..."
SDCCFLAGS="" # @TODO@
do_cmd ${SDCC} ${SDCCFLAGS} -o "${@CNAME@}" ${SRC} ${EXTRAS} || return 1 do_cmd ${SDCC} ${SDCCFLAGS} -o "${@CNAME@}" ${SRC} ${EXTRAS} || return 1
print_success "Firmware built" print_success "Firmware built"

View File

@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
if [ -z "${@CNAME@_MONOLITHIC}" ] if [ -z "${@CNAME@_MONOLITHIC}" ]
then 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 make_monolithic ${SRC} C || return 1
@CNAME@_MONOLITHIC=1 @CNAME@_MONOLITHIC=1

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# @P@/scripts/release.sh # lw-build-system/scripts/release.sh
# #
# (c)2006, @AUTHOR@, <@EMAIL@>. # (c)2006, Laurence Withers, <l@lwithers.me.uk>.
# Released under the GNU GPLv2. See file COPYING or # Released under the GNU GPLv2. See file COPYING or
# http://www.gnu.org/copyleft/gpl.html for details. # http://www.gnu.org/copyleft/gpl.html for details.
# #
@ -22,13 +22,13 @@ source "${REPOS}/scripts/functions.sh" || exit 1
# Get version etc. # Get version etc.
if [ $# -ne 2 ] if [ $# -ne 2 ]
then then
echo "Usage: scripts/release.sh <version> <output_dir>" echo "Usage: $0 <version> <output_dir>"
exit 1 exit 1
fi fi
VER=$1 VER=$1
DIR=$2 DIR=$2
PKGNAME="@P@-${VER}" PKGNAME="$(basename ${REPOS})-${VER}"
@ -76,5 +76,5 @@ gpg -a -b "${PKGNAME}-doc.tar.bz2"
# clean up # clean up
rm -rf "${PKGNAME}" "${PKGNAME}-doc" rm -rf "${PKGNAME}" "${PKGNAME}-doc"
# kate: @KATE_MODELINE@ # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
# vim: @VIM_MODELINE@ # vim: ts=4:sw=4:expandtab