Changeset 2709

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

Files:

• bin/CMakeLists.txt (modified) (2 diffs)
• bin/client1.bat.in (copied) (copied from code/branches/buildsystem3/bin/run.bat.in) (1 diff)
• bin/client1.in (copied) (copied from code/branches/buildsystem3/bin/run.in) (1 diff)
• bin/client2.bat.in (copied) (copied from code/branches/buildsystem3/bin/run.bat.in) (1 diff)
• bin/client2.in (copied) (copied from code/branches/buildsystem3/bin/run.in) (1 diff)
• bin/server.bat.in (copied) (copied from code/branches/buildsystem3/bin/run.bat.in) (1 diff)
• bin/server.in (copied) (copied from code/branches/buildsystem3/bin/run.in) (1 diff)
• src/core/Core.cc (modified) (2 diffs)
• src/orxonox/Main.cc (modified) (2 diffs)

code/branches/buildsystem3/bin/CMakeLists.txt

@@ -21 +21 @@
  #    Reto Grieder
  #  Description:
- #    Creates a run-script in the root directory of the build tree.
+ #    Creates run scripts in the root directory of the build tree and
+ #    the runtime output directory.
  #
 
-############ Configure Dev Build ##############
-
-
-################ Run Scripts ##################
-
-# Create a run script for Windows to manually add the DLL path when executing
+# Create run scripts for Windows to manually add the DLL path when executing
 IF(WIN32)
-  SET(RUN_SCRIPT run.bat)
+  SET(RUN_SCRIPTS run.bat client1.bat client2.bat server.bat)
 ELSEIF(UNIX)
-  SET(RUN_SCRIPT run)
+  SET(RUN_SCRIPTS run client1 client1 server)
 ENDIF()
 
@@ -51 +47 @@
   STRING(REPLACE "/" "\\" CURRENT_RUNTIME_DIR_WINDOWS ${CURRENT_RUNTIME_DIR})
 
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT}.in ${CURRENT_RUNTIME_DIR}/${RUN_SCRIPT} @ONLY)
-  IF(_subdir STREQUAL _default_subdir)
-    # Convenience script to be used when sitting in the binary directory. Defaults to Debug for msvc.
-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT}.in ${CMAKE_BINARY_DIR}/${RUN_SCRIPT} @ONLY)
-  ENDIF()
+  FOREACH(_script ${RUN_SCRIPTS})
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_script}.in ${CURRENT_RUNTIME_DIR}/${_script} @ONLY)
+    IF(_subdir STREQUAL _default_subdir)
+      # Convenience script to be used when sitting in the binary directory. Defaults to Debug for msvc.
+      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_script}.in ${CMAKE_BINARY_DIR}/${_script} @ONLY)
+    ENDIF()
+  ENDFOREACH(_script)
 
   # In order to evaluate at run time whether it is a dev build in the build tree,

code/branches/buildsystem3/bin/client1.bat.in

@@ -3 +3 @@
 @WINDOWS_DRIVE_CHANGE@
 cd @CURRENT_RUNTIME_DIR_WINDOWS@
-@ORXONOX_EXECUTABLE_NAME@
+@ORXONOX_EXECUTABLE_NAME@ --state client --directory client1
 pause

code/branches/buildsystem3/bin/client1.in

@@ -2 +2 @@
 # convenience script for starting orxonox on Linux
 
-cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@
+cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state client --directory client1 $@

code/branches/buildsystem3/bin/client2.bat.in

@@ -3 +3 @@
 @WINDOWS_DRIVE_CHANGE@
 cd @CURRENT_RUNTIME_DIR_WINDOWS@
-@ORXONOX_EXECUTABLE_NAME@
+@ORXONOX_EXECUTABLE_NAME@ --state client --directory client2
 pause

code/branches/buildsystem3/bin/client2.in

@@ -2 +2 @@
 # convenience script for starting orxonox on Linux
 
-cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@
+cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state client --directory client2 $@

code/branches/buildsystem3/bin/server.bat.in

@@ -3 +3 @@
 @WINDOWS_DRIVE_CHANGE@
 cd @CURRENT_RUNTIME_DIR_WINDOWS@
-@ORXONOX_EXECUTABLE_NAME@
+@ORXONOX_EXECUTABLE_NAME@ --state server --directory server
 pause

code/branches/buildsystem3/bin/server.in

@@ -2 +2 @@
 # convenience script for starting orxonox on Linux
 
-cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@
+cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state server --directory server $@

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