Changeset 2685 for code/branches/buildsystem3/src/orxonox

Timestamp:

Feb 20, 2009, 5:32:04 PM (16 years ago)

Author:

rgrieder

Message:

Fixed install target:

• log and config file go a to separate folder each
• The SignalHandler crash log is now "orxonox_crash.log" to avoid opening the file twice which might result in problems
• moved tcl scripts to media/tcl8.#/ as a temporary solution. I've also created a ticket to fix this.
• UPDATE YOUR MEDIA REPOSITORY
• orxonox.log pre-main gets written to either %TEMP% (windows) or /tmp (Unix) and when the path was set, the content is copied.
• removed Settings class and moved media path to Core
• media, log and config path are now all in Core where only the media path can be configured via ini file or command line
• Core::isDevBuild() tells whether we are running in the build or the installation directory (determined by the presence of "orxonox_dev_build.kepp_me" in the binary dir)
• renamed Settings::getDataPath to Core::getMediaPath

Location:

code/branches/buildsystem3/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• Main.cc (modified) (5 diffs)
• Settings.cc (deleted)
• Settings.h (deleted)
• gamestates/GSGraphics.cc (modified) (8 diffs)
• gamestates/GSLevel.cc (modified) (2 diffs)
• gamestates/GSRoot.cc (modified) (4 diffs)
• gamestates/GSRoot.h (modified) (1 diff)
• gui/GUIManager.cc (modified) (2 diffs)
• gui/GUIManager.h (modified) (2 diffs)
• objects/Level.cc (modified) (3 diffs)
• objects/gametypes/Gametype.cc (modified) (1 diff)

code/branches/buildsystem3/src/orxonox/CMakeLists.txt

@@ -25 +25 @@
   PawnManager.cc
   PlayerManager.cc
-  Settings.cc
 )
 ADD_SUBDIRECTORY(gamestates)
@@ -43 +42 @@
 IF(GCC_NO_SYSTEM_HEADER_SUPPORT)
   # Get around displaying a few hundred lines of warning code
-  SET_SOURCE_FILES_PROPERTIES(gamestates/GSGraphics.cc PROPERTIES COMPILE_FLAGS "-w")
+  SET_SOURCE_FILES_PROPERTIES(
+    gamestates/GSGraphics.cc
+    gui/GUIManager.cc
+    PROPERTIES COMPILE_FLAGS "-Wno-sign-compare"
+  )
 ENDIF()
 

code/branches/buildsystem3/src/orxonox/Main.cc

@@ -30 +30 @@
  /**
  @file
- @brief Entry point of the program. Platform specific code.
+ @brief Entry point of the program.
   */
 
@@ -37 +37 @@
 #include <exception>
 #include <cassert>
+#include <fstream>
 
 #include "OrxonoxConfig.h"
@@ -85 +86 @@
 
 
-//#ifdef __cplusplus
-//extern "C" {
-//#endif
-
 SetCommandLineArgument(settingsFile, "orxonox.ini");
+SetCommandLineArgument(configFileDirectory, "");
 
 int main(int argc, char** argv)
@@ -95 +93 @@
     using namespace orxonox;
 
-    // create a signal handler (only works for linux)
+    // First, determine whether we have an installed or a binary dir run
+    // The latter occurs when simply running from the build directory
+    std::ifstream probe;
+    probe.open("orxonox_dev_build.keep_me");
+    if (probe)
+    {
+        Core::setDevBuild();
+        probe.close();
+    }
+
+    // create a signal handler (only active for linux)
     SignalHandler signalHandler;
-    signalHandler.doCatch(argv[0], "orxonox.log");
+    signalHandler.doCatch(argv[0], Core::getLogPath() + "orxonox_crash.log");
 
     // Parse command line arguments
@@ -157 +165 @@
     return 0;
 }
-
-//#ifdef __cplusplus
-//}
-//#endif

code/branches/buildsystem3/src/orxonox/gamestates/GSGraphics.cc

@@ -61 +61 @@
 #include "gui/GUIManager.h"
 #include "tools/WindowEventListener.h"
-#include "Settings.h"
 
 // for compatibility
@@ -138 +137 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile(Settings::getDataPath() + "overlay/debug.oxo");
+        this->debugOverlay_ = new XMLFile(Core::getMediaPath() + "overlay/debug.oxo");
         Loader::open(debugOverlay_);
 
@@ -211 +210 @@
         delete this->ogreRoot_;
 
-//#ifdef ORXONOX_PLATFORM_WINDOWS
         // delete the ogre log and the logManager (since we have created it).
         this->ogreLogger_->getDefaultLog()->removeListener(this);
         this->ogreLogger_->destroyLog(Ogre::LogManager::getSingleton().getDefaultLog());
         delete this->ogreLogger_;
-//#endif
 
         delete graphicsEngine_;
@@ -287 +284 @@
         COUT(3) << "Setting up Ogre..." << std::endl;
 
