Revision: 8504
http://playerstage.svn.sourceforge.net/playerstage/?rev=8504&view=rev
Author: natepak
Date: 2010-01-14 01:17:07 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
Modified version numbering
Modified Paths:
--------------
code/gazebo/trunk/CMakeLists.txt
code/gazebo/trunk/ChangeLog
code/gazebo/trunk/config.h.in
Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt 2010-01-13 19:02:21 UTC (rev 8503)
+++ code/gazebo/trunk/CMakeLists.txt 2010-01-14 01:17:07 UTC (rev 8504)
@@ -5,12 +5,17 @@
CMAKE_POLICY(SET CMP0004 NEW)
ENDIF(COMMAND CMAKE_POLICY)
-PROJECT (Gazebo)
-STRING (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+project (Gazebo)
+string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-SET (GAZEBO_VERSION 0.9.0)
-MESSAGE (STATUS "${PROJECT_NAME} version ${GAZEBO_VERSION}")
+set (GAZEBO_MAJOR_VERSION 0)
+set (GAZEBO_MINOR_VERSION 10)
+set (GAZEBO_PATCH_VERSION 0)
+set (GAZEBO_VERSION
${GAZEBO_MAJOR_VERSION}.${GAZEBO_MINOR_VERSION}.${GAZEBO_PATCH_VERSION})
+
+message (STATUS "${PROJECT_NAME} version ${GAZEBO_VERSION}")
+
set (BUILD_GAZEBO ON CACHE INTERNAL "Build Gazebo" FORCE)
set (gazeboserver_sources_desc "List of server sources"
@@ -91,7 +96,7 @@
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/gazeborc.cmake
${PROJECT_BINARY_DIR}/.gazeborc @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/.gazeborc DESTINATION $ENV{HOME}/)
- INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
+ include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
message (STATUS "Cmake C Flags:${CMAKE_C_FLAGS}")
@@ -119,19 +124,19 @@
endif (BUILD_GAZEBO)
# Cpack stuff
- INCLUDE (InstallRequiredSystemLibraries)
- SET (CPACK_PACKAGE_NAME "${PROJECT_NAME}")
- SET (CPACK_PACKAGE_VERSION_MAJOR "${GAZEBO_MAJOR_VERSION}")
- SET (CPACK_PACKAGE_VERSION_MINOR "${GAZEBO_MINOR_VERSION}")
- SET (CPACK_PACKAGE_VERSION_PATCH "${GAZEBO_REVISION_VERSION}")
- SET (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Gazebo robot simulator")
- SET (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME_LOWER}-${GAZEBO_VERSION}")
- SET (CPACK_SOURCE_PACKAGE_FILE_NAME
"${PROJECT_NAME_LOWER}-${GAZEBO_VERSION}")
- SET (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
- SET (CPACK_GENERATOR "TBZ2")
- SET (CPACK_SOURCE_GENERATOR "TBZ2")
- LIST (APPEND CPACK_SOURCE_IGNORE_FILES "/.svn/;.swp$;/build/")
- INCLUDE (CPack)
+ include (InstallRequiredSystemLibraries)
+ set (CPACK_PACKAGE_NAME "${PROJECT_NAME}")
+ set (CPACK_PACKAGE_VERSION_MAJOR "${GAZEBO_MAJOR_VERSION}")
+ set (CPACK_PACKAGE_VERSION_MINOR "${GAZEBO_MINOR_VERSION}")
+ set (CPACK_PACKAGE_VERSION_PATCH "${GAZEBO_PATCH_VERSION}")
+ set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Gazebo robot simulator")
+ set (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME_LOWER}-${GAZEBO_VERSION}")
+ set (CPACK_SOURCE_PACKAGE_FILE_NAME
"${PROJECT_NAME_LOWER}-${GAZEBO_VERSION}")
+ set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
+ set (CPACK_GENERATOR "TBZ2")
+ set (CPACK_SOURCE_GENERATOR "TBZ2")
+ list (APPEND CPACK_SOURCE_IGNORE_FILES "/.svn/;.swp$;/build/")
+ include (CPack)
message(STATUS "Configuration successful. Type make to compile gazebo")
Modified: code/gazebo/trunk/ChangeLog
===================================================================
--- code/gazebo/trunk/ChangeLog 2010-01-13 19:02:21 UTC (rev 8503)
+++ code/gazebo/trunk/ChangeLog 2010-01-14 01:17:07 UTC (rev 8504)
@@ -0,0 +1,5 @@
+0.10.0 (13-01-2009)
+ -Small redesgin of GUI
+ -Overhauled the internal model tree structure
+ -Added beginnings of support for other physics engine
+ -Added support for Collada files
Modified: code/gazebo/trunk/config.h.in
===================================================================
--- code/gazebo/trunk/config.h.in 2010-01-13 19:02:21 UTC (rev 8503)
+++ code/gazebo/trunk/config.h.in 2010-01-14 01:17:07 UTC (rev 8504)
@@ -1,6 +1,10 @@
/* config.h. Generated by CMake for @project_n...@. */
/* Version number */
+#define GAZEBO_MAJOR_VERSION ${GAZEBO_MAJOR_VERSION}
+#define GAZEBO_MINOR_VERSION ${GAZEBO_MINOR_VERSION}
+#define GAZEBO_PATCH_VERSION ${GAZEBO_PATCH_VERSION}
+
#define GAZEBO_VERSION "${GAZEBO_VERSION}"
#cmakedefine HAVE_OPENAL 1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
