Changeset 2685 for code/branches/buildsystem3/src/orxonox/Main.cc

Timestamp:

Feb 20, 2009, 5:32:04 PM (15 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

File:

• code/branches/buildsystem3/src/orxonox/Main.cc (modified) (5 diffs)

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