-        // TODO: LogManager doesn't work on oli platform. The why is yet unknown.
-//#ifdef ORXONOX_PLATFORM_WINDOWS
+        if (ogreConfigFile_ == "")
+        {
+            COUT(2) << "Warning: Ogre config file set to \"\". Defaulting to config.cfg" << std::endl;
+            ModifyConfigValue(ogreConfigFile_, tset, "config.cfg");
+        }
+        if (ogreLogFile_ == "")
+        {
+            COUT(2) << "Warning: Ogre log file set to \"\". Defaulting to ogre.log" << std::endl;
+            ModifyConfigValue(ogreLogFile_, tset, "ogre.log");
+        }
+
+        boost::filesystem::path ogreConfigFilepath(Core::getConfigPath() + ogreConfigFile_);
+        boost::filesystem::path ogreLogFilepath(Core::getLogPath() + ogreLogFile_);
+
         // create a new logManager
+        // Ogre::Root will detect that we've already created a Log
         ogreLogger_ = new Ogre::LogManager();
         COUT(4) << "Ogre LogManager created" << std::endl;
@@ -295 +305 @@
         // create our own log that we can listen to
         Ogre::Log *myLog;
-        if (this->ogreLogFile_ == "")
-            myLog = ogreLogger_->createLog("ogre.log", true, false, true);
-        else
-            myLog = ogreLogger_->createLog(this->ogreLogFile_, true, false, false);
+        myLog = ogreLogger_->createLog(ogreLogFilepath.native_file_string(), true, false, false);
         COUT(4) << "Ogre Log created" << std::endl;
 
         myLog->setLogDetail(Ogre::LL_BOREME);
         myLog->addListener(this);
-//#endif
-
-        // Root will detect that we've already created a Log
+
         COUT(4) << "Creating Ogre Root..." << std::endl;
-
-        if (ogreConfigFile_ == "")
-        {
-            COUT(2) << "Warning: Ogre config file set to \"\". Defaulting to config.cfg" << std::endl;
-            ModifyConfigValue(ogreConfigFile_, tset, "config.cfg");
-        }
-        if (ogreLogFile_ == "")
-        {
-            COUT(2) << "Warning: Ogre log file set to \"\". Defaulting to ogre.log" << std::endl;
-            ModifyConfigValue(ogreLogFile_, tset, "ogre.log");
-        }
 
         // check for config file existence because Ogre displays (caught) exceptions if not
         std::ifstream probe;
-        probe.open(ogreConfigFile_.c_str());
+        probe.open(ogreConfigFilepath.native_file_string().c_str());
         if (!probe)
         {
             // create a zero sized file
             std::ofstream creator;
-            creator.open(ogreConfigFile_.c_str());
+            creator.open(ogreConfigFilepath.native_file_string().c_str());
             creator.close();
         }
@@ -333 +327 @@
 
         // Leave plugins file empty. We're going to do that part manually later
-        ogreRoot_ = new Ogre::Root("", ogreConfigFile_, ogreLogFile_);
-
-#if 0 // Ogre 1.4.3 doesn't yet support setDebugOutputEnabled(.)
-#ifndef ORXONOX_PLATFORM_WINDOWS
-        // tame the ogre ouput so we don't get all the mess in the console
-        Ogre::Log* defaultLog = Ogre::LogManager::getSingleton().getDefaultLog();
-        defaultLog->setDebugOutputEnabled(false);
-        defaultLog->setLogDetail(Ogre::LL_BOREME);
-        defaultLog->addListener(this);
-#endif
-#endif
+        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.native_file_string(), ogreLogFilepath.native_file_string());
 
         COUT(3) << "Ogre set up done." << std::endl;
@@ -377 +361 @@
         try
         {
-            cf.load(Settings::getDataPath() + resourceFile_);
+            cf.load(Core::getMediaPath() + resourceFile_);
         }
         catch (...)
@@ -403 +387 @@
 
                     Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
-                        std::string(Settings::getDataPath() + archName), typeName, secName);
+                        std::string(Core::getMediaPath() + archName), typeName, secName);
                 }
             }

code/branches/buildsystem3/src/orxonox/gamestates/GSLevel.cc

@@ -46 +46 @@
 #include "LevelManager.h"
 #include "PlayerManager.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -205 +204 @@
         std::string levelName;
         CommandLine::getValue("level", &levelName);
-        startFile_ = new XMLFile(Settings::getDataPath() + std::string("levels/") + levelName);
+        startFile_ = new XMLFile(Core::getMediaPath() + std::string("levels/") + levelName);
         Loader::open(startFile_);
     }

code/branches/buildsystem3/src/orxonox/gamestates/GSRoot.cc

@@ -44 +44 @@
 #include "tools/Timer.h"
 #include "objects/Tickable.h"
