Merge branch 'master' of github.com:john30/ebusd

This commit is contained in:
john30
2016-12-17 12:13:29 +01:00
3 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ PACKAGE="${RELEASE}_${ARCH}.deb"
rm -rf "$BUILD"
mkdir -p "$BUILD" || exit 1
cd "$BUILD" || exit 1
(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* .| tar xf -) || exit 1
(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* "--exclude=*.o" "--exclude=*.a" .| tar xf -) || exit 1
echo
echo "*************"
+1 -1
View File
@@ -28,7 +28,7 @@ export PATH=$PATH:/usr/mipsel-linux-uclibc/bin
rm -rf "$BUILD"
mkdir -p "$BUILD" || exit 1
cd "$BUILD" || exit 1
(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* .| tar xf -) || exit 1
(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* "--exclude=*.o" "--exclude=*.a" .| tar xf -) || exit 1
echo
echo "*************"
+4
View File
@@ -59,9 +59,13 @@ MainLoop::MainLoop(const struct options opt, Device *device, MessageMap* message
m_device->setListener(this);
if (opt.dumpFile[0]) {
m_dumpFile = new RotateFile(opt.dumpFile, opt.dumpSize);
} else {
m_dumpFile = NULL;
}
if (opt.logRawFile[0] && strcmp(opt.logRawFile, opt.logFile)!=0) {
m_logRawFile = new RotateFile(opt.logRawFile, opt.logRawSize, true);
} else {
m_logRawFile = NULL;
}
m_logRawEnabled = opt.logRaw;
// create BusHandler