[simspark-svn] SF.net SVN: simspark:[77] trunk

[<he...@us...>]

Revision: 77
          http://simspark.svn.sourceforge.net/simspark/?rev=77&view=rev
Author:   hedayat
Date:     2009-07-27 09:36:56 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Improved ruby 1.9.x compatibility
Add command line parameters to rcssserver3d binaries.

Modified Paths:
--------------
    trunk/rcssserver3d/CMakeLists.txt
    trunk/spark/ChangeLog
    trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp

Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt	2009-07-27 07:02:56 UTC (rev 76)
+++ trunk/rcssserver3d/CMakeLists.txt	2009-07-27 09:36:56 UTC (rev 77)
@@ -134,9 +134,9 @@
 set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
 set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
 set(CPACK_NSIS_CONTACT "sim...@li...")
-set(CREATE_SIMSPARK_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\simspark.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.exe'\nFileClose \$0")
-set(CREATE_MONITOR_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssmonitor3d.exe'\nFileClose \$0")
-set(CREATE_AGENT_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssagent3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssagent3d.exe'\nFileClose \$0")
+set(CREATE_SIMSPARK_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\simspark.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.exe %1 %2 %3 %4'\nFileClose \$0")
+set(CREATE_MONITOR_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssmonitor3d.exe %1 %2 %3 %4'\nFileClose \$0")
+set(CREATE_AGENT_BAT "ClearErrors\nFileOpen \$0 \$INSTDIR\\\\bin\\\\rcssagent3d.cmd w\nFileWrite \$0 'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nrcssagent3d.exe %1 %2 %3 %4'\nFileClose \$0")
 set(CREATE_BATCH_FILES "${CREATE_SIMSPARK_BAT}\n${CREATE_MONITOR_BAT}\n${CREATE_AGENT_BAT}")
 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR' '\$INSTDIR'\n${CREATE_BATCH_FILES}")
 set(DELETE_BATCH_FILES "Delete '\$INSTDIR\\\\bin\\\\simspark.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssagent3d.cmd'")

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2009-07-27 07:02:56 UTC (rev 76)
+++ trunk/spark/ChangeLog	2009-07-27 09:36:56 UTC (rev 77)
@@ -1,5 +1,8 @@
 2009-07-27  Hedayat Vatankhah  <he...@gr...>
 
+	* lib/zeitgeist/scriptserver/scriptserver.cpp: 
+	- improve ruby 1.9.x compatibility (using RARRAY_LEN() instead of RARRAY()->len)
+	
 	* lib/salt/fileclasses.cpp (RFile::BundlePath): 
 	- use SPARK_DIR environment variable for BundlePath if available
 

Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp	2009-07-27 07:02:56 UTC (rev 76)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp	2009-07-27 09:36:56 UTC (rev 77)
@@ -44,7 +44,7 @@
 void
 getParameterList(VALUE args, ParameterList& params)
 {
-    int argc = RARRAY(args)->len;
+    int argc = RARRAY_LEN(args);
 
     for (int i = 0; i<argc; ++i)
     {


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