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

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

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

Log Message:
-----------
rcssserver3d: creating .cmd batch files for running executables
spark: using SPARK_DIR environment variable for detecting BundlePath if available

Modified Paths:
--------------
    trunk/rcssserver3d/CMakeLists.txt
    trunk/rcssserver3d/ChangeLog
    trunk/spark/ChangeLog
    trunk/spark/lib/salt/fileclasses.cpp

Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt	2009-07-26 08:35:30 UTC (rev 75)
+++ trunk/rcssserver3d/CMakeLists.txt	2009-07-27 07:02:56 UTC (rev 76)
@@ -134,11 +134,13 @@
 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_BATCH_FILES "ClearErrors\nFileOpen \$0
-\$INSTDIR\\\\bin\\\\simspark.bat w\nFileWrite \$0
-'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.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'\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_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(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete '\$INSTDIR\\\\bin\\\\simspark.bat'\nDeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR'")
+set(DELETE_BATCH_FILES "Delete '\$INSTDIR\\\\bin\\\\simspark.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssmonitor3d.cmd'\nDelete '\$INSTDIR\\\\bin\\\\rcssagent3d.cmd'")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${DELETE_BATCH_FILES}\nDeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR'")
 
 include(CPack)
 

Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog	2009-07-26 08:35:30 UTC (rev 75)
+++ trunk/rcssserver3d/ChangeLog	2009-07-27 07:02:56 UTC (rev 76)
@@ -1,3 +1,9 @@
+2009-07-27  Hedayat Vatankhah  <he...@gr...>
+
+	* CMakeLists.txt: 
+	- create .cmd files for executables in Windows, and remove them on 
+	  uninstallation
+
 2009-07-26  Hedayat Vatankhah  <he...@gr...>
 
 	* CMakeLists.txt: 

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2009-07-26 08:35:30 UTC (rev 75)
+++ trunk/spark/ChangeLog	2009-07-27 07:02:56 UTC (rev 76)
@@ -1,3 +1,8 @@
+2009-07-27  Hedayat Vatankhah  <he...@gr...>
+
+	* lib/salt/fileclasses.cpp (RFile::BundlePath): 
+	- use SPARK_DIR environment variable for BundlePath if available
+
 2009-07-26  Hedayat Vatankhah  <he...@gr...>
 
 	* CMakeLists.txt: 

Modified: trunk/spark/lib/salt/fileclasses.cpp
===================================================================
--- trunk/spark/lib/salt/fileclasses.cpp	2009-07-26 08:35:30 UTC (rev 75)
+++ trunk/spark/lib/salt/fileclasses.cpp	2009-07-27 07:02:56 UTC (rev 76)
@@ -21,6 +21,7 @@
 
 #include "fileclasses.h"
 #include <cstring>
+#include <cstdlib>
 
 #if HAVE_CONFIG_H
 #include <sparkconfig.h>
@@ -82,6 +83,11 @@
     return std::string(path) + Sep();
 #endif
 #else
+    const char *envPrefix = getenv("SPARK_DIR");
+    if (envPrefix)
+        {
+            return envPrefix + Sep() + "share" + Sep() + PACKAGE_NAME + Sep();
+        }
 # ifdef PREFIX
     return PREFIX + Sep() + "share" + Sep() + PACKAGE_NAME + Sep();
 # else


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