Changeset 2709 for code/branches/buildsystem3/src

Timestamp:

Feb 28, 2009, 7:15:37 PM (16 years ago)

Author:

rgrieder

Message:

Added run scripts for client1, client2 and server.
They will be copied to the same locations as the original run scripts.
Furthermore specifying "—directory foobar" to the command line will put the config and log files in the subfolder foobar.
—> server goes to config/server, etc.
That should avoid conflicts when using the same logfile from multiple executables.

Location:

code/branches/buildsystem3/src

Files:

• core/Core.cc (modified) (2 diffs)
• orxonox/Main.cc (modified) (2 diffs)

code/branches/buildsystem3/src/core/Core.cc

@@ -77 +77 @@
 
     SetCommandLineArgument(mediaPath, "").information("PATH");
+    SetCommandLineArgument(directory, "").information("DIR");
 
     /**
@@ -426 +427 @@
 #endif
         }
+
+        // Option to put all the config and log files in a separate folder
+        if (!CommandLine::getArgument("directory")->hasDefaultValue())
+        {
+            std::string directory(CommandLine::getValue("directory"));
+            configPath_g = configPath_g / directory;
+            logPath_g    = logPath_g    / directory;
+        }
     }
 

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

@@ -92 +92 @@
     using namespace orxonox;
 
-    Core::postMainInitialisation();
-
     // create a signal handler (only active for linux)
     SignalHandler signalHandler;
@@ -108 +106 @@
         COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl;
     }
+
+    // Do this after parsing the command line to allow customisation
+    Core::postMainInitialisation();
 
     // Create the ConfigFileManager before creating the GameStates in order to have