Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[144] trunk/rcssserver3d
|
From: <he...@us...> - 2010-01-16 23:45:28
|
Revision: 144
http://simspark.svn.sourceforge.net/simspark/?rev=144&view=rev
Author: hedayat
Date: 2010-01-16 23:45:06 +0000 (Sat, 16 Jan 2010)
Log Message:
-----------
Preparing for a new release
Removed installation of third party libraries under Windows (now done by simspark)
Simspark -> rcssserver3d for Windows installer
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/NEWS
trunk/rcssserver3d/RELEASE
trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/windows/install_extra.nsi
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2010-01-14 09:15:14 UTC (rev 143)
+++ trunk/rcssserver3d/CMakeLists.txt 2010-01-16 23:45:06 UTC (rev 144)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(rcssserver3d CXX C)
-set(PACKAGE_VERSION "0.6.2")
+set(PACKAGE_VERSION "0.6.3")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
@@ -86,29 +86,6 @@
install(FILES ${CMAKE_BINARY_DIR}/rcssserver3d_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
-if (WIN32) # try to find and install third-party .dlls to bin/ directory
- string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
- if (EXISTS ${ODEDLL})
- install(PROGRAMS ${ODEDLL} DESTINATION ${BINDIR})
- endif (EXISTS ${ODEDLL})
-
- install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${BINDIR}
- FILES_MATCHING PATTERN "*.dll")
-
- string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
- if (EXISTS ${DevIL_DLL})
- install(PROGRAMS ${DevIL_DLL} DESTINATION ${BINDIR})
- endif (EXISTS ${DevIL_DLL})
-
- install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/" DESTINATION ${BINDIR}
- FILES_MATCHING PATTERN "*.dll")
-
- set(SDL_DLL "${SDL_INCLUDE_DIR}/../lib/sdl.dll")
- if (EXISTS ${SDL_DLL})
- install(PROGRAMS ${SDL_DLL} DESTINATION ${BINDIR})
- endif (EXISTS ${SDL_DLL})
-endif (WIN32)
-
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2010-01-14 09:15:14 UTC (rev 143)
+++ trunk/rcssserver3d/ChangeLog 2010-01-16 23:45:06 UTC (rev 144)
@@ -1,3 +1,21 @@
+2010-01-17 Hedayat Vatankhah <he...@gr...>
+
+ * RELEASE:
+ * NEWS:
+ - preparing for a new release
+
+ * CMakeLists.txt:
+ - removed installation of third party libraries. these are now included
+ in simspark package.
+ - bumped package version to 0.6.3
+
+ * windows/install_extra.nsi:
+ - use rcssserver3d instead of simspark.
+ - added thirdparty library path to the path
+
+ * rcssserver3d/CMakeLists.txt:
+ - do not install shell scripts and symbolic links on Windows
+
2010-01-11 Hedayat Vatankhah <he...@gr...>
* RELEASE:
Modified: trunk/rcssserver3d/NEWS
===================================================================
--- trunk/rcssserver3d/NEWS 2010-01-14 09:15:14 UTC (rev 143)
+++ trunk/rcssserver3d/NEWS 2010-01-16 23:45:06 UTC (rev 144)
@@ -1,3 +1,33 @@
+[0.6.3]
+In this release, we are preparing for a simulation with more robots than before.
+The current target is to have 6 vs 6 games, so we have made some changes to
+make the simulator more suitable for it. The most notable changes made in
+rcssserver3d package in this direction are:
+1. Disabling the internal monitor by default: starting from this version, the
+simulation server (simspark binary, now called rcssserver3d) no longer brings
+up a monitor when run. To actually view the simulation, a monitor (e.g.
+rcsmonitor3d which is included in this package) should be run separately. This
+separation noticeably improves the performance of the server. A new executable
+called "rcsoccersim3d" is provided which runs both the simulation server and a
+monitor on the local machine.
+2. Bigger field: in this version, field dimensions and goal width are 1.5 times
+larger than before to provide enough area for 6 vs 6 games.
+
+* New names:
+ - rcssserver3d: the old simspark binary has been renamed to rcssserver3d, as
+ it more clearly shows the functionality of the simulator. A symbolic link
+ called simspark is provided for compatibility.
+ - rcsoccersim3d: as stated above, running rcssserver3d (formerly simspark)
+ no longer starts a monitor to view the simulation, and a monitor should be
+ run separately. For users' convenience a new executable called rcsoccersim3d
+ is provided which runs both rcssserver3d and rcssmonitor3 to connect to
+ the running simulator.
+
+* Other notable changes:
+ - Added HMDP effector/perceptor
+ - Some compilation fixes
+ - Improved Windows support
+
[0.6.2]
This release is mainly a bug-fix release, and is the last release before
RoboCup 2009 competitions.
Modified: trunk/rcssserver3d/RELEASE
===================================================================
--- trunk/rcssserver3d/RELEASE 2010-01-14 09:15:14 UTC (rev 143)
+++ trunk/rcssserver3d/RELEASE 2010-01-16 23:45:06 UTC (rev 144)
@@ -1,10 +1,30 @@
-RELEASE News of rcssserver3d-0.6.3 (In progress)
+RELEASE News of rcssserver3d-0.6.3
-* Most notable changes:
- - Name change: simspark -> rcssserver3d. To make the functionality more clear.
- - No internal monitor by default. Run rcssmonitor3d separately to see the game.
- As another option, you might run rcsoccersim3d which runs both
- rcssserver3d (simspark) and rcssmonitor3d on the local machine.
+In this release, we are preparing for a simulation with more robots than before.
+The current target is to have 6 vs 6 games, so we have made some changes to
+make the simulator more suitable for it. The most notable changes made in
+rcssserver3d package in this direction are:
+1. Disabling the internal monitor by default: starting from this version, the
+simulation server (simspark binary, now called rcssserver3d) no longer brings
+up a monitor when run. To actually view the simulation, a monitor (e.g.
+rcsmonitor3d which is included in this package) should be run separately. This
+separation noticeably improves the performance of the server. A new executable
+called "rcsoccersim3d" is provided which runs both the simulation server and a
+monitor on the local machine.
+2. Bigger field: in this version, field dimensions and goal width are 1.5 times
+larger than before to provide enough area for 6 vs 6 games.
+
+* New names:
+ - rcssserver3d: the old simspark binary has been renamed to rcssserver3d, as
+ it more clearly shows the functionality of the simulator. A symbolic link
+ called simspark is provided for compatibility.
+ - rcsoccersim3d: as stated above, running rcssserver3d (formerly simspark)
+ no longer starts a monitor to view the simulation, and a monitor should be
+ run separately. For users' convenience a new executable called rcsoccersim3d
+ is provided which runs both rcssserver3d and rcssmonitor3 to connect to
+ the running simulator.
+
+* Other notable changes:
- Added HMDP effector/perceptor
- Some compilation fixes
- Improved Windows support
Modified: trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssserver3d/CMakeLists.txt 2010-01-14 09:15:14 UTC (rev 143)
+++ trunk/rcssserver3d/rcssserver3d/CMakeLists.txt 2010-01-16 23:45:06 UTC (rev 144)
@@ -32,7 +32,9 @@
internalsoccermonitor.rb internalsoccerbindings.rb
DESTINATION ${DATADIR}/${CMAKE_PROJECT_NAME})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rcsoccersim3d
+if (NOT WIN32)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rcsoccersim3d
${CMAKE_CURRENT_BINARY_DIR}/simspark DESTINATION ${BINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)
+endif (NOT WIN32)
\ No newline at end of file
Modified: trunk/rcssserver3d/windows/install_extra.nsi
===================================================================
--- trunk/rcssserver3d/windows/install_extra.nsi 2010-01-14 09:15:14 UTC (rev 143)
+++ trunk/rcssserver3d/windows/install_extra.nsi 2010-01-16 23:45:06 UTC (rev 144)
@@ -1,24 +1,24 @@
-CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Simspark.lnk" "$INSTDIR\bin\simspark.cmd"
+CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\RCSSServer3D.lnk" "$INSTDIR\bin\rcssserver3d.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'
+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 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
-FileWrite $0 'simspark.exe %1 %2 %3 %4'
+FileWrite $0 'rcssserver3d.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 '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'
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 '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'
FileClose $0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
