Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[16387] pkg/trunk
|
From: <hsu...@us...> - 2009-05-29 19:56:36
|
Revision: 16387
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=16387&view=rev
Author: hsujohnhsu
Date: 2009-05-29 19:56:08 +0000 (Fri, 29 May 2009)
Log Message:
-----------
Merging from branch:
svn merge -r 15982:16008 https://personalrobots.svn.sf.net/svnroot/personalrobots/pkg/branches/gazebo-branch-merge .
Modified Paths:
--------------
pkg/trunk/visualization_core/ogre/Makefile
Removed Paths:
-------------
pkg/trunk/visualization_core/ogre/boost.patch
pkg/trunk/visualization_core/ogre/warnings.patch
Property Changed:
----------------
pkg/trunk/
pkg/trunk/robot_descriptions/gazebo_robot_description/Media/
pkg/trunk/visualization/
pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
pkg/trunk/visualization_core/ogre_tools/
pkg/trunk/visualization_core/ogre_tools/media/
pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh/
pkg/trunk/visualization_core/ogre_tools/test/
Property changes on: pkg/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820,15822-15839,15852-15870
+ /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
Property changes on: pkg/trunk/robot_descriptions/gazebo_robot_description/Media
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820,15822-15839,15852-15870
+ /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820,15822-15839,15852-15870,15983-16008
Property changes on: pkg/trunk/visualization
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820,15822-15839,15852-15870
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428
+ /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428
Property changes on: pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820,15822-15839,15852-15870
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189
Property changes on: pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820,15822-15839,15852-15870
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667
Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820,15822-15839,15852-15870
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654
Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820,15822-15839,15852-15870
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654
Modified: pkg/trunk/visualization_core/ogre/Makefile
===================================================================
--- pkg/trunk/visualization_core/ogre/Makefile 2009-05-29 19:43:11 UTC (rev 16386)
+++ pkg/trunk/visualization_core/ogre/Makefile 2009-05-29 19:56:08 UTC (rev 16387)
@@ -1,6 +1,6 @@
all: ogre
-OGRE_VERSION = ogre-v1-4-9
+OGRE_VERSION = ogre-v1-6-1
TARBALL = build/$(OGRE_VERSION).tar.bz2
TARBALL_URL = http://pr.willowgarage.com/downloads/$(OGRE_VERSION).tar.bz2
SOURCE_DIR = build/$(OGRE_VERSION)
Deleted: pkg/trunk/visualization_core/ogre/boost.patch
===================================================================
--- pkg/trunk/visualization_core/ogre/boost.patch 2009-05-29 19:43:11 UTC (rev 16386)
+++ pkg/trunk/visualization_core/ogre/boost.patch 2009-05-29 19:56:08 UTC (rev 16387)
@@ -1,14 +0,0 @@
---- configure 2009-01-22 16:02:27.000000000 -0800
-+++ configure-noboosterror 2009-01-22 16:02:22.000000000 -0800
-@@ -25777,11 +25777,6 @@
- echo "${ECHO_T}$ac_cv_lib_boost_thread_mt_main" >&6
- if test $ac_cv_lib_boost_thread_mt_main = yes; then
- OGRE_THREAD_LIBS="-lboost_thread-mt"
--else
--
-- { { echo "$as_me:$LINENO: error: You need the C++ boost libraries." >&5
--echo "$as_me: error: You need the C++ boost libraries." >&2;}
-- { (exit 1); exit 1; }; }
- fi
-
- fi
Deleted: pkg/trunk/visualization_core/ogre/warnings.patch
===================================================================
--- pkg/trunk/visualization_core/ogre/warnings.patch 2009-05-29 19:43:11 UTC (rev 16386)
+++ pkg/trunk/visualization_core/ogre/warnings.patch 2009-05-29 19:56:08 UTC (rev 16387)
@@ -1,98 +0,0 @@
-*** OgreMain/include/OgreUTFString.h 2007-03-08 22:11:57.000000000 -0800
---- OgreMain/include/OgreUTFString_patched.h 2008-10-08 12:59:12.828243011 -0700
-***************
-*** 30,36 ****
-
- #include "OgrePrerequisites.h"
-
-! #if OGRE_UNICODE_SUPPORT
-
- // these are explained later
- #include <iterator>
---- 30,36 ----
-
- #include "OgrePrerequisites.h"
-
-! #if OGRE_UNICODE_SUPPORT
-
- // these are explained later
- #include <iterator>
-***************
-*** 287,293 ****
- friend class _const_fwd_iterator;
- public:
- _fwd_iterator() {}
-! _fwd_iterator( const _fwd_iterator& i ) {
- _become( i );
- }
-
---- 287,293 ----
- friend class _const_fwd_iterator;
- public:
- _fwd_iterator() {}
-! _fwd_iterator( const _fwd_iterator& i ) : _base_iterator() {
- _become( i );
- }
-
-***************
-*** 418,424 ****
- class _const_fwd_iterator: public _base_iterator { /* i don't know why the beautifier is freaking out on this line */
- public:
- _const_fwd_iterator() {}
-! _const_fwd_iterator( const _const_fwd_iterator& i ) {
- _become( i );
- }
- _const_fwd_iterator( const _fwd_iterator& i ) {
---- 418,424 ----
- class _const_fwd_iterator: public _base_iterator { /* i don't know why the beautifier is freaking out on this line */
- public:
- _const_fwd_iterator() {}
-! _const_fwd_iterator( const _const_fwd_iterator& i ) : _base_iterator() {
- _become( i );
- }
- _const_fwd_iterator( const _fwd_iterator& i ) {
-***************
-*** 566,572 ****
- friend class _const_rev_iterator;
- public:
- _rev_iterator() {}
-! _rev_iterator( const _rev_iterator& i ) {
- _become( i );
- }
-
---- 566,572 ----
- friend class _const_rev_iterator;
- public:
- _rev_iterator() {}
-! _rev_iterator( const _rev_iterator& i ) : _base_iterator() {
- _become( i );
- }
-
-***************
-*** 675,681 ****
- class _const_rev_iterator: public _base_iterator { /* i don't know why the beautifier is freaking out on this line */
- public:
- _const_rev_iterator() {}
-! _const_rev_iterator( const _const_rev_iterator& i ) {
- _become( i );
- }
- _const_rev_iterator( const _rev_iterator& i ) {
---- 675,681 ----
- class _const_rev_iterator: public _base_iterator { /* i don't know why the beautifier is freaking out on this line */
- public:
- _const_rev_iterator() {}
-! _const_rev_iterator( const _const_rev_iterator& i ) : _base_iterator() {
- _become( i );
- }
- _const_rev_iterator( const _rev_iterator& i ) {
-***************
-*** 2403,2406 ****
-
- #endif // OGRE_UNICODE_SUPPORT
-
-! #endif
---- 2403,2406 ----
-
- #endif // OGRE_UNICODE_SUPPORT
-
-! #endif
Property changes on: pkg/trunk/visualization_core/ogre_tools
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820,15822-15839,15852-15870
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418
Property changes on: pkg/trunk/visualization_core/ogre_tools/media
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820,15822-15839,15852-15870
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463
Property changes on: pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820,15822-15839,15852-15870
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818
Property changes on: pkg/trunk/visualization_core/ogre_tools/test
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820,15822-15839,15852-15870
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
