Update build system
This commit is contained in:
parent
d910e88bc3
commit
7a5f30bfcd
1
make.sh
1
make.sh
|
@ -292,5 +292,4 @@ done
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: expandtab:ts=4:sw=4
|
# vim: expandtab:ts=4:sw=4
|
||||||
|
|
14
run-test.sh
14
run-test.sh
|
@ -1,9 +1,9 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# libiso8601/test.sh
|
# libiso8601/test.sh
|
||||||
#
|
#
|
||||||
# (c)2009, Laurence Withers, <l@lwithers.me.uk>.
|
# Copyright: ©2009–2011, Güralp Systems Ltd.
|
||||||
# Released under the GNU GPLv3. See file COPYING or
|
# Author: Laurence Withers <lwithers@guralp.com>
|
||||||
# http://www.gnu.org/copyleft/gpl.html for details.
|
# License: GPLv3
|
||||||
#
|
#
|
||||||
|
|
||||||
# Running this script on its own will display a summary of all the
|
# Running this script on its own will display a summary of all the
|
||||||
|
@ -21,7 +21,7 @@ run_test() {
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LD_LIBRARY_PATH="obj" "${EXE}" "$@" || return 1
|
LD_LIBRARY_PATH="obj:${LD_LIBRARY_PATH}" "${EXE}" "$@" || return 1
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,11 +36,12 @@ print_tests() {
|
||||||
[ -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:${LD_LIBRARY_PATH}" "${EXE}" --print-summary
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Main script
|
# Main script
|
||||||
if [ $# -eq 0 ]
|
if [ $# -eq 0 ]
|
||||||
then
|
then
|
||||||
|
@ -48,7 +49,6 @@ then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run_test $*
|
run_test "$@"
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: expandtab:ts=4:sw=4
|
# vim: expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -7,6 +7,7 @@ build.docs.none
|
||||||
build.files.none
|
build.files.none
|
||||||
build.firmware.gpasm
|
build.firmware.gpasm
|
||||||
build.firmware.sdcc
|
build.firmware.sdcc
|
||||||
|
build.header.c
|
||||||
build.lib.c
|
build.lib.c
|
||||||
build.lib.c++
|
build.lib.c++
|
||||||
build.make.none
|
build.make.none
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# libiso8601/scripts/functions.sh
|
# libiso8601/scripts/functions.sh
|
||||||
#
|
#
|
||||||
# (c)2007, Laurence Withers, <l@lwithers.me.uk>.
|
# Copyright: ©2007–2011, Güralp Systems Ltd.
|
||||||
# Released under the GNU GPLv3. See file COPYING or
|
# Author: Laurence Withers, <lwithers@guralp.com>
|
||||||
# http://www.gnu.org/copyleft/gpl.html for details.
|
# License: GPLv3
|
||||||
#
|
#
|
||||||
|
|
||||||
# Common functions
|
# Common functions
|
||||||
|
@ -63,5 +63,4 @@ do_cmd_redir() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: expandtab:ts=4:sw=4
|
# vim: expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# libiso8601/scripts/paths
|
# libiso8601/scripts/paths
|
||||||
#
|
#
|
||||||
# (c)2007, Laurence Withers, <l@lwithers.me.uk>.
|
# Copyright: ©2011, Güralp Systems Ltd.
|
||||||
# Released under the GNU GPLv3. See file COPYING or
|
# Author: Laurence Withers, <lwithers@guralp.com>
|
||||||
# http://www.gnu.org/copyleft/gpl.html for details.
|
# License: GPLv3
|
||||||
#
|
#
|
||||||
# Default path setup. Not meant for editing; use environment variables
|
# Default path setup. Not meant for editing; use environment variables
|
||||||
# to override values if needed.
|
# to override values if needed.
|
||||||
|
@ -60,5 +60,4 @@ fi
|
||||||
[ -z "${WEBDIR}" ] && WEBDIR="${SRVDIR}/http"
|
[ -z "${WEBDIR}" ] && WEBDIR="${SRVDIR}/http"
|
||||||
[ -z "${CGIDIR}" ] && CGIDIR="${WEBDIR}/cgi-bin"
|
[ -z "${CGIDIR}" ] && CGIDIR="${WEBDIR}/cgi-bin"
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -39,5 +39,4 @@ then
|
||||||
docs_BUILT=1
|
docs_BUILT=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -17,5 +17,4 @@ do
|
||||||
done
|
done
|
||||||
|
|
||||||
print_success "Documentation installed"
|
print_success "Documentation installed"
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -3,12 +3,11 @@
|
||||||
# isodate_BUILT
|
# isodate_BUILT
|
||||||
#
|
#
|
||||||
|
|
||||||
build_target libiso8601
|
|
||||||
|
|
||||||
if [ -z ${isodate_BUILT} ]
|
if [ -z ${isodate_BUILT} ]
|
||||||
then
|
then
|
||||||
isodate="obj/isodate"
|
isodate="obj/isodate"
|
||||||
EXTRAS="${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS}"
|
EXTRAS="-std=gnu99 -D_GNU_SOURCE -DAPP_NAME=\"isodate\" \
|
||||||
|
${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS}"
|
||||||
|
|
||||||
echo "Building application ${isodate}..."
|
echo "Building application ${isodate}..."
|
||||||
|
|
||||||
|
@ -39,5 +38,4 @@ then
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -8,5 +8,4 @@ echo "Installing binaries into '${BINDIR}'"
|
||||||
install_file "${isodate}" "${BINDIR}" 0755 || return 1
|
install_file "${isodate}" "${BINDIR}" 0755 || return 1
|
||||||
print_success "Done"
|
print_success "Done"
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -14,5 +14,4 @@ then
|
||||||
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
|
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -34,5 +34,4 @@ do_cmd_redir "${CONFFILE}" sed \
|
||||||
do_cmd chmod 0755 "${CONFFILE}"
|
do_cmd chmod 0755 "${CONFFILE}"
|
||||||
print_success "Done"
|
print_success "Done"
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -14,7 +14,9 @@ then
|
||||||
libiso8601="obj/${libiso8601_BASE}.so.${SOMAJOR}.${SOMICRO}"
|
libiso8601="obj/${libiso8601_BASE}.so.${SOMAJOR}.${SOMICRO}"
|
||||||
libiso8601_DEP_CFLAGS=""
|
libiso8601_DEP_CFLAGS=""
|
||||||
libiso8601_DEP_LIBS="-lrt"
|
libiso8601_DEP_LIBS="-lrt"
|
||||||
SO_EXTRA="-std=gnu99 -D_GNU_SOURCE -DDEFAULT_LEAP_TABLE=\"${DEFAULT_LEAP_TABLE}\" ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS} -lc"
|
SO_EXTRA="${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS} -lc \
|
||||||
|
-D_GNU_SOURCE -std=gnu99 \
|
||||||
|
-DDEFAULT_LEAP_TABLE=\"${DEFAULT_LEAP_TABLE}\""
|
||||||
|
|
||||||
echo "Building library ${libiso8601}..."
|
echo "Building library ${libiso8601}..."
|
||||||
|
|
||||||
|
@ -52,5 +54,4 @@ then
|
||||||
libiso8601_HEADER=${HDR}
|
libiso8601_HEADER=${HDR}
|
||||||
|
|
||||||
fi
|
fi
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -17,5 +17,4 @@ then
|
||||||
libiso8601_MONOLITHIC=1
|
libiso8601_MONOLITHIC=1
|
||||||
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
|
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
|
||||||
fi
|
fi
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -95,4 +95,3 @@ true
|
||||||
|
|
||||||
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# libiso8601/src/libiso8601/soversion
|
# libiso8601/src/libiso8601/soversion
|
||||||
#
|
#
|
||||||
# (c)2007, Laurence Withers, <l@lwithers.me.uk>.
|
# Copyright: ©2007–2011, Güralp Systems Ltd.
|
||||||
# Released under the GNU GPLv3. See file COPYING or
|
# Author: Laurence Withers <lwithers@guralp.com>
|
||||||
# http://www.gnu.org/copyleft/gpl.html for details.
|
# License: GPLv3
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,11 @@
|
||||||
# setisodate_BUILT
|
# setisodate_BUILT
|
||||||
#
|
#
|
||||||
|
|
||||||
build_target libiso8601
|
|
||||||
|
|
||||||
if [ -z ${setisodate_BUILT} ]
|
if [ -z ${setisodate_BUILT} ]
|
||||||
then
|
then
|
||||||
setisodate="obj/setisodate"
|
setisodate="obj/setisodate"
|
||||||
EXTRAS="${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS}"
|
EXTRAS="-std=gnu99 -D_GNU_SOURCE -DAPP_NAME=\"setisodate\" \
|
||||||
|
${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS}"
|
||||||
|
|
||||||
echo "Building application ${setisodate}..."
|
echo "Building application ${setisodate}..."
|
||||||
|
|
||||||
|
@ -39,5 +38,4 @@ then
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -8,5 +8,4 @@ echo "Installing binaries into '${SBINDIR}'"
|
||||||
install_file "${setisodate}" "${SBINDIR}" 0755 || return 1
|
install_file "${setisodate}" "${SBINDIR}" 0755 || return 1
|
||||||
print_success "Done"
|
print_success "Done"
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -14,5 +14,4 @@ then
|
||||||
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
|
MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -1,3 +1 @@
|
||||||
source src/tests/build.tests
|
source src/tests/build.tests
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ build_target libiso8601 || return 1
|
||||||
if [ -z ${tests_BUILT} ]
|
if [ -z ${tests_BUILT} ]
|
||||||
then
|
then
|
||||||
LIBS="${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS} "
|
LIBS="${libiso8601} ${libiso8601_DEP_CFLAGS} ${libiso8601_DEP_LIBS} "
|
||||||
EXTRAS="-D_GNU_SOURCE"
|
EXTRAS="-lm"
|
||||||
|
|
||||||
echo "Building test programs..."
|
echo "Building test programs..."
|
||||||
do_cmd mkdir -p obj/tests || return 1
|
do_cmd mkdir -p obj/tests || return 1
|
||||||
|
@ -25,14 +25,9 @@ then
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
case "${TEST}" in
|
|
||||||
obj/tests/manip) TEST_EXTRAS="-lm" ;;
|
|
||||||
*) TEST_EXTRAS="" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ ${MODIFIED} -ne 0 ]
|
if [ ${MODIFIED} -ne 0 ]
|
||||||
then
|
then
|
||||||
do_cmd ${CC} -Iobj ${CFLAGS} -o ${TEST} ${SRC} ${LIBS} ${EXTRAS} ${TEST_EXTRAS} || return 1
|
do_cmd ${CC} -Iobj ${CFLAGS} -o ${TEST} ${SRC} ${LIBS} ${EXTRAS} || return 1
|
||||||
print_success "Built ${TEST}"
|
print_success "Built ${TEST}"
|
||||||
else
|
else
|
||||||
print_success "${TEST} is up to date"
|
print_success "${TEST} is up to date"
|
||||||
|
@ -44,5 +39,4 @@ then
|
||||||
tests_BUILT=1
|
tests_BUILT=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: syntax=sh:expandtab:ts=4:sw=4
|
# vim: syntax=sh:expandtab:ts=4:sw=4
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
/* libiso8601/src/tests/???.c
|
/* libiso8601/src/tests/xxx.c
|
||||||
*
|
*
|
||||||
* (c)2007, Laurence Withers, <l@lwithers.me.uk>.
|
* Copyright: ©2007–2011, Güralp Systems Ltd.
|
||||||
* Released under the GNU GPLv3. See file COPYING or
|
* Author: Laurence Withers <lwithers@guralp.com>
|
||||||
* http://www.gnu.org/copyleft/gpl.html for details.
|
* License: GPLv3
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "iso8601.h"
|
#include "iso8601.h"
|
||||||
|
|
||||||
|
@ -12,7 +12,8 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int main(int argc, char* argv[])
|
int
|
||||||
|
main(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -30,7 +31,8 @@ int main(int argc, char* argv[])
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* options for text editors
|
/* options for text editors
|
||||||
kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
vim: expandtab:ts=4:sw=4
|
vim: expandtab:ts=4:sw=4
|
||||||
*/
|
*/
|
||||||
|
|
7
version
7
version
|
@ -1,8 +1,8 @@
|
||||||
# libiso8601/version
|
# libiso8601/version
|
||||||
#
|
#
|
||||||
# (c)2007, Laurence Withers, <l@lwithers.me.uk>.
|
# Copyright: ©2007–2011, Güralp Systems Ltd.
|
||||||
# Released under the GNU GPLv3. See file COPYING or
|
# Author: Laurence Withers <lwithers@guralp.com>
|
||||||
# http://www.gnu.org/copyleft/gpl.html for details.
|
# License: GPLv3
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
@ -13,5 +13,4 @@ VERMAJOR=0
|
||||||
VERMINOR=3
|
VERMINOR=3
|
||||||
VERMICRO=11
|
VERMICRO=11
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
|
||||||
# vim: expandtab:ts=4:sw=4:syntax=sh
|
# vim: expandtab:ts=4:sw=4:syntax=sh
|
||||||
|
|
Loading…
Reference in New Issue