c
/
lw-build-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the monolithic build, we must always define SRC etc, since that is used 

outside the script. This must happen even if the monolithic build has
already occurred.
This commit is contained in:
Laurence Withers 2006-07-25 10:58:17 +01:00
parent 3e7fd2dd59
commit becb94e1d4
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skel/scripts/build.c++.app/build.monolithic
View File

@ -2,11 +2,11 @@
# @NAME@_MONOLITHIC # @NAME@_MONOLITHIC
# #
SRC="obj/@NAME@.cpp"
MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
if [ -z "${@NAME@_MONOLITHIC}" ] if [ -z "${@NAME@_MONOLITHIC}" ]
then then
SRC="obj/@NAME@.cpp"
MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.cpp)" MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.cpp)"
make_monolithic ${SRC} C || return 1 make_monolithic ${SRC} C || return 1

5
skel/scripts/build.c++.lib/build.monolithic
View File

@ -1,12 +1,13 @@
# These are external variables, and shouldn't clash with anything else # These are external variables, and shouldn't clash with anything else
# @CNAME@_MONOLITHIC # @CNAME@_MONOLITHIC
if [ -z "${@CNAME@_MONOLITHIC}" ]
then
SRC="obj/@NAME@.cpp" SRC="obj/@NAME@.cpp"
HDR="obj/@HEADER_NAME@" HDR="obj/@HEADER_NAME@"
MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic" MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
if [ -z "${@CNAME@_MONOLITHIC}" ]
then
MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)" MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
make_monolithic ${HDR} C || return 1 make_monolithic ${HDR} C || return 1

6
skel/scripts/build.c.app/build.monolithic
View File

@ -2,11 +2,11 @@
# @NAME@_MONOLITHIC # @NAME@_MONOLITHIC
# #
SRC="obj/@NAME@.c"
MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
if [ -z "${@NAME@_MONOLITHIC}" ] if [ -z "${@NAME@_MONOLITHIC}" ]
then then
SRC="obj/@NAME@.c"
MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)" MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)"
make_monolithic ${SRC} C || return 1 make_monolithic ${SRC} C || return 1

5
skel/scripts/build.c.lib/build.monolithic
View File

@ -1,12 +1,13 @@
# These are external variables, and shouldn't clash with anything else # These are external variables, and shouldn't clash with anything else
# @CNAME@_MONOLITHIC # @CNAME@_MONOLITHIC
if [ -z "${@CNAME@_MONOLITHIC}" ]
then
SRC="obj/@NAME@.c" SRC="obj/@NAME@.c"
HDR="obj/@HEADER_NAME@" HDR="obj/@HEADER_NAME@"
MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic" MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
if [ -z "${@CNAME@_MONOLITHIC}" ]
then
MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)" MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
make_monolithic ${HDR} C || return 1 make_monolithic ${HDR} C || return 1

6
skel/scripts/build.sdcc.firmware/build.monolithic
View File

@ -2,11 +2,11 @@
# @NAME@_MONOLITHIC # @NAME@_MONOLITHIC
# #
SRC="obj/@NAME@.c"
MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
if [ -z "${@NAME@_MONOLITHIC}" ] if [ -z "${@NAME@_MONOLITHIC}" ]
then then
SRC="obj/@NAME@.c"
MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)" MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)"
make_monolithic ${SRC} C || return 1 make_monolithic ${SRC} C || return 1