Merge forward msgs5 to master

.gitignore

@@ -5,3 +5,4 @@ build_*
 # OS generated files
 .DS_Store
 *.swp
+*.orig

CMakeLists.txt

@@ -20,7 +20,34 @@ ign_configure_project(VERSION_SUFFIX pre1)
 # Set project-specific options
 #============================================================================
 
-# ignition-msgs currently has no options that are unique to it
+# Cross-compilation related options
+# In a cross-compilation scenario, it is possible that the ign_msgs_gen
+# generator compiled for the target machine cannot be used to generate
+# the C++ code corresponding to the .proto definition. For this scenario, 
+# the following two options can be used as follows. 
+# First of all, ign-msgs is compiled targeting the host machine, and in the
+# build targeting the host, the INSTALL_IGN_MSGS_GEN_EXECUTABLE option is
+# enabled:
+# > cmake -DINSTALL_IGN_MSGS_GEN_EXECUTABLE:BOOL=ON .. 
+# ensuring that the ign_msgs_gen is installed in 
+# <host_install_prefix>/bin/ign_msgs_gen . Then, the same version of ign-msgs 
+# can be cross-compiled, and in the cross-compilation build the location of the
+# host ign_msgs_gen is specified via the IGN_MSGS_GEN_EXECUTABLE 
+# CMake cache variable: 
+# > cmake -IGN_MSGS_GEN_EXECUTABLE=<host_install_prefix>/bin/ign_msgs_gen .. 
+
+option(
+  INSTALL_IGN_MSGS_GEN_EXECUTABLE
+  "Install the ign_msgs_gen executable."
+  OFF)
+mark_as_advanced(INSTALL_IGN_MSGS_GEN_EXECUTABLE)
+
+set(
+  IGN_MSGS_GEN_EXECUTABLE
+  "$<TARGET_FILE:ign_msgs_gen>"
+  CACHE STRING
+  "ign_msgs_gen executable used in the ign_msgs_protoc CMake function.")
+mark_as_advanced(IGN_MSGS_GEN_EXECUTABLE)
 
 #============================================================================
 # Search for project-specific dependencies

Changelog.md

@@ -6,7 +6,26 @@
 
 ## Ignition Msgs 5.x
 