-#include "Settings.h"
 
 #ifdef ORXONOX_PLATFORM_WINDOWS
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include "windows.h"
-
-   //Get around Windows hackery
-#  ifdef max
-#    undef max
-#  endif
-#  ifdef min
-#    undef min
-#  endif
+#  include <winbase.h>
 #endif
 
 namespace orxonox
 {
-    SetCommandLineArgument(dataPath, "").information("PATH");
     SetCommandLineArgument(limitToCPU, 1).information("0: off | #cpu");
 
@@ -71 +58 @@
         , bPaused_(false)
         , timeFactorPauseBackup_(1.0f)
-        , settings_(0)
         , tclBind_(0)
         , tclThreadManager_(0)
@@ -113 +99 @@
         this->luaBind_ = new LuaBind();
 
-        // instantiate Settings class
-        this->settings_ = new Settings();
-
-        std::string dataPath = CommandLine::getValue("dataPath");
-        if (dataPath != "")
-        {
-            if (*dataPath.end() != '/' && *dataPath.end() != '\\')
-                Settings::tsetDataPath(dataPath + "/");
-            else
-                Settings::tsetDataPath(dataPath);
-        }
-
         // initialise TCL
-        this->tclBind_ = new TclBind(Settings::getDataPath());
+        this->tclBind_ = new TclBind(Core::getMediaPath());
         this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter());
 
@@ -182 +156 @@
         delete this->tclBind_;
 
-        delete this->settings_;
         delete this->luaBind_;
 

code/branches/buildsystem3/src/orxonox/gamestates/GSRoot.h

@@ -81 +81 @@
         bool                  bPaused_;
         float                 timeFactorPauseBackup_;
-        Settings*             settings_;
         TclBind*              tclBind_;
         TclThreadManager*     tclThreadManager_;

code/branches/buildsystem3/src/orxonox/gui/GUIManager.cc

@@ -36 +36 @@
 #include "GUIManager.h"
 
+#include <boost/filesystem.hpp>
 #include <OgreRenderWindow.h>
 #include <OgreRoot.h>
 #include <CEGUI.h>
+#include <CEGUIDefaultLogger.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
 #ifdef CEGUILUA_USE_INTERNAL_LIBRARY
@@ -148 +150 @@
                 this->luaState_ = this->scriptModule_->getLuaState();
 
+                // Create our own logger to specify the filepath
+                boost::filesystem::path ceguiLogFilepath(Core::getLogPath() + "cegui.log");
+                this->ceguiLogger_ = new DefaultLogger();
+                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.native_file_string());
+                // set the log level according to ours (translate by subtracting 1)
+                this->ceguiLogger_->setLoggingLevel(
+                    (LoggingLevel)(Core::getSoftDebugLevel(OutputHandler::LD_Logfile) - 1));
+
                 // create the CEGUI system singleton
                 this->guiSystem_ = new System(this->guiRenderer_, this->resourceProvider_, 0, this->scriptModule_);
-
-                // set the log level according to ours (translate by subtracting 1)
-                Logger::getSingleton().setLoggingLevel(
-                    (LoggingLevel)(Core::getSoftDebugLevel(OutputHandler::LD_Logfile) - 1));
 
                 // do this after 'new CEGUI::Sytem' because that creates the lua state in the first place

code/branches/buildsystem3/src/orxonox/gui/GUIManager.h

@@ -41 +41 @@
 #include <CEGUISystem.h>
 #include "core/input/InputInterfaces.h"
+
+// Forward declaration
+namespace CEGUI { class DefaultLogger; }
 
 // tolua_begin
@@ -119 +122 @@
         CEGUI::ResourceProvider*  resourceProvider_;
         CEGUI::LuaScriptModule*   scriptModule_;
+        CEGUI::DefaultLogger*     ceguiLogger_;
         CEGUI::System*            guiSystem_;
         CEGUI::Imageset*          backgroundImage_;

code/branches/buildsystem3/src/orxonox/objects/Level.cc

@@ -35 +35 @@
 #include "core/XMLFile.h"
 #include "core/Template.h"
+#include "core/Core.h"
 
-#include "Settings.h"
 #include "LevelManager.h"
 #include "objects/infos/PlayerInfo.h"
@@ -55 +55 @@
         this->xmlfilename_ = this->getFilename();
 
-        if (this->xmlfilename_.length() >= Settings::getDataPath().length())
-            this->xmlfilename_ = this->xmlfilename_.substr(Settings::getDataPath().length());
+        if (this->xmlfilename_.length() >= Core::getMediaPath().length())
+            this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPath().length());
     }
 
@@ -97 +97 @@
         mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
-        this->xmlfile_ = new XMLFile(Settings::getDataPath() + this->xmlfilename_, mask);
+        this->xmlfile_ = new XMLFile(Core::getMediaPath() + this->xmlfilename_, mask);
 
         Loader::open(this->xmlfile_);

code/branches/buildsystem3/src/orxonox/objects/gametypes/Gametype.cc

@@ -43 +43 @@
 #include "objects/worldentities/SpawnPoint.h"
 #include "objects/worldentities/Camera.h"
-#include "Settings.h"
 
 #include "network/Host.h"