Changeset 454 for code/branches/objecthierarchy/src

Timestamp:

Dec 10, 2007, 5:56:22 PM (17 years ago)

Author:

landauf

Message:

no idea if this works: added chrigis SignalHandler from orxonox_v1 to catch SIGSEGV, SIGABRT and SIGILL signals and write debug informations into orxonox.log

Location:

code/branches/objecthierarchy/src

Files:

• CMakeLists.txt (modified) (1 diff)
• orxonox/core/SignalHandler.cc (added)
• orxonox/core/SignalHandler.h (added)
• orxonox/orxonox.cc (modified) (3 diffs)

code/branches/objecthierarchy/src/CMakeLists.txt

@@ -2 +2 @@
 
 # create a few variables to simplify life
-SET(SRC_FILES orxonox/orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc orxonox/core/IdentifierList.cc orxonox/core/Identifier.cc orxonox/core/MetaObjectList.cc orxonox/core/Factory.cc orxonox/core/OrxonoxClass.cc orxonox/core/ConfigValueContainer.cc orxonox/objects/BaseObject.cc orxonox/objects/test1.cc orxonox/objects/test2.cc orxonox/objects/test3.cc)
-SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h orxonox/core/CoreIncludes.h orxonox/core/Debug.h orxonox/core/Identifier.h orxonox/core/Factory.h orxonox/core/ClassFactory.h orxonox/core/IdentifierList.h orxonox/core/ObjectList.h orxonox/core/MetaObjectList.h orxonox/core/Iterator.h orxonox/core/OrxonoxClass.h orxonox/core/ConfigValueContainer.h orxonox/objects/BaseObject.h orxonox/objects/Test.h orxonox/objects/test1.h orxonox/objects/test2.h orxonox/objects/test3.h orxonox/objects/Tickable.h orxonox/objects/Timer.h)
+SET(SRC_FILES
+        orxonox/orxonox.cc
+        loader/LevelLoader.cc
+        xml/xmlParser.cc
+        orxonox/core/IdentifierList.cc
+        orxonox/core/Identifier.cc
+        orxonox/core/MetaObjectList.cc
+        orxonox/core/Factory.cc
+        orxonox/core/OrxonoxClass.cc
+        orxonox/core/ConfigValueContainer.cc
+        orxonox/core/SignalHandler.cc
+        orxonox/objects/BaseObject.cc
+        orxonox/objects/test1.cc
+        orxonox/objects/test2.cc
+        orxonox/objects/test3.cc
+)
+
+SET(INC_FILES
+        loader/LevelLoader.h
+        xml/xmlParser.h
+        orxonox/core/CoreIncludes.h
+        orxonox/core/Debug.h
+        orxonox/core/Identifier.h
+        orxonox/core/Factory.h
+        orxonox/core/ClassFactory.h
+        orxonox/core/IdentifierList.h
+        orxonox/core/ObjectList.h
+        orxonox/core/MetaObjectList.h
+        orxonox/core/Iterator.h
+        orxonox/core/OrxonoxClass.h
+        orxonox/core/ConfigValueContainer.h
+        orxonox/core/SignalHandler.h
+        orxonox/objects/BaseObject.h
+        orxonox/objects/Test.h
+        orxonox/objects/test1.h
+        orxonox/objects/test2.h
+        orxonox/objects/test3.h
+        orxonox/objects/Tickable.h
+        orxonox/objects/Timer.h
+)
 
 #Creates an executable

code/branches/objecthierarchy/src/orxonox/orxonox.cc

@@ -43 +43 @@
 
 #include "core/CoreIncludes.h"
+#include "core/SignalHandler.h"
 #include "objects/Tickable.h"
 #include "objects/Timer.h"
@@ -781 +782 @@
 using namespace Ogre;
 
-#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include "windows.h"
-
-             INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
-#else
+//#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+//#define WIN32_LEAN_AND_MEAN
+//#include "windows.h"
+
+//             INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
+//#else
              int main(int argc, char **argv)
-#endif
+//#endif
 {
   try
   {
+    SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
     orxonox::OrxApplication orxonox;
     orxonox.go();
@@ -797 +799 @@
   catch(Exception& e)
   {
-#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-    MessageBoxA(NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-#else
+//#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+//    MessageBoxA(NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+//#else
     fprintf(stderr, "An exception has occurred: %s\n",
             e.getFullDescription().c_str());
-#endif
+//#endif
   }