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

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

Revision: 281
          http://simspark.svn.sourceforge.net/simspark/?rev=281&view=rev
Author:   hedayat
Date:     2011-05-01 11:27:27 +0000 (Sun, 01 May 2011)

Log Message:
-----------
- A few more fixes for Windows installation
- add double quotes for cp/copy command

Modified Paths:
--------------
    trunk/rcssserver3d/ChangeLog
    trunk/rcssserver3d/windows/install_extra.nsi
    trunk/rcssserver3d/windows/uninstall_extra.nsi
    trunk/spark/ChangeLog
    trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp

Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog	2011-05-01 03:05:00 UTC (rev 280)
+++ trunk/rcssserver3d/ChangeLog	2011-05-01 11:27:27 UTC (rev 281)
@@ -1,5 +1,10 @@
 2011-05-01  Hedayat Vatankhah  <hed...@gm...>
 
+	* windows/uninstall_extra.nsi: 
+	* windows/install_extra.nsi: 
+	- install an rcsoccersim3d script under Windows
+	- fixed path commands to not include = sign
+	
 	* cmake/FindODE.cmake: 
 	- don't overwrite config options obtained from ode-config if available 
 	

Modified: trunk/rcssserver3d/windows/install_extra.nsi
===================================================================
--- trunk/rcssserver3d/windows/install_extra.nsi	2011-05-01 03:05:00 UTC (rev 280)
+++ trunk/rcssserver3d/windows/install_extra.nsi	2011-05-01 11:27:27 UTC (rev 281)
@@ -6,25 +6,32 @@
 ${if} $MyTemp != ">"
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\RCSSServer3D.lnk" "$INSTDIR\bin\rcssserver3d.cmd"
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\RCSSMonitor3D.lnk" "$INSTDIR\bin\rcssmonitor3d.cmd"
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\RCSoccerSim3D.lnk" "$INSTDIR\bin\rcsoccersim3d.cmd"
 ${endif}
 
 
 WriteRegExpandStr HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'RCSSSERVER3D_DIR' '$INSTDIR'
 ClearErrors
 FileOpen $0 $INSTDIR\bin\rcssserver3d.cmd w
-FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%SPARK_DIR%\lib\thirdparty;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'PATH %PATH%;%SPARK_DIR%\lib\simspark;%SPARK_DIR%\lib\thirdparty;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
 FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
-FileWrite $0 'rcssserver3d.exe %1 %2 %3 %4'
+FileWrite $0 'rcssserver3d.exe %1 %2 %3 %4$\n'
 FileClose $0
 ClearErrors
 FileOpen $0 $INSTDIR\bin\rcssmonitor3d.cmd w
-FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%SPARK_DIR%\lib\thirdparty;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'PATH %PATH%;%SPARK_DIR%\lib\simspark;%SPARK_DIR%\lib\thirdparty;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
 FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
-FileWrite $0 'rcssmonitor3d.exe %1 %2 %3 %4'
+FileWrite $0 'rcssmonitor3d.exe %1 %2 %3 %4$\n'
 FileClose $0
 ClearErrors
 FileOpen $0 $INSTDIR\bin\rcssagent3d.cmd w
-FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%SPARK_DIR%\lib\thirdparty;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'PATH %PATH%;%SPARK_DIR%\lib\simspark;%SPARK_DIR%\lib\thirdparty;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
 FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
-FileWrite $0 'rcssagent3d.exe %1 %2 %3 %4'
+FileWrite $0 'rcssagent3d.exe %1 %2 %3 %4$\n'
 FileClose $0
+ClearErrors
+FileOpen $0 $INSTDIR\bin\rcsoccersim3d.cmd w
+FileWrite $0 'start cmd /c "%RCSSSERVER3D_DIR%\bin\rcssserver3d.cmd"$\n'
+FileWrite $0 'start /b /wait cmd /c "%RCSSSERVER3D_DIR%\bin\rcssmonitor3d.cmd"$\n'
+FileClose $0
+

Modified: trunk/rcssserver3d/windows/uninstall_extra.nsi
===================================================================
--- trunk/rcssserver3d/windows/uninstall_extra.nsi	2011-05-01 03:05:00 UTC (rev 280)
+++ trunk/rcssserver3d/windows/uninstall_extra.nsi	2011-05-01 11:27:27 UTC (rev 281)
@@ -1,6 +1,7 @@
 Delete '$INSTDIR\bin\rcssserver3d.cmd'
 Delete '$INSTDIR\bin\rcssmonitor3d.cmd'
 Delete '$INSTDIR\bin\rcssagent3d.cmd'
+Delete '$INSTDIR\bin\rcsoccersim3d.cmd'
 DeleteRegValue HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'RCSSSERVER3D_DIR'
 
 Var /GLOBAL STARTMENU_DIR_FORLINKS
@@ -8,3 +9,5 @@
     
 Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\RCSSServer3D.lnk"
 Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\RCSSMonitor3D.lnk"
+Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\RCSoccerSim3D.lnk"
+

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2011-05-01 03:05:00 UTC (rev 280)
+++ trunk/spark/ChangeLog	2011-05-01 11:27:27 UTC (rev 281)
@@ -8,6 +8,8 @@
 	* lib/salt/sharedlibrary.cpp: 
 	* lib/zeitgeist/scriptserver/scriptserver.cpp: 
 	- compilation fix under mingw32
+	(ScriptServer::RunInitScriptInternal): 
+	- enclose source and dest paths for copy command in double quotes
 	
 	* utility/rcssnet/socket.hpp: 
 	* utility/rcssnet/tcpsocket.cpp: 

Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp	2011-05-01 03:05:00 UTC (rev 280)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp	2011-05-01 11:27:27 UTC (rev 281)
@@ -511,9 +511,9 @@
 
     stringstream s;
 #ifdef WIN32
-    s << "copy " << sourcePath << " " << destPath;
+    s << "copy \"" << sourcePath << "\" \"" << destPath << '"';
 #else
-    s << "cp " << sourcePath << " " << destPath;
+    s << "cp \"" << sourcePath << "\" \"" << destPath << '"';
 #endif
     system(s.str().c_str());
 


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