Change tabs for spaces.

This commit is contained in:
Laurence Withers 2006-07-24 15:32:19 +01:00
parent ff8f53193c
commit cead2ba38e
3 changed files with 43 additions and 43 deletions

View File

@ -77,13 +77,13 @@ make_monolithic() {
if [ "$2" == "C" ] if [ "$2" == "C" ]
then then
HASHLINE=1 HASHLINE=1
VERDEFINE=1 VERDEFINE=1
elif [ "$2" == "none" ] elif [ "$2" == "none" ]
then then
HASHLINE=0 # dummy command HASHLINE=0 # dummy command
else else
print_failure "make_monolithic() called with unknown format $2" print_failure "make_monolithic() called with unknown format $2"
return 1 return 1
fi fi
echo " Building monolithic file '${MONOLITHIC_OUT}'..." echo " Building monolithic file '${MONOLITHIC_OUT}'..."
@ -100,28 +100,28 @@ make_monolithic() {
if [ "${FILE}" -nt ${MONOLITHIC_OUT} ] if [ "${FILE}" -nt ${MONOLITHIC_OUT} ]
then then
MODIFIED=1 MODIFIED=1
break break
fi fi
done done
if [ ${MODIFIED} -ne 0 ] if [ ${MODIFIED} -ne 0 ]
then then
do_cmd mkdir -p $(dirname ${MONOLITHIC_OUT}) do_cmd mkdir -p $(dirname ${MONOLITHIC_OUT})
do_cmd rm -f ${MONOLITHIC_OUT} || exit 1 do_cmd rm -f ${MONOLITHIC_OUT} || exit 1
if [ ${VERDEFINE} -ne 0 ] if [ ${VERDEFINE} -ne 0 ]
then then
do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERSION \"${VERSION}\"" || return 1 do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERSION \"${VERSION}\"" || return 1
do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERMAJOR ${VERMAJOR}" || return 1 do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERMAJOR ${VERMAJOR}" || return 1
do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERMINOR ${VERMINOR}" || return 1 do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERMINOR ${VERMINOR}" || return 1
do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERMICRO ${VERMICRO}" || return 1 do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERMICRO ${VERMICRO}" || return 1
do_cmd_redir ${MONOLITHIC_OUT} echo "#define VEREXTRA \"${VEREXTRA}\"" || return 1 do_cmd_redir ${MONOLITHIC_OUT} echo "#define VEREXTRA \"${VEREXTRA}\"" || return 1
fi fi
for FILE in ${MONOLITHIC_SOURCE} for FILE in ${MONOLITHIC_SOURCE}
do do
if [ ${HASHLINE} -ne 0 ] if [ ${HASHLINE} -ne 0 ]
then then
do_cmd_redir ${MONOLITHIC_OUT} echo "#line 1 \"${FILE}\"" || return 1 do_cmd_redir ${MONOLITHIC_OUT} echo "#line 1 \"${FILE}\"" || return 1
fi fi
do_cmd_redir ${MONOLITHIC_OUT} cat "${FILE}" || return 1 do_cmd_redir ${MONOLITHIC_OUT} cat "${FILE}" || return 1
@ -260,10 +260,10 @@ do
for dir in ${OUTPUT_DIRS} for dir in ${OUTPUT_DIRS}
do do
[ -e "${dir}" ] && do_cmd \ [ -e "${dir}" ] && do_cmd \
find "${dir}" \( -type f -o -type l \) -exec rm {} \; find "${dir}" \( -type f -o -type l \) -exec rm {} \;
[ $? -ne 0 ] && exit $? [ $? -ne 0 ] && exit $?
done done
print_success "Done" print_success "Done"
;; ;;
# bad Kdevelop! bad! # bad Kdevelop! bad!
@ -273,7 +273,7 @@ do
;; ;;
*) *)
build_target ${func} || exit 1 build_target ${func} || exit 1
;; ;;
esac esac
done done

View File

@ -15,23 +15,23 @@ then
then then
do_cmd cp src/docs/Doxyfile.in ${DOXYFILE} || return 1 do_cmd cp src/docs/Doxyfile.in ${DOXYFILE} || return 1
echo "INPUT = ${MONOLITHIC_DOC}" >> ${DOXYFILE} echo "INPUT = ${MONOLITHIC_DOC}" >> ${DOXYFILE}
echo "PROJECT_NUMBER = ${VERSION}" >> ${DOXYFILE} echo "PROJECT_NUMBER = ${VERSION}" >> ${DOXYFILE}
fi fi
MODIFIED=0 MODIFIED=0
for file in ${MONOLITHIC_DOC} for file in ${MONOLITHIC_DOC}
do do
if [ ${file} -nt html/index.html ] if [ ${file} -nt html/index.html ]
then then
MODIFIED=1 MODIFIED=1
break break
fi fi
done done
if [ ${MODIFIED} -ne 0 ] if [ ${MODIFIED} -ne 0 ]
then then
do_cmd doxygen ${DOXYFILE} || return 1 do_cmd doxygen ${DOXYFILE} || return 1
print_success "Documentation built" print_success "Documentation built"
else else
print_success "Documentation is up to date" print_success "Documentation is up to date"
fi fi

View File

@ -13,23 +13,23 @@ then
for SRC in src/tests/*.cpp for SRC in src/tests/*.cpp
do do
TEST="obj/tests/$(basename ${SRC} | sed -e 's,.cpp$,,')" TEST="obj/tests/$(basename ${SRC} | sed -e 's,.cpp$,,')"
MODIFIED=0 MODIFIED=0
for file in ${LIBCPP} ${SRC} for file in ${LIBCPP} ${SRC}
do do
if [ ${file} -nt ${TEST} ] if [ ${file} -nt ${TEST} ]
then then
MODIFIED=1 MODIFIED=1
break break
fi fi
done done
if [ ${MODIFIED} -ne 0 ] if [ ${MODIFIED} -ne 0 ]
then then
do_cmd ${CXX} -Iobj ${CFLAGS} -o ${TEST} ${SRC} ${LIBS} || return 1 do_cmd ${CXX} -Iobj ${CFLAGS} -o ${TEST} ${SRC} ${LIBS} || 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"
fi fi
done done
print_success "All tests built" print_success "All tests built"