[sdformat] 03/07: Merge tag 'upstream/3.0.0_pre3.0.6-1'

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Thu Jul 16 01:46:16 UTC 2015


This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository sdformat.

commit 010df350bd773bfa136cfebbc40f2d7e3f4f2654
Merge: 8e7f6fc ac8e4e2
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Jul 15 04:01:55 2015 +0200

    Merge tag 'upstream/3.0.0_pre3.0.6-1'
    
    Upstream version 3.0.0~pre3.0.6-1

 .hg_archival.txt                                   |   6 +-
 .hgtags                                            |   9 +
 CMakeLists.txt                                     | 142 ++--
 INSTALL_WIN32.md                                   |   4 +-
 cmake/DefaultCFlags.cmake                          |  71 ++
 cmake/FindSSE.cmake                                | 113 +++
 cmake/HostCFlags.cmake                             |  27 +
 cmake/SDFUtils.cmake                               |  22 +-
 cmake/SearchForStuff.cmake                         |  27 +-
 cmake/TargetArch.cmake                             | 158 ++++
 cmake/sdf_config.cmake.in                          |  27 +-
 cmake/sdformat_pc.in                               |   6 +-
 configure.bat                                      |  10 +-
 doc/sdf_logo.png                                   | Bin 3478 -> 3127 bytes
 doc/sdf_logo.svg                                   |  55 +-
 include/sdf/CMakeLists.txt                         |   1 +
 include/sdf/Console.hh                             |  71 +-
 include/sdf/{SDFImpl.hh => Element.hh}             | 222 +++--
 include/sdf/Exception.hh                           |  22 +-
 include/sdf/ExceptionPrivate.hh                    |  41 +
 include/sdf/Param.hh                               | 311 ++++---
 include/sdf/SDFExtension.hh                        |  96 +++
 include/sdf/SDFImpl.hh                             | 334 +-------
 include/sdf/Types.hh                               |  30 +-
 include/sdf/parser_urdf.hh                         | 156 +---
 sdf/1.2/geometry.sdf                               |   2 +-
 sdf/1.3/geometry.sdf                               |   2 +-
 sdf/1.4/heightmap_shape.sdf                        |   2 +-
 sdf/1.4/surface.sdf                                |   5 +
 sdf/1.5/CMakeLists.txt                             |   3 +-
 sdf/1.5/altimeter.sdf                              |  18 +
 sdf/1.5/gui.sdf                                    |   4 +
 sdf/1.5/heightmap_shape.sdf                        |   2 +-
 sdf/1.5/joint.sdf                                  |  13 +-
 sdf/1.5/link.sdf                                   |   2 +-
 sdf/1.5/magnetometer.sdf                           |  19 +-
 sdf/1.5/model.sdf                                  |   4 +
 sdf/1.5/physics.sdf                                |   8 +
 sdf/1.5/scene.sdf                                  |   4 +
 sdf/1.5/sensor.sdf                                 |   2 +
 sdf/1.5/state.sdf                                  |   4 +
 sdf/1.5/surface.sdf                                |   5 +
 sdf/1.5/visual.sdf                                 |   8 +
 src/CMakeLists.txt                                 |   8 +-
 src/Console.cc                                     |  59 +-
 src/Converter_TEST.cc                              |  36 +-
 src/Element.cc                                     | 823 ++++++++++++++++++
 src/Exception.cc                                   |  29 +-
 src/Exception_TEST.cc                              |  35 +
 src/Param.cc                                       | 419 ++++++++--
 src/Param_TEST.cc                                  | 168 +++-
 src/SDF.cc                                         | 925 ++-------------------
 src/SDFExtension.cc                                | 117 +++
 src/SDF_TEST.cc                                    | 281 +++++--
 src/Types.cc                                       |  47 ++
 src/parser.cc                                      | 175 ++--
 src/parser_urdf.cc                                 | 210 ++---
 src/parser_urdf_TEST.cc                            |  30 +-
 src/urdf/urdf_model/color.h                        |   4 +-
 src/urdf/urdf_model/pose.h                         |  29 +-
 src/urdf/urdf_parser/joint.cpp                     |  50 +-
 src/urdf/urdf_parser/link.cpp                      |  58 +-
 src/urdf/urdf_parser/model.cpp                     |  32 +-
 src/urdf/urdf_parser/pose.cpp                      |  14 +-
 src/urdf/urdf_parser/twist.cpp                     |  14 +-
 src/urdf/urdf_parser/urdf_model_state.cpp          |  18 +-
 src/urdf/urdf_parser/urdf_parser.h                 |   3 +-
 src/urdf/urdf_parser/urdf_sensor.cpp               |  75 +-
 src/win/tinyxml/tinyxml.cpp                        |   4 +
 src/win/tinyxml/tinyxmlparser.cpp                  |   4 +
 test/CMakeLists.txt                                |   2 +
 test/gtest/include/gtest/gtest-printers.h          |   2 +
 test/gtest/include/gtest/gtest-typed-test.h        |   3 +
 test/gtest/include/gtest/internal/gtest-port.h     |   2 +
 test/gtest/src/gtest.cc                            |   3 +
 test/integration/CMakeLists.txt                    |  17 +-
 .../cfm_damping_implicit_spring_damper.cc          |   4 +-
 test/integration/disable_fixed_joint_reduction.cc  |   2 +-
 test/integration/fixed_joint_reduction.cc          | 117 +--
 test/integration/force_torque_sensor.cc            |   2 +-
 test/integration/joint_axis_frame.cc               |   9 +-
 test/integration/locale_fix.cc                     |  85 ++
 test/integration/numeric.sdf                       |  28 +
 .../{plugin_bool.cc => parser_error_detection.cc}  |  46 +-
 test/integration/plugin_attribute.cc               |   5 +-
 test/integration/plugin_bool.cc                    |   5 +-
 test/integration/provide_feedback.cc               |   2 +-
 test/integration/urdf_joint_parameters.cc          |   2 +-
 tools/code_check.sh                                |   3 +
 89 files changed, 3755 insertions(+), 2319 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdformat.git



More information about the debian-science-commits mailing list