-### Ignition Msgs 5.x.x
+### Ignition Msgs 5.3.0 (2020-05-20)
+
+1. Added the `EntityFactory_V` message.
+    * [Pull request 58](https://github.com/ignitionrobotics/ign-msgs/pull/58)
+
+### Ignition Msgs 5.2.0 (2020-05-14)
+
+1. Handle empty xml elements
+    * [BitBucket pull request 172](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-msgs/pull-requests/172)
+
+1. Ignore deprecation warnings on generated code
+    * [BitBucket pull request 170](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-msgs/pull-requests/170)
+
+1. Add SdfGeneratorConfig message containing configuration options for generating SDFormat from currently loaded worlds
+    * [BitBucket pull request 174](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-msgs/pull-requests/174)
+
+1. BitBucket to GitHub migration
+    * [Pull request](https://github.com/ignitionrobotics/ign-msgs/pull/39)
+    * [Pull request](https://github.com/ignitionrobotics/ign-msgs/pull/40)
+    * [Pull request](https://github.com/ignitionrobotics/ign-msgs/pull/43)
 
 ### Ignition Msgs 5.1.0
 
@@ -33,13 +52,25 @@
 1. Added `fuel_metadata.proto`, `version.proto`, `version_range.proto`, and `versioned_name.proto` message files. Added conversion functions to/from the model.config/metadata.pbtxt formats.
     * [BitBucket pull request 157](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-msgs/pull-requests/157)
 
+
 ## Ignition Msgs 4.x
 
-### Ignition Msgs 4.x.x
+### Ignition Msgs 4.9.0 (2020-05-20)
+
+1. Added the `EntityFactory_V` message.
+    * [Pull request 58](https://github.com/ignitionrobotics/ign-msgs/pull/58)
+
+### Ignition Msgs 4.8.0 (2020-04-09)
+
+1. Add SdfGeneratorConfig message containing configuration options for generating SDFormat from currently loaded worlds
+    * [BitBucket pull request 174](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-msgs/pull-requests/174)
 
 1. Fix linking order of Protocol Buffers static libraries on GCC
     * [BitBucket pull request 151](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-msgs/pull-requests/151)
 
+1. Ignore deprecation warnings on generated code
+    * [BitBucket pull request 170](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-msgs/pull-requests/170)
+
 ### Ignition Msgs 4.7.0 (2019-08-22)
 
 1. Add video record message

proto/ignition/msgs/entity_factory_v.proto

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+syntax = "proto3";
+package ignition.msgs;
+option java_package = "com.ignition.msgs";
+option java_outer_classname = "EntityFactoryVProtos";
+
+/// \ingroup ignition.msgs
+/// \interface EntityFactory_V
+/// \brief A message for a vector of EntityFactory messages
+//
+import "ignition/msgs/entity_factory.proto";
+import "ignition/msgs/header.proto";
+
+message EntityFactory_V
+{
+  /// \brief Optional header data
+  Header header = 1;
+
+  /// \brief The set of entity factory messages.
+  repeated EntityFactory data = 2;
+}

proto/ignition/msgs/sdf_generator_config.proto

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+syntax = "proto3";
+
+package ignition.msgs;
+option java_package = "com.ignition.msgs";
+option java_outer_classname = "SdfGeneratorConfigProtos";
+
+/// \ingroup ignition.msgs
+/// \interface SdfGeneratorConfig
+/// \brief Message containing configuration options for generating SDFormat from
+/// currently loaded worlds
+
+import "ignition/msgs/boolean.proto";
+import "ignition/msgs/header.proto";
+
+message SdfGeneratorConfig
+{
+  /// \brief Configuration for SDFormat generation of entities (eg. models, actors, lights)
+  message EntityGeneratorConfig
+  {
+    /// \brief Expand and inline included entities
+    ignition.msgs.Boolean expand_include_tags = 1;
+    /// \brief Use the Fuel version in generated URIs of Fuel resources
+    ignition.msgs.Boolean save_fuel_version = 2;
+    /// \brief Use absolute paths for resources such as meshes
+    ignition.msgs.Boolean resources_use_absolute_paths = 3;
+    /// \brief Copy model resources, such as meshes, and create a self contained
+    /// model.
+    ignition.msgs.Boolean copy_model_resources = 4;
+  };
+
+  /// \brief Optional header data
+  ignition.msgs.Header header = 1;
+
+  /// \brief Global setting for SDFormat generation of entities
+  EntityGeneratorConfig global_entity_gen_config = 2;
+
+  /// \brief Per-entity override of global settings for SDFormat generation.
+  /// The key is the scoped name of an entity.
+  map<string, EntityGeneratorConfig> override_entity_gen_configs = 3;
+};
+

src/CMakeLists.txt

@@ -11,6 +11,10 @@ if (UNIX)
   target_link_libraries(ign_msgs_gen pthread)
 endif()
 
+if(INSTALL_IGN_MSGS_GEN_EXECUTABLE)
+  set_target_properties(ign_msgs_gen PROPERTIES VERSION ${PROJECT_VERSION_FULL})
+  install(TARGETS ign_msgs_gen DESTINATION ${IGN_BIN_INSTALL_DIR})
+endif()
 
 ##################################################
 # A function that calls protoc on a protobuf file
@@ -57,7 +61,7 @@ function(ign_msgs_protoc)
     list(APPEND ${ign_msgs_protoc_OUTPUT_CPP_CC_VAR} ${output_source})
     list(APPEND output_files ${output_header})
     list(APPEND output_files ${output_source})
-    list(APPEND protoc_args "--plugin=protoc-gen-ignmsgs=$<TARGET_FILE:ign_msgs_gen>")
+    list(APPEND protoc_args "--plugin=protoc-gen-ignmsgs=${IGN_MSGS_GEN_EXECUTABLE}")
     list(APPEND protoc_args "--cpp_out=dllexport_decl=IGNITION_MSGS_VISIBLE:${ign_msgs_protoc_OUTPUT_CPP_DIR}")
     list(APPEND protoc_args "--ignmsgs_out" "${ign_msgs_protoc_OUTPUT_CPP_DIR}")
     set(${ign_msgs_protoc_OUTPUT_CPP_HH_VAR} ${${ign_msgs_protoc_OUTPUT_CPP_HH_VAR}} PARENT_SCOPE)

src/Utility.cc

@@ -998,7 +998,7 @@ namespace ignition
 
       // Read the name, which is a mandatory element.
       tinyxml2::XMLElement *elem = modelElement->FirstChildElement("name");
-      if (!elem)
+      if (!elem || !elem->GetText())
       {
         std::cerr << "Model config string does not contain a <name> element\n";
         return false;
@@ -1007,7 +1007,7 @@ namespace ignition
 
       // Read the description, if present.
       elem = modelElement->FirstChildElement("description");
-      if (elem)
+      if (elem && elem->GetText())
         meta.set_description(trimmed(elem->GetText()));
 
       // Read the authors, if any.
@@ -1016,11 +1016,13 @@ namespace ignition
       {
         ignition::msgs::FuelMetadata::Contact *author = meta.add_authors();
         // Get the author name and email
-        if (elem->FirstChildElement("name"))
+        if (elem->FirstChildElement("name") &&
+            elem->FirstChildElement("name")->GetText())
         {
           author->set_name(trimmed(elem->FirstChildElement("name")->GetText()));
         }
-        if (elem->FirstChildElement("email"))
+        if (elem->FirstChildElement("email") &&
+            elem->FirstChildElement("email")->GetText())
         {
           author->set_email(
               trimmed(elem->FirstChildElement("email")->GetText()));
@@ -1034,21 +1036,24 @@ namespace ignition
       math::SemanticVersion maxVer;
       while (elem)
       {
-        std::string verStr = elem->Attribute("version");
-        math::SemanticVersion ver(trimmed(verStr));
-        if (ver > maxVer)
+        if (elem->GetText() && elem->Attribute("version"))
         {
-          meta.mutable_model()->mutable_file_format()->set_name("sdf");
-          ignition::msgs::Version *verMsg =
-            meta.mutable_model()->mutable_file_format()->mutable_version();
+          std::string verStr = elem->Attribute("version");
+          math::SemanticVersion ver(trimmed(verStr));
+          if (ver > maxVer)
+          {
+            meta.mutable_model()->mutable_file_format()->set_name("sdf");
+            ignition::msgs::Version *verMsg =
+              meta.mutable_model()->mutable_file_format()->mutable_version();
 
-          verMsg->set_major(ver.Major());
-          verMsg->set_minor(ver.Minor());
-          verMsg->set_patch(ver.Patch());
-          verMsg->set_prerelease(ver.Prerelease());
-          verMsg->set_build(ver.Build());
+            verMsg->set_major(ver.Major());
+            verMsg->set_minor(ver.Minor());
+            verMsg->set_patch(ver.Patch());
+            verMsg->set_prerelease(ver.Prerelease());
+            verMsg->set_build(ver.Build());
 
-          meta.mutable_model()->set_file(trimmed(elem->GetText()));
+            meta.mutable_model()->set_file(trimmed(elem->GetText()));
+          }
         }
 
         elem = elem->NextSiblingElement("sdf");