Changeset 3246 for code/branches/core4/src/core/Core.cc

Timestamp:

Jun 29, 2009, 1:43:41 PM (15 years ago)

Author:

rgrieder

Message:

Added new feature to CommandLine: arguments that cannot be specified in a file.
—optionsFile and —writingPathSuffix are now such arguments (because of obvious dependency problems).

File:

• code/branches/core4/src/core/Core.cc (modified) (3 diffs)

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

@@ -88 +88 @@
 
     SetCommandLineArgument(mediaPath, "").information("PATH");
-    SetCommandLineArgument(writingPathSuffix, "").information("DIR");
+    SetCommandLineOnlyArgument(writingPathSuffix, "").information("DIR");
     SetCommandLineArgument(settingsFile, "orxonox.ini");
     SetCommandLineArgument(limitToCPU, 0).information("0: off | #cpu");
@@ -103 +103 @@
     {
         // Parse command line arguments fist
-        try
-        {
-            CommandLine::parseAll(argc, argv);
-        }
-        catch (ArgumentException& ex)
-        {
-            COUT(1) << ex.what() << std::endl;
-            COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl;
-        }
+        CommandLine::parseCommandLine(argc, argv);
 
         // limit the main thread to the first core so that QueryPerformanceCounter doesn't jump
@@ -137 +129 @@
         // Set the correct log path. Before this call, /tmp (Unix) or %TEMP% was used
         OutputHandler::getOutStream().setLogPath(Core::getLogPathString());
+
+        CommandLine::parseFile();
 
         // Manage ini files and set the default settings file (usually orxonox.ini)