Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[85] trunk
|
From: <he...@us...> - 2009-08-08 22:50:49
|
Revision: 85
http://simspark.svn.sourceforge.net/simspark/?rev=85&view=rev
Author: hedayat
Date: 2009-08-08 22:50:21 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
- incrementing soccer.so minor version (because of HMDP)
- compilation fix: add missing return command to some functions
- use external files for extra NSIS install/uninstall commands
- add simspark and rcssmonitor3d start menu shortcuts
- bump simspark version to 0.1.2, preparing for a new release
- bump release version for modified libraries
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdp_c/base.c
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpwrapper.cpp
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
Added Paths:
-----------
trunk/rcssserver3d/windows/install_extra.nsi
trunk/rcssserver3d/windows/uninstall_extra.nsi
trunk/spark/windows/install_extra.nsi
trunk/spark/windows/uninstall_extra.nsi
Removed Paths:
-------------
trunk/rcssserver3d/windows/simspark.iss
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-08-08 22:50:21 UTC (rev 85)
@@ -129,18 +129,14 @@
set(CPACK_PACKAGE_VENDOR "RoboCup Soccer Server 3D Maintenance Group")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "RoboCup Soccer Simulation Server 3D")
+#set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/logos/simsparklogo.png")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
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 %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'")
-set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${DELETE_BATCH_FILES}\nDeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR'")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\install_extra.nsi")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\uninstall_extra.nsi")
include(CPack)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/ChangeLog 2009-08-08 22:50:21 UTC (rev 85)
@@ -1,3 +1,19 @@
+2009-08-09 Hedayat Vatankhah <he...@gr...>
+
+ * plugin/soccer/CMakeLists.txt:
+ - incrementing soccer.so minor version
+
+ * plugin/soccer/hmdp_effector/hmdp_c/base.c:
+ * plugin/soccer/hmdp_effector/hmdpwrapper.cpp:
+ - compilation fix: add missing return command to some functions
+
+ * windows/install_extra.nsi:
+ * windows/uninstall_extra.nsi:
+ - extra install/uninstall commands for NSIS installer
+
+ * CMakeLists.txt:
+ - use external files for extra NSIS install/uninstall commands
+
2009-07-31 Hedayat Vatankhah <he...@gr...>
* plugin/soccer/hmdp_effector/hmdp_c/sine_fixed.h:
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-08-08 22:50:21 UTC (rev 85)
@@ -128,7 +128,7 @@
target_link_libraries(soccer ${spark_libs} ${OPENGL_gl_LIBRARY})
if (NOT APPLE)
- set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
+ set_target_properties(soccer PROPERTIES VERSION 1.1.0 SOVERSION 1)
endif (NOT APPLE)
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdp_c/base.c
===================================================================
--- trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdp_c/base.c 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdp_c/base.c 2009-08-08 22:50:21 UTC (rev 85)
@@ -630,7 +630,6 @@
main_eval(base_data->buff); // see base.c
clearBuffer();
};
-
+ return 0;
}
-;
Modified: trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpwrapper.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpwrapper.cpp 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpwrapper.cpp 2009-08-08 22:50:21 UTC (rev 85)
@@ -32,7 +32,7 @@
hmdpEffectorHandle->sendMessage(messageToSend); //! after a carriage return or line feed is emmitted from the motor controller
messageToSend = "";
}
-
+ return 0;
}
//! reads the current servo positions (needed by the motorcontroller)
@@ -119,7 +119,7 @@
int sendBytetoMo(int data)
{
-
+ return 0;
}
//!currently max 7 character (+\0) per servo for the name
Added: trunk/rcssserver3d/windows/install_extra.nsi
===================================================================
--- trunk/rcssserver3d/windows/install_extra.nsi (rev 0)
+++ trunk/rcssserver3d/windows/install_extra.nsi 2009-08-08 22:50:21 UTC (rev 85)
@@ -0,0 +1,24 @@
+CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Simspark.lnk" "$INSTDIR\bin\simspark.cmd"
+CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\RCSSMonitor3D.lnk" "$INSTDIR\bin\rcssmonitor3d.cmd"
+!insertmacro MUI_STARTMENU_WRITE_END
+!define MUI_STARTMENUPAGE_CURRENT_ID "SOMETHING_NOT_AVAILABLE"
+
+WriteRegExpandStr HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'RCSSSERVER3D_DIR' '$INSTDIR'
+ClearErrors
+FileOpen $0 $INSTDIR\bin\simspark.cmd w
+FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
+FileWrite $0 'simspark.exe %1 %2 %3 %4'
+FileClose $0
+ClearErrors
+FileOpen $0 $INSTDIR\bin\rcssmonitor3d.cmd w
+FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
+FileWrite $0 'rcssmonitor3d.exe %1 %2 %3 %4'
+FileClose $0
+ClearErrors
+FileOpen $0 $INSTDIR\bin\rcssagent3d.cmd w
+FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
+FileWrite $0 'rcssagent3d.exe %1 %2 %3 %4'
+FileClose $0
Deleted: trunk/rcssserver3d/windows/simspark.iss
===================================================================
--- trunk/rcssserver3d/windows/simspark.iss 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/rcssserver3d/windows/simspark.iss 2009-08-08 22:50:21 UTC (rev 85)
@@ -1,79 +0,0 @@
-;
-; This is an Inno Setup Script for SimSpark. Use the Inno Compiler
-; available at http://www.jrsoftware.org/isinfo.php to create a
-; setup.exe for Windows. This script uses the Inno preprocessor addon
-; that has to be installed additionally
-;
-
-#define MyAppName "SimSpark"
-#define MyAppVerName "SimSpark"
-#define MyAppPublisher "RoboCup Soccer Server 3D Maintenance Group"
-#define MyAppURL "http://sourceforge.net/projects/simspark"
-#define MyAppExeName "rsgedit.exe"
-#define MyVcReleaseDir "..\vcrelease"
-#define MyRsgEditDir "..\..\contrib\rsgedit"
-#define MyZeitgeistDir "..\zeitgeist"
-#define MyOxygenDir "..\oxygen"
-#define MyKerosinDir "..\kerosin"
-#define MySparkDir "..\spark"
-#define MyRsgDir "..\..\simulations\parts\rsg"
-
-[Setup]
-AppName={#MyAppName}
-AppVerName={#MyAppVerName}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\simspark
-DefaultGroupName={#MyAppName}
-DisableProgramGroupPage=yes
-LicenseFile=..\COPYING
-OutputBaseFilename=setup
-Compression=lzma
-SolidCompression=yes
-
-[Languages]
-Name: english; MessagesFile: compiler:Default.isl
-
-[Tasks]
-Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
-Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
-
-[Files]
-; applications
-Source: {#MyVcReleaseDir}\rsgedit.exe; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\agentspark.exe; DestDir: {app}; Flags: ignoreversion
-
-; plugins
-Source: {#MyVcReleaseDir}\inputwx.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\rubysceneimporter.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\sexpparser.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\filesystemstd.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\soccer.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\sparkagent.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#MyVcReleaseDir}\sceneeffector.dll; DestDir: {app}; Flags: ignoreversion
-
-; ruby scripts
-Source: {#MyZeitgeistDir}\zeitgeist.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyOxygenDir}\oxygen.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyKerosinDir}\kerosin.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MySparkDir}\spark.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyRsgEditDir}\bindings.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyRsgEditDir}\german.scan.rb; DestDir: {app}; Flags: ignoreversion
-Source: {#MyRsgEditDir}\rsgedit.rb; DestDir: {app}; Flags: ignoreversion
-
-; rsg files
-Source: {#MyRsgDir}\*.rsg; DestDir: {app}\rsg; Flags: recursesubdirs
-Source: {#MyRsgDir}\*.rb; DestDir: {app}\rsg; Flags: recursesubdirs
-
-; support dlls
-Source: C:\ode\lib\releasedll\ode.dll; DestDir: {app}; Flags: ignoreversion
-Source: C:\ruby\bin\msvcrt-ruby18.dll; DestDir: {app}; Flags: ignoreversion
-
-[Icons]
-Name: {group}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}
-Name: {group}\{cm:ProgramOnTheWeb,{#MyAppName}}; Filename: {#MyAppURL}
-Name: {group}\{cm:UninstallProgram,{#MyAppName}}; Filename: {uninstallexe}
-Name: {commondesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}; Tasks: desktopicon
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; WorkingDir: {app}; Tasks: quicklaunchicon
Added: trunk/rcssserver3d/windows/uninstall_extra.nsi
===================================================================
--- trunk/rcssserver3d/windows/uninstall_extra.nsi (rev 0)
+++ trunk/rcssserver3d/windows/uninstall_extra.nsi 2009-08-08 22:50:21 UTC (rev 85)
@@ -0,0 +1,10 @@
+Delete '$INSTDIR\bin\simspark.cmd'
+Delete '$INSTDIR\bin\rcssmonitor3d.cmd'
+Delete '$INSTDIR\bin\rcssagent3d.cmd'
+DeleteRegValue HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'RCSSSERVER3D_DIR'
+
+Var /GLOBAL STARTMENU_DIR_FORLINKS
+!insertmacro MUI_STARTMENU_GETFOLDER Application $STARTMENU_DIR_FORLINKS
+
+Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\Simspark.lnk"
+Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\RCSSMonitor3D.lnk"
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/spark/CMakeLists.txt 2009-08-08 22:50:21 UTC (rev 85)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(simspark CXX C)
-set(PACKAGE_VERSION "0.1.1")
+set(PACKAGE_VERSION "0.1.2")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
@@ -132,13 +132,13 @@
########## library version numbers ##########
set(SALT_SO_VERSION 0)
-set(SALT_VERSION ${SALT_SO_VERSION}.3.1)
+set(SALT_VERSION ${SALT_SO_VERSION}.3.2)
set(ZEITGEIST_SO_VERSION 3)
-set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.0.1)
+set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.0.2)
set(OXYGEN_SO_VERSION 3)
-set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.2.3)
+set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.2.4)
set(KEROSIN_SO_VERSION 1)
-set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.0.1)
+set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.0.2)
set(SPARK_SO_VERSION 0)
set(SPARK_VERSION ${SPARK_SO_VERSION}.0.0)
set(RCSSNET_SO_VERSION 0)
@@ -208,12 +208,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(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "Push \$INSTDIR\\\\lib\\\\${CMAKE_PROJECT_NAME}\nCall AddToPath")
-#set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Push \$INSTDIR\\\\lib\\\\${CMAKE_PROJECT_NAME}\nCall un.RemoveFromPath")
-set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'SPARK_DIR' '\$INSTDIR'")
-set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "DeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'SPARK_DIR'")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\install_extra.nsi")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " !include ${CMAKE_SOURCE_DIR}\\\\windows\\\\uninstall_extra.nsi")
-
include(CPack)
#original Makefile.am contents follow:
@@ -229,5 +226,3 @@
#include $(top_srcdir)/config.aux/sf.am
#
#include $(top_srcdir)/config.aux/cvs.am
-
-
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-08-08 09:27:18 UTC (rev 84)
+++ trunk/spark/ChangeLog 2009-08-08 22:50:21 UTC (rev 85)
@@ -1,3 +1,14 @@
+2009-08-09 Hedayat Vatankhah <he...@gr...>
+
+ * windows/install_extra.nsi:
+ * windows/uninstall_extra.nsi:
+ - add extra NSIS commands in these files
+
+ * CMakeLists.txt:
+ - bump package version to 0.1.2, preparing for a new release
+ - using external files for NSIS installer extra commands
+ - bump release number for modified libraries
+
2009-07-31 Hedayat Vatankhah <he...@gr...>
* lib/oxygen/simulationserver/agentcontrol.cpp:
Added: trunk/spark/windows/install_extra.nsi
===================================================================
--- trunk/spark/windows/install_extra.nsi (rev 0)
+++ trunk/spark/windows/install_extra.nsi 2009-08-08 22:50:21 UTC (rev 85)
@@ -0,0 +1,4 @@
+!insertmacro MUI_STARTMENU_WRITE_END
+!define MUI_STARTMENUPAGE_CURRENT_ID "SOMETHING_NOT_AVAILABLE"
+
+WriteRegExpandStr HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'SPARK_DIR' '$INSTDIR'
Added: trunk/spark/windows/uninstall_extra.nsi
===================================================================
--- trunk/spark/windows/uninstall_extra.nsi (rev 0)
+++ trunk/spark/windows/uninstall_extra.nsi 2009-08-08 22:50:21 UTC (rev 85)
@@ -0,0 +1 @@
+DeleteRegValue HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'SPARK_DIR'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
