[Orxonox-commit 14] r2729 - trunk/bin

rgrieder at orxonox.net rgrieder at orxonox.net
Mon Mar 2 13:56:50 CET 2009


Author: rgrieder
Date: 2009-03-02 13:56:50 +0100 (Mon, 02 Mar 2009)
New Revision: 2729

Added:
   trunk/bin/dedicated.bat.in
   trunk/bin/dedicated.in
Modified:
   trunk/bin/CMakeLists.txt
   trunk/bin/client1.bat.in
   trunk/bin/client1.in
   trunk/bin/client2.bat.in
   trunk/bin/client2.in
   trunk/bin/run.bat.in
   trunk/bin/run.in
   trunk/bin/server.bat.in
   trunk/bin/server.in
Log:
- Added run script for the dedicated server
- Removed directory changes and used full path instead (build tree only uses absolute paths anyway)

Modified: trunk/bin/CMakeLists.txt
===================================================================
--- trunk/bin/CMakeLists.txt	2009-03-02 12:47:42 UTC (rev 2728)
+++ trunk/bin/CMakeLists.txt	2009-03-02 12:56:50 UTC (rev 2729)
@@ -28,7 +28,7 @@
 IF(WIN32)
   SET(RUN_SCRIPTS run.bat client1.bat client2.bat server.bat)
 ELSEIF(UNIX)
-  SET(RUN_SCRIPTS run client1 client2 server)
+  SET(RUN_SCRIPTS run client1 client2 server dedicated)
 ENDIF()
 
 IF(NOT CMAKE_CONFIGURATION_TYPES)

Modified: trunk/bin/client1.bat.in
===================================================================
--- trunk/bin/client1.bat.in	2009-03-02 12:47:42 UTC (rev 2728)
+++ trunk/bin/client1.bat.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -1,6 +1,4 @@
 title @PROJECT_NAME@
 path @ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at WINDOWS_DRIVE_CHANGE@
-cd @CURRENT_RUNTIME_DIR_WINDOWS@
- at ORXONOX_EXECUTABLE_NAME@ --state client --directory client1
+ at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --state client --directory client1
 pause

Modified: trunk/bin/client1.in
===================================================================
--- trunk/bin/client1.in	2009-03-02 12:47:42 UTC (rev 2728)
+++ trunk/bin/client1.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -1,4 +1,4 @@
 #!/bin/sh
 # convenience script for starting orxonox on Linux
 
-cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state client --directory client1 $@
+exec . at CURRENT_RUNTIME_DIR@/@ORXONOX_EXECUTABLE_NAME@ --state client --directory client1 $@

Modified: trunk/bin/client2.bat.in
===================================================================
--- trunk/bin/client2.bat.in	2009-03-02 12:47:42 UTC (rev 2728)
+++ trunk/bin/client2.bat.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -1,6 +1,4 @@
 title @PROJECT_NAME@
 path @ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at WINDOWS_DRIVE_CHANGE@
-cd @CURRENT_RUNTIME_DIR_WINDOWS@
- at ORXONOX_EXECUTABLE_NAME@ --state client --directory client2
+ at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --state client --directory client2
 pause

Modified: trunk/bin/client2.in
===================================================================
--- trunk/bin/client2.in	2009-03-02 12:47:42 UTC (rev 2728)
+++ trunk/bin/client2.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -1,4 +1,4 @@
 #!/bin/sh
 # convenience script for starting orxonox on Linux
 
-cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state client --directory client2 $@
+exec . at CURRENT_RUNTIME_DIR@/@ORXONOX_EXECUTABLE_NAME@ --state client --directory client2 $@

Copied: trunk/bin/dedicated.bat.in (from rev 2719, trunk/bin/server.bat.in)
===================================================================
--- trunk/bin/dedicated.bat.in	                        (rev 0)
+++ trunk/bin/dedicated.bat.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -0,0 +1,4 @@
+title @PROJECT_NAME@
+path @ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
+ at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --state dedicated --directory dedicated
+pause

Copied: trunk/bin/dedicated.in (from rev 2719, trunk/bin/server.in)
===================================================================
--- trunk/bin/dedicated.in	                        (rev 0)
+++ trunk/bin/dedicated.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# convenience script for starting orxonox on Linux
+
+cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state dedicated --directory dedicated $@

Modified: trunk/bin/run.bat.in
===================================================================
--- trunk/bin/run.bat.in	2009-03-02 12:47:42 UTC (rev 2728)
+++ trunk/bin/run.bat.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -1,6 +1,4 @@
 title @PROJECT_NAME@
 path @ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at WINDOWS_DRIVE_CHANGE@
-cd @CURRENT_RUNTIME_DIR_WINDOWS@
- at ORXONOX_EXECUTABLE_NAME@
+ at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@
 pause

Modified: trunk/bin/run.in
===================================================================
--- trunk/bin/run.in	2009-03-02 12:47:42 UTC (rev 2728)
+++ trunk/bin/run.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -1,4 +1,4 @@
 #!/bin/sh
 # convenience script for starting orxonox on Linux
 
-cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@
+exec . at CURRENT_RUNTIME_DIR@/@ORXONOX_EXECUTABLE_NAME@ $@

Modified: trunk/bin/server.bat.in
===================================================================
--- trunk/bin/server.bat.in	2009-03-02 12:47:42 UTC (rev 2728)
+++ trunk/bin/server.bat.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -1,6 +1,4 @@
 title @PROJECT_NAME@
 path @ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at WINDOWS_DRIVE_CHANGE@
-cd @CURRENT_RUNTIME_DIR_WINDOWS@
- at ORXONOX_EXECUTABLE_NAME@ --state server --directory server
+ at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --state server --directory server
 pause

Modified: trunk/bin/server.in
===================================================================
--- trunk/bin/server.in	2009-03-02 12:47:42 UTC (rev 2728)
+++ trunk/bin/server.in	2009-03-02 12:56:50 UTC (rev 2729)
@@ -1,4 +1,4 @@
 #!/bin/sh
 # convenience script for starting orxonox on Linux
 
-cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state server --directory server $@
+exec . at CURRENT_RUNTIME_DIR@/@ORXONOX_EXECUTABLE_NAME@ --state server --directory server $@




More information about the Orxonox-commit mailing list