From 27be2dc931731fe82c9f33f0f8be0ff1c783aede Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Mon, 5 Feb 2007 13:09:29 +0000 Subject: [PATCH] Upgrade to new build system --- README | 6 ++++-- config | 2 +- make.sh | 33 +++++++++++++++++++++++---------- scripts/.gitignore | 2 ++ src/libiso8601/config-script | 1 + src/libiso8601/soversion | 2 +- src/tests/template | 2 +- 7 files changed, 33 insertions(+), 15 deletions(-) diff --git a/README b/README index 9cf8435..0fbb5d5 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ libiso8601 ======================================================================== -(c)2006, Laurence Withers, . +(c)2007, Laurence Withers, . Released under the GNU GPLv2. See file COPYING or http://www.gnu.org/copyleft/gpl.html for details. @@ -10,6 +10,8 @@ Really Quick Instructions To build: ./make.sh To install: ./make.sh install -You might want to edit 'config' first. +You might want to edit 'config' first. You might also want to set +'INSTALL_PREFIX', which is prepended onto the destination of any +installed file. @TODO@ diff --git a/config b/config index af7bb31..eab053f 100644 --- a/config +++ b/config @@ -2,7 +2,7 @@ # kate: replace-trailing-space-save true; space-indent true; tab-width 4; # vim: expandtab:ts=4:sw=4 # -# (c)2006, Laurence Withers, . +# (c)2007, Laurence Withers, . # Released under the GNU GPLv2. See file COPYING or # http://www.gnu.org/copyleft/gpl.html for details. # diff --git a/make.sh b/make.sh index 2e5cf59..e50b890 100755 --- a/make.sh +++ b/make.sh @@ -1,7 +1,7 @@ #!/bin/bash # libiso8601/make.sh # -# (c)2006, Laurence Withers, . +# (c)2006-2007, Laurence Withers, . # Released under the GNU GPLv2. See file COPYING or # http://www.gnu.org/copyleft/gpl.html for details. # @@ -48,6 +48,8 @@ OUTPUT_DIRS="obj html" # MONOLITHIC_TESTS if any file mentioned in this list is newer # than the output file, then we recreate it # MONOLITHIC_SOURCE a list (in order) of the source files +# MONOLITHIC_OPTIONS will #define the options to match the respective +# environment variables. # # Recognised formats are: # none no special processing happens before each file @@ -68,18 +70,21 @@ make_monolithic() { # extract options HASHLINE=0 VERDEFINE=0 + HASHDEFINE=0 if [ "$2" == "C" ] then HASHLINE=1 VERDEFINE=1 + HASHDEFINE=1 elif [ "$2" == "Ch" ] then HASHLINE=1 + HASHDEFINE=1 elif [ "$2" == "none" ] then - HASHLINE=0 # dummy command + HASHLINE=0 # dummy command else - print_failure "make_monolithic() called with unknown format $2" + print_failure "make_monolithic() called with unknown format $2" return 1 fi @@ -115,6 +120,14 @@ make_monolithic() { do_cmd_redir ${MONOLITHIC_OUT} echo "#define VEREXTRA \"${VEREXTRA}\"" || return 1 fi + if [ ${HASHDEFINE} -ne 0 ] + then + for opt in ${MONOLITHIC_OPTIONS} + do + do_cmd_redir ${MONOLITHIC_OUT} echo "#define ${opt} ${!opt}" || return 1 + done + fi + for FILE in ${MONOLITHIC_SOURCE} do if [ ${HASHLINE} -ne 0 ] @@ -142,7 +155,7 @@ build_dir_tree() { return 1 fi - local DIR="$1" + local DIR="${INSTALL_PREFIX}$1" # if the directory already exists, return success [ -d "${DIR}" ] && return 0 @@ -180,8 +193,8 @@ build_dir_tree() { # second is the destination. The third is the octal mode. install_file() { # figure out if $2 is a directory or not - DEST_FILE="$2" - [ -d "$2" ] && DEST_FILE="$2/$(basename $1)" + DEST_FILE="${INSTALL_PREFIX}$2" + [ -d "$2" ] && DEST_FILE="${INSTALL_PREFIX}$2/$(basename $1)" echo " Installing: '$1' -> '$2'" do_cmd cp -fP "$1" "${DEST_FILE}" || return 1 @@ -195,8 +208,8 @@ install_file() { # This will install a header file. It is basically similar to # install_file(), only we strip out the #line directives. install_header() { - DEST_FILE="$2" - [ -d "$2" ] && DEST_FILE="$2/$(basename $1)" + DEST_FILE="${INSTALL_PREFIX}$2" + [ -d "$2" ] && DEST_FILE="${INSTALL_PREFIX}$2/$(basename $1)" echo " Installing header: '$1' -> '$2'" do_cmd rm -f ${DEST_FILE} || exit 1 @@ -212,9 +225,9 @@ install_header() { # second the symlink's source filename, and the third is the directory # in which to create the symlink. install_symlink() { - echo " Installing symlink: '$3/$2' -> '$1'" + echo " Installing symlink: '$3/$2' -> '${INSTALL_PREFIX}$1'" - ( do_cmd cd $3; ln -sf $2 $1 ) || return 1 + ( do_cmd cd $3; ln -sf $2 ${INSTALL_PREFIX}$1 ) || return 1 return 0 } diff --git a/scripts/.gitignore b/scripts/.gitignore index 8e5e559..1cb5480 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,12 +1,14 @@ build.app.c build.app.c++ build.app.c++-qt +build.app.sh build.docs.doxygen build.files.none build.firmware.gpasm build.firmware.sdcc build.lib.c build.lib.c++ +build.module.c build.tests.c build.tests.c++ module-create.sh diff --git a/src/libiso8601/config-script b/src/libiso8601/config-script index 1ae1168..f55487b 100644 --- a/src/libiso8601/config-script +++ b/src/libiso8601/config-script @@ -90,6 +90,7 @@ done [ "${echo_exec_prefix}" == "yes" ] && echo "${exec_prefix}" [ "${echo_cflags}" == "yes" ] && echo "${dep_cflags} ${includes}" [ "${echo_libs}" == "yes" ] && echo "${dep_libs} -L${lib_dir} -liso8601" +true diff --git a/src/libiso8601/soversion b/src/libiso8601/soversion index af89dba..064c9db 100644 --- a/src/libiso8601/soversion +++ b/src/libiso8601/soversion @@ -1,6 +1,6 @@ # libiso8601/src/libiso8601/soversion # -# (c)2006, Laurence Withers, . +# (c)2007, Laurence Withers, . # Released under the GNU GPLv2. See file COPYING or # http://www.gnu.org/copyleft/gpl.html for details. # diff --git a/src/tests/template b/src/tests/template index 05c8786..5adb180 100644 --- a/src/tests/template +++ b/src/tests/template @@ -1,6 +1,6 @@ /* libiso8601/src/tests/???.c * - * (c)2006, Laurence Withers, . + * (c)2007, Laurence Withers, . * Released under the GNU GPLv2. See file COPYING or * http://www.gnu.org/copyleft/gpl.html for details. */