Removed ignition material proto

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Author: WilliamLewww

BUILD.bazel

@@ -9,9 +9,9 @@ load(
     "ign_export_header",
 )
 load(
-    ":ign_msg_gen.bzl",
+    ":gz_msg_gen.bzl",
     "get_proto_headers",
-    "ign_msg_gen",
+    "gz_msg_gen",
 )
 
 package(
@@ -37,53 +37,53 @@ PROJECT_PATCH = 0
 # Generates config.hh based on the version numbers in CMake code.
 ign_config_header(
     name = "config",
-    src = "include/ignition/msgs/config.hh.in",
+    src = "include/gz/msgs/config.hh.in",
     cmakelists = ["CMakeLists.txt"],
     project_name = PROJECT_NAME,
     project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
 )
 
 ign_export_header(
-    name = "include/ignition/msgs/Export.hh",
+    name = "include/gz/msgs/Export.hh",
     export_base = "IGNITION_MSGS",
     lib_name = "ignition-msgs",
     visibility = ["//visibility:private"],
 )
 
 public_headers_no_gen = glob([
-    "include/ignition/msgs/*.hh",
-    "include/ignition/msgs/detail/*.hh",
+    "include/gz/msgs/*.hh",
+    "include/gz/msgs/detail/*.hh",
 ])
 
-protos = glob(["proto/ignition/msgs/*.proto"])
+protos = glob(["proto/gz/msgs/*.proto"])
 
 generate_include_header(
     name = "messagetypeshh_genrule",
-    out = "include/ignition/msgs/MessageTypes.hh",
+    out = "include/gz/msgs/MessageTypes.hh",
     hdrs = get_proto_headers(protos),
-    strip_prefix = ["ign_msgs"],
+    strip_prefix = ["gz_msgs"],
 )
 
 generate_include_header(
     name = "msghh_genrule",
-    out = "include/ignition/msgs.hh",
+    out = "include/gz/msgs.hh",
     hdrs = public_headers_no_gen + [
-        "include/ignition/msgs/config.hh",
-        "include/ignition/msgs/Export.hh",
-        "include/ignition/msgs/MessageTypes.hh",
+        "include/gz/msgs/config.hh",
+        "include/gz/msgs/Export.hh",
+        "include/gz/msgs/MessageTypes.hh",
     ],
 )
 
 public_headers = public_headers_no_gen + [
-    "include/ignition/msgs/config.hh",
-    "include/ignition/msgs/Export.hh",
-    "include/ignition/msgs/MessageTypes.hh",
-    "include/ignition/msgs.hh",
+    "include/gz/msgs/config.hh",
+    "include/gz/msgs/Export.hh",
+    "include/gz/msgs/MessageTypes.hh",
+    "include/gz/msgs.hh",
 ]
 
-# Custom Ignition Protoc plugin
+# Custom Gazebo Protoc plugin
 cc_binary(
-    name = "ign_msgs_gen",
+    name = "gz_msgs_gen",
     srcs = [
         "src/Generator.cc",
         "src/Generator.hh",
@@ -97,36 +97,36 @@ cc_binary(
 
 # Create a library of our protobuf message files
 proto_library(
-    name = "ignmsgs_proto",
+    name = "gzmsgs_proto",
     srcs = protos,
     strip_import_prefix = "proto",
 )
 
 # Create a library of our protobuf message files
 proto_library(
-    name = "ignmsgs_proto_public",
+    name = "gzmsgs_proto_public",
     srcs = protos,
     strip_import_prefix = "proto",
 )
 
 # Generate our custom CC files from the protos
-ign_msg_gen(
-    name = "ignmsgs_proto_cc",
-    deps = [":ignmsgs_proto"],
+gz_msg_gen(
+    name = "gzmsgs_proto_cc",
+    deps = [":gzmsgs_proto"],
 )
 
 cc_library(
-    name = "ign_msgs",
+    name = "gz_msgs",
     srcs = [
         "src/Factory.cc",
         "src/Filesystem.cc",
         "src/Utility.cc",
-        ":ignmsgs_proto_cc",
+        ":gzmsgs_proto_cc",
     ],
     hdrs = public_headers,
     includes = ["include"],
     deps = [
-        ":ignmsgs_proto_cc",
+        ":gzmsgs_proto_cc",
         IGNITION_ROOT + "ign_math",
         "@com_google_protobuf//:protobuf",
         "@tinyxml2",
@@ -144,18 +144,18 @@ cc_binary(
     linkshared = True,
     linkstatic = True,
     deps = [
-        ":ign_msgs",
+        ":gz_msgs",
     ],
 )
 
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
-    data = [IGNITION_ROOT + "ign_msgs/test:desc/stringmsg.desc"],
+    data = [IGNITION_ROOT + "gz_msgs/test:desc/stringmsg.desc"],
     deps = [
-        ":ign_msgs",
+        ":gz_msgs",
         IGNITION_ROOT + "ign_math",
-        IGNITION_ROOT + "ign_msgs/test:test_utils",
+        IGNITION_ROOT + "gz_msgs/test:test_utils",
         "@gtest",
         "@gtest//:gtest_main",
     ],

CMakeLists.txt

@@ -23,32 +23,49 @@ ign_configure_project(
 #============================================================================
 
 # Cross-compilation related options
-# In a cross-compilation scenario, it is possible that the ign_msgs_gen
+# In a cross-compilation scenario, it is possible that the gz_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
+# build targeting the host, the INSTALL_GZ_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
+# > cmake -DINSTALL_GZ_MSGS_GEN_EXECUTABLE:BOOL=ON ..
+# ensuring that the gz_msgs_gen is installed in
+# <host_install_prefix>/bin/gz_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
+# host gz_msgs_gen is specified via the GZ_MSGS_GEN_EXECUTABLE
 # CMake cache variable:
-# > cmake -IGN_MSGS_GEN_EXECUTABLE=<host_install_prefix>/bin/ign_msgs_gen ..
+# > cmake -GZ_MSGS_GEN_EXECUTABLE=<host_install_prefix>/bin/gz_msgs_gen ..
+
+# TODO(CH3): Deprecated. Remove IGN_MSGS CMake variables on tick-tock.
+if(INSTALL_IGN_MSGS_GEN_EXECUTABLE)
+  message(WARNING "INSTALL_IGN_MSGS_GEN_EXECUTABLE is deprecated, use INSTALL_GZ_MSGS_GEN_EXECUTABLE instead")
+  set(INSTALL_GZ_MSGS_GEN_EXECUTABLE INSTALL_IGN_MSGS_GEN_EXECUTABLE)
+else()
+  option(
+    INSTALL_GZ_MSGS_GEN_EXECUTABLE
+    "Install the gz_msgs_gen executable."
+    OFF)
+  set(INSTALL_IGN_MSGS_GEN_EXECUTABLE INSTALL_GZ_MSGS_GEN_EXECUTABLE)
+endif()
 
-option(
-  INSTALL_IGN_MSGS_GEN_EXECUTABLE
-  "Install the ign_msgs_gen executable."
-  OFF)
 mark_as_advanced(INSTALL_IGN_MSGS_GEN_EXECUTABLE)
+mark_as_advanced(INSTALL_GZ_MSGS_GEN_EXECUTABLE)
+
+set(
+  GZ_MSGS_GEN_EXECUTABLE
+  "$<TARGET_FILE:gz_msgs_gen>"
+  CACHE STRING
+  "gz_msgs_gen executable used in the gz_msgs_protoc CMake function.")
+mark_as_advanced(GZ_MSGS_GEN_EXECUTABLE)
 
+# TODO(CH3): Deprecated. Remove IGN_MSGS CMake variables on tick-tock.
 set(
   IGN_MSGS_GEN_EXECUTABLE
-  "$<TARGET_FILE:ign_msgs_gen>"
+  "$<TARGET_FILE:gz_msgs_gen>"
   CACHE STRING
-  "ign_msgs_gen executable used in the ign_msgs_protoc CMake function.")
+  "gz_msgs_gen executable used in the gz_msgs_protoc CMake function.")
 mark_as_advanced(IGN_MSGS_GEN_EXECUTABLE)
 
 #============================================================================
@@ -98,7 +115,7 @@ add_subdirectory(tools)
 #============================================================================
 # TODO: Consider tweaking ign_configure_build() to call add_subdirectory(proto)
 # whenever a proto subdirectory exists. This could be used alongside
-# ign_msgs_protoc to get uniform support for proto messages across all ignition
+# gz_msgs_protoc to get uniform support for proto messages across all ignition
 # projects.
 add_subdirectory(proto)
 

CONTRIBUTING.md

@@ -1 +1 @@
-See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing).
+See the [Gazebo contributing guide](https://gazebosim.org/docs/all/contributing).