From e376f5feb9f429f99280e5262702b8b6e8501535 Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Tue, 7 Mar 2017 02:43:27 +0900 Subject: [PATCH] [BUILD] Update build scripts. --- source/build-cmake/config_build.sh | 10 +++++++--- source/build-cmake/config_build_cross_win32.sh | 24 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/source/build-cmake/config_build.sh b/source/build-cmake/config_build.sh index 164de5558..09d910952 100755 --- a/source/build-cmake/config_build.sh +++ b/source/build-cmake/config_build.sh @@ -95,8 +95,9 @@ function build_dll() { case ${_STATUS} in 0 ) sudo make install 2>&1 | tee -a ./make.log ;; * ) - exit ${_STATUS} - ;; + echo -e "Abort at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE} + exit ${_STATUS} + ;; esac make clean @@ -126,7 +127,8 @@ case ${BUILD_TYPE} in esac # libCSPGui -echo "Make status:" > ${MAKE_STATUS_FILE} +echo "Make status." > ${MAKE_STATUS_FILE} +echo "Started at `date --rfc-2822`:" >> ${MAKE_STATUS_FILE} case ${USE_COMMON_DEVICE_LIB} in "Yes" | "yes" | "YES" ) CMAKE_FLAGS4="-DUSE_DEVICES_SHARED_LIB=ON" @@ -178,6 +180,7 @@ for SRCDATA in $@ ; do\ case ${_STATUS} in 0 ) sudo make install 2>&1 | tee -a ./make.log ;; * ) + echo -e "Abort at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE} exit ${_STATUS} ;; esac @@ -185,6 +188,7 @@ for SRCDATA in $@ ; do\ make clean cd ../.. done +echo -e "End at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE} exit 0 diff --git a/source/build-cmake/config_build_cross_win32.sh b/source/build-cmake/config_build_cross_win32.sh index 0832953dd..e73e12242 100755 --- a/source/build-cmake/config_build_cross_win32.sh +++ b/source/build-cmake/config_build_cross_win32.sh @@ -8,6 +8,8 @@ export WINEDEBUG="-all" CMAKE_LINKFLAG="" CMAKE_APPENDFLAG="" MAKEFLAGS_GENERAL="-j4" +MAKE_STATUS_FILE="./000_make_status_config_build_cross_win32.log" + export WCLANG_FORCE_CXX_EXCEPTIONS=1 mkdir -p ./bin-win32/ @@ -103,6 +105,16 @@ function build_dll() { make clean make ${MAKEFLAGS_GENERAL} 2>&1 | tee -a ./make.log + _STATUS=${PIPESTATUS[0]} + echo -e "$1 at `date --rfc-2822`:" "${_STATUS}" >> ../../${MAKE_STATUS_FILE} + case ${_STATUS} in + 0 ) + ;; + * ) + echo -e "Abort at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE} + exit ${_STATUS} + ;; + esac cd ../../ } @@ -138,6 +150,8 @@ case ${USE_COMMON_DEVICE_LIB} in ;; esac +echo "Make status." > ${MAKE_STATUS_FILE} +echo "Started at `date --rfc-2822`:" >> ${MAKE_STATUS_FILE} build_dll libCSPemu_utils echo $PWD cp ./libCSPemu_utils/build-win32/qt/emuutils/*.h ./bin-win32/ @@ -203,15 +217,21 @@ for SRCDATA in $@ ; do\ make clean make ${MAKEFLAGS_GENERAL} 2>&1 | tee -a ./make.log - case $? in + _STATUS=${PIPESTATUS[0]} + echo -e "${SRCDATA} at `date --rfc-2822`:" "${_STATUS}" >> ../../${MAKE_STATUS_FILE} + case ${_STATUS} in 0 ) cp ./qt/common/*.exe ../../bin-win32/ ;; - * ) exit $? ;; + * ) + echo -e "Abort at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE} + exit ${_STATUS} + ;; esac make clean cd ../.. done +echo -e "End at `date --rfc-2822`." >> ../../${MAKE_STATUS_FILE} exit 0 #for ii in libCSPavio libCSPgui libCSPosd libCSPemu_utils; do -- 2.11.0