Merged dev

getVersion.sh

@@ -2,14 +2,15 @@
 dir=`mktemp -d`
 cat > "$dir/libhomegear-base-version.cpp" <<-'EOF'
 #include "homegear-base/BaseLib.h"
+#include <iostream>
 
 int main(int argc, char** argv)
 {
 	std::cout << BaseLib::SharedObjects::version() << std::endl;
 	return 0;
 }
 EOF
-g++ -std=c++11 -o $dir/libhomegear-base-version $dir/libhomegear-base-version.cpp -lhomegear-base -lgcrypt -lgnutls
+g++ -std=c++11 -o $dir/libhomegear-base-version $dir/libhomegear-base-version.cpp -lhomegear-base -lgcrypt -lgnutls -lpthread -latomic
 chmod 755 $dir/libhomegear-base-version
 $dir/libhomegear-base-version
 rm -Rf $dir

src/DescriptionCreator.cpp

@@ -51,20 +51,20 @@ void DescriptionCreator::createDirectories()
         if(!BaseLib::Io::directoryExists(path1)) BaseLib::Io::createDirectory(path1, GD::bl->settings.dataPathPermissions());
         if(localUserId != 0 || localGroupId != 0)
         {
-            if(chown(path1.c_str(), localUserId, localGroupId) == -1) std::cerr << "Could not set owner on " << path1 << std::endl;
-            if(chmod(path1.c_str(), GD::bl->settings.dataPathPermissions()) == -1) std::cerr << "Could not set permissions on " << path1 << std::endl;
+            if(chown(path1.c_str(), localUserId, localGroupId) == -1) GD::out.printWarning("Could not set owner on " + path1);
+            if(chmod(path1.c_str(), GD::bl->settings.dataPathPermissions()) == -1) GD::out.printWarning("Could not set permissions on " + path1);
         }
         if(!BaseLib::Io::directoryExists(path2)) BaseLib::Io::createDirectory(path2, GD::bl->settings.dataPathPermissions());
         if(localUserId != 0 || localGroupId != 0)
         {
-            if(chown(path2.c_str(), localUserId, localGroupId) == -1) std::cerr << "Could not set owner on " << path2 << std::endl;
-            if(chmod(path2.c_str(), GD::bl->settings.dataPathPermissions()) == -1) std::cerr << "Could not set permissions on " << path2 << std::endl;
+            if(chown(path2.c_str(), localUserId, localGroupId) == -1) GD::out.printWarning("Could not set owner on " + path2);
+            if(chmod(path2.c_str(), GD::bl->settings.dataPathPermissions()) == -1) GD::out.printWarning("Could not set permissions on " + path2);
         }
         if(!BaseLib::Io::directoryExists(_xmlPath)) BaseLib::Io::createDirectory(_xmlPath, GD::bl->settings.dataPathPermissions());
         if(localUserId != 0 || localGroupId != 0)
         {
-            if(chown(_xmlPath.c_str(), localUserId, localGroupId) == -1) std::cerr << "Could not set owner on " << _xmlPath << std::endl;
-            if(chmod(_xmlPath.c_str(), GD::bl->settings.dataPathPermissions()) == -1) std::cerr << "Could not set permissions on " << _xmlPath << std::endl;
+            if(chown(_xmlPath.c_str(), localUserId, localGroupId) == -1) GD::out.printWarning("Could not set owner on " + _xmlPath);
+            if(chmod(_xmlPath.c_str(), GD::bl->settings.dataPathPermissions()) == -1) GD::out.printWarning("Could not set permissions on " + _xmlPath);
         }
     }
     catch(const std::exception& ex)

src/MyCentral.cpp

@@ -30,6 +30,8 @@
 #include "MyCentral.h"
 #include "GD.h"
 
+#include <iomanip>
+
 namespace MyFamily {
 
 MyCentral::MyCentral(ICentralEventSink* eventHandler) : BaseLib::Systems::ICentral(MY_FAMILY_ID, GD::bl, eventHandler)

src/MyPeer.cpp

@@ -33,6 +33,8 @@
 #include "MyPacket.h"
 #include "MyCentral.h"
 
+#include <iomanip>
+
 namespace MyFamily
 {
 std::shared_ptr<BaseLib::Systems::ICentral> MyPeer::getCentral()