diff --git a/skel/make.sh b/skel/make.sh index 3743de9..d32b5e3 100755 --- a/skel/make.sh +++ b/skel/make.sh @@ -77,13 +77,13 @@ make_monolithic() { if [ "$2" == "C" ] then HASHLINE=1 - VERDEFINE=1 + VERDEFINE=1 elif [ "$2" == "none" ] then - HASHLINE=0 # dummy command + HASHLINE=0 # dummy command else - print_failure "make_monolithic() called with unknown format $2" - return 1 + print_failure "make_monolithic() called with unknown format $2" + return 1 fi echo " Building monolithic file '${MONOLITHIC_OUT}'..." @@ -100,28 +100,28 @@ make_monolithic() { if [ "${FILE}" -nt ${MONOLITHIC_OUT} ] then MODIFIED=1 - break + break fi done if [ ${MODIFIED} -ne 0 ] then - do_cmd mkdir -p $(dirname ${MONOLITHIC_OUT}) + do_cmd mkdir -p $(dirname ${MONOLITHIC_OUT}) do_cmd rm -f ${MONOLITHIC_OUT} || exit 1 - - if [ ${VERDEFINE} -ne 0 ] - then - 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 VERMINOR ${VERMINOR}" || return 1 - do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERMICRO ${VERMICRO}" || return 1 - do_cmd_redir ${MONOLITHIC_OUT} echo "#define VEREXTRA \"${VEREXTRA}\"" || return 1 - fi + + if [ ${VERDEFINE} -ne 0 ] + then + 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 VERMINOR ${VERMINOR}" || return 1 + do_cmd_redir ${MONOLITHIC_OUT} echo "#define VERMICRO ${VERMICRO}" || return 1 + do_cmd_redir ${MONOLITHIC_OUT} echo "#define VEREXTRA \"${VEREXTRA}\"" || return 1 + fi for FILE in ${MONOLITHIC_SOURCE} do - if [ ${HASHLINE} -ne 0 ] - then + if [ ${HASHLINE} -ne 0 ] + then do_cmd_redir ${MONOLITHIC_OUT} echo "#line 1 \"${FILE}\"" || return 1 fi do_cmd_redir ${MONOLITHIC_OUT} cat "${FILE}" || return 1 @@ -260,10 +260,10 @@ do for dir in ${OUTPUT_DIRS} do [ -e "${dir}" ] && do_cmd \ - find "${dir}" \( -type f -o -type l \) -exec rm {} \; - [ $? -ne 0 ] && exit $? - done - print_success "Done" + find "${dir}" \( -type f -o -type l \) -exec rm {} \; + [ $? -ne 0 ] && exit $? + done + print_success "Done" ;; # bad Kdevelop! bad! @@ -273,7 +273,7 @@ do ;; *) - build_target ${func} || exit 1 + build_target ${func} || exit 1 ;; esac done diff --git a/skel/src/docs/build.docs b/skel/src/docs/build.docs index 1309d0e..c860a91 100644 --- a/skel/src/docs/build.docs +++ b/skel/src/docs/build.docs @@ -15,23 +15,23 @@ then then do_cmd cp src/docs/Doxyfile.in ${DOXYFILE} || return 1 echo "INPUT = ${MONOLITHIC_DOC}" >> ${DOXYFILE} - echo "PROJECT_NUMBER = ${VERSION}" >> ${DOXYFILE} + echo "PROJECT_NUMBER = ${VERSION}" >> ${DOXYFILE} fi MODIFIED=0 for file in ${MONOLITHIC_DOC} do if [ ${file} -nt html/index.html ] - then - MODIFIED=1 - break - fi + then + MODIFIED=1 + break + fi done if [ ${MODIFIED} -ne 0 ] then do_cmd doxygen ${DOXYFILE} || return 1 - print_success "Documentation built" + print_success "Documentation built" else print_success "Documentation is up to date" fi diff --git a/skel/src/tests/build.tests b/skel/src/tests/build.tests index 62b209a..9eb7ed6 100644 --- a/skel/src/tests/build.tests +++ b/skel/src/tests/build.tests @@ -13,23 +13,23 @@ then for SRC in src/tests/*.cpp do TEST="obj/tests/$(basename ${SRC} | sed -e 's,.cpp$,,')" - MODIFIED=0 - for file in ${LIBCPP} ${SRC} - do - if [ ${file} -nt ${TEST} ] - then - MODIFIED=1 - break - fi - done + MODIFIED=0 + for file in ${LIBCPP} ${SRC} + do + if [ ${file} -nt ${TEST} ] + then + MODIFIED=1 + break + fi + done - if [ ${MODIFIED} -ne 0 ] - then + if [ ${MODIFIED} -ne 0 ] + then do_cmd ${CXX} -Iobj ${CFLAGS} -o ${TEST} ${SRC} ${LIBS} || return 1 - print_success "Built ${TEST}" - else - print_success "${TEST} is up to date" - fi + print_success "Built ${TEST}" + else + print_success "${TEST} is up to date" + fi done print_success "All tests built"