[simspark-svn] SF.net SVN: simspark:[292] trunk/rcssserver3d

[<sgv...@us...>]

Revision: 292
          http://simspark.svn.sourceforge.net/simspark/?rev=292&view=rev
Author:   sgvandijk
Date:     2012-02-14 15:51:26 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
- adopt init script path prefix change to rcssserver3d

Modified Paths:
--------------
    trunk/rcssserver3d/ChangeLog
    trunk/rcssserver3d/rcssmonitor3d/main.cpp
    trunk/rcssserver3d/rcssserver3d/main.cpp

Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog	2012-02-14 15:48:05 UTC (rev 291)
+++ trunk/rcssserver3d/ChangeLog	2012-02-14 15:51:26 UTC (rev 292)
@@ -1,3 +1,10 @@
+2012-02-14  Sander van Dijk  <sgv...@gm...>
+
+	* rcssserver3d/main.cpp (Spark): 
+	* rcssmonitor3d/main.cpp (Spark):
+	- add --init-script-prefix option to specify location of spark.rb,
+	  zeitgeist.rb, etc
+
 2011-06-06  Hedayat Vatankhah  <hed...@gm...>
 
 	* plugin/soccer/soccerruleaspect/soccerruleaspect.cpp

Modified: trunk/rcssserver3d/rcssmonitor3d/main.cpp
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/main.cpp	2012-02-14 15:48:05 UTC (rev 291)
+++ trunk/rcssserver3d/rcssmonitor3d/main.cpp	2012-02-14 15:51:26 UTC (rev 292)
@@ -45,8 +45,8 @@
 class MonitorSpark : public Spark
 {
 public:
-    MonitorSpark(const std::string& relPathPrefix) :
-        Spark(relPathPrefix)
+    MonitorSpark() :
+        Spark()
     {};
 
     /** called once after Spark finished it's init */
@@ -165,7 +165,7 @@
 int main(int argc, char** argv)
 {
     // the spark app framework instance
-    MonitorSpark spark("../../");
+    MonitorSpark spark;
 
     if (! spark.Init(argc, argv))
         {

Modified: trunk/rcssserver3d/rcssserver3d/main.cpp
===================================================================
--- trunk/rcssserver3d/rcssserver3d/main.cpp	2012-02-14 15:48:05 UTC (rev 291)
+++ trunk/rcssserver3d/rcssserver3d/main.cpp	2012-02-14 15:51:26 UTC (rev 292)
@@ -45,8 +45,8 @@
 class SimSpark : public Spark
 {
 public:
-    SimSpark(const std::string& relPathPrefix) :
-        Spark(relPathPrefix),
+    SimSpark() :
+        Spark(),
         mScriptPath("rcssserver3d.rb")
     {};
 
@@ -83,10 +83,11 @@
     GetLog()->Normal()
         << "\nusage: rcssserver3d [options] [script]\n"
         << "\noptions:\n"
-        << " --help\t\t\t print this message.\n"
-        << " --script-path PATH\t set the script path (rcssserver3d.rb path).\n"
-        << "--agent-port PORTNUM\t port for agents to connect to.\n"
-        << "--server-port PORTNUM\t port for monitors to connect to.\n"
+        << " --help\t\t\t\t print this message.\n"
+        << " --script-path PATH\t\t set the script path (rcssserver3d.rb path).\n"
+        << " --init-script-prefix PATH\t path prefix for init scripts (spark.rb, oxygen.rb, etc.).\n"
+        << " --agent-port PORTNUM\t\t port for agents to connect to.\n"
+        << " --server-port PORTNUM\t\t port for monitors to connect to.\n"
         << "\n";
 }
 
@@ -166,7 +167,7 @@
 int main(int argc, char** argv)
 {
     // the spark app framework instance
-    SimSpark spark("../../");
+    SimSpark spark;
 
     if (! spark.Init(argc, argv))
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.