Update build system
This commit is contained in:
parent
3309803b9e
commit
d09e55e8ae
10
make.sh
10
make.sh
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
# libiso8601/make.sh
|
# libiso8601/make.sh
|
||||||
#
|
#
|
||||||
# (c)2006-2007, Laurence Withers, <l@lwithers.me.uk>.
|
# (c)2009, Laurence Withers, <l@lwithers.me.uk>.
|
||||||
# Released under the GNU GPLv3. See file COPYING or
|
# Released under the GNU GPLv3. See file COPYING or
|
||||||
# http://www.gnu.org/copyleft/gpl.html for details.
|
# 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.
|
||||||
|
|
10
run-test.sh
10
run-test.sh
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
# libiso8601/test.sh
|
# libiso8601/test.sh
|
||||||
#
|
#
|
||||||
# (c)2007, Laurence Withers, <l@lwithers.me.uk>.
|
# (c)2009, Laurence Withers, <l@lwithers.me.uk>.
|
||||||
# Released under the GNU GPLv3. See file COPYING or
|
# Released under the GNU GPLv3. See file COPYING or
|
||||||
# http://www.gnu.org/copyleft/gpl.html for details.
|
# http://www.gnu.org/copyleft/gpl.html for details.
|
||||||
#
|
#
|
||||||
|
@ -33,10 +33,10 @@ 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" ${EXE} --print-summary
|
LD_LIBRARY_PATH="obj" "${EXE}" --print-summary
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ then
|
||||||
|
|
||||||
for SRC in src/tests/*.c
|
for SRC in src/tests/*.c
|
||||||
do
|
do
|
||||||
TEST="obj/tests/$(basename ${SRC} | sed -e 's,.c$,,')"
|
TEST="obj/tests/$(basename "${SRC}" ".c")"
|
||||||
MODIFIED=0
|
MODIFIED=0
|
||||||
for file in ${LIBS} ${SRC} src/tests/build.tests
|
for file in ${LIBS} ${SRC} src/tests/build.tests
|
||||||
do
|
do
|
||||||
|
|
Loading…
Reference in New Issue