将退出之前的错误记录在日志文件中;修改批处理,无论编译成功失败都要恢复CMakeLists.txt
This commit is contained in:
parent
75af228072
commit
fc2a45efab
7
build.sh
7
build.sh
|
@ -88,11 +88,12 @@ make
|
||||||
|
|
||||||
if [ $? -ne 0 ];then
|
if [ $? -ne 0 ];then
|
||||||
echo "--------------------------------------make fail---------------------------------------"
|
echo "--------------------------------------make fail---------------------------------------"
|
||||||
exit 1
|
#exit 1 # commented, we should restore the CMakeLists.txts...
|
||||||
fi
|
else
|
||||||
echo "--------------------------------------make succeed------------------------------------"
|
echo "--------------------------------------make succeed------------------------------------"
|
||||||
|
fi
|
||||||
|
|
||||||
make
|
#make
|
||||||
|
|
||||||
if [ -f ../code_device/hgsane/CMakeLists.txtbkp ]; then
|
if [ -f ../code_device/hgsane/CMakeLists.txtbkp ]; then
|
||||||
mv ../code_device/hgsane/CMakeLists.txtbkp ../code_device/hgsane/CMakeLists.txt
|
mv ../code_device/hgsane/CMakeLists.txtbkp ../code_device/hgsane/CMakeLists.txt
|
||||||
|
|
|
@ -384,8 +384,11 @@ void hg_scanner_200::thread_handle_usb_read(void)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//else
|
else
|
||||||
|
{
|
||||||
// notify_ui_working_status(hg_scanner::error_description((scanner_err)prev_err).c_str(), SANE_EVENT_ERROR, prev_err);
|
// notify_ui_working_status(hg_scanner::error_description((scanner_err)prev_err).c_str(), SANE_EVENT_ERROR, prev_err);
|
||||||
|
HG_VLOG_MINI_1(LOG_LEVEL_WARNING, "-x-x-x-: USB thread error: %s\n", hg_scanner::strerr((scanner_err)prev_err).c_str());
|
||||||
|
}
|
||||||
prev_err = ret;
|
prev_err = ret;
|
||||||
}
|
}
|
||||||
this_thread::sleep_for(chrono::milliseconds(2));
|
this_thread::sleep_for(chrono::milliseconds(2));
|
||||||
|
|
Loading…
Reference in New Issue