msg: remove gencpp and genmsh submodules; remove gencpp imports

.gitmodules

@@ -6,14 +6,6 @@
 	path = src/drivers/uavcan/libuavcan
 	url = https://github.com/PX4/uavcan.git
 	branch = px4
-[submodule "msg/tools/genmsg"]
-	path = msg/tools/genmsg
-	url = https://github.com/PX4/genmsg.git
-	branch = px4
-[submodule "msg/tools/gencpp"]
-	path = msg/tools/gencpp
-	url = https://github.com/PX4/gencpp.git
-	branch = px4
 [submodule "Tools/jMAVSim"]
 	path = Tools/jMAVSim
 	url = https://github.com/PX4/jMAVSim.git

msg/CMakeLists.txt

@@ -193,9 +193,6 @@ if(NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
 	endif()
 endif()
 
-px4_add_git_submodule(TARGET git_gencpp PATH tools/gencpp)
-px4_add_git_submodule(TARGET git_genmsg PATH tools/genmsg)
-
 # headers
 set(msg_out_path ${PX4_BINARY_DIR}/uORB/topics)
 set(msg_source_out_path	${CMAKE_CURRENT_BINARY_DIR}/topics_sources)

msg/templates/px4/ros/msg.h.em

@@ -54,7 +54,7 @@
 
 @{
 import genmsg.msgs
-import gencpp
+
 
 cpp_class = 'px4_%s'%spec.short_name
 native_type = spec.short_name

msg/templates/px4/uorb/msg.h.em

@@ -54,7 +54,7 @@
 
 @{
 import genmsg.msgs
-import gencpp
+
 
 native_type = '%s_s'%spec.short_name
 topic_name = spec.short_name

msg/templates/uorb/msg.cpp.em

@@ -55,7 +55,7 @@
 
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 
 uorb_struct = '%s_s'%spec.short_name

msg/templates/uorb/msg.h.em

@@ -54,7 +54,7 @@
 
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 
 uorb_struct = '%s_s'%spec.short_name

msg/templates/uorb_microcdr/microRTPS_client.cpp.em

@@ -14,7 +14,7 @@
 import os
 
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 from px_generate_uorb_topic_files import MsgScope # this is in Tools/
 

msg/templates/uorb_microcdr/msg.cpp.em

@@ -54,7 +54,7 @@
 
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 
 uorb_struct = '%s_s'%spec.short_name

msg/templates/uorb_microcdr/msg.h.em

@@ -54,7 +54,7 @@
 
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 
 uorb_struct = '%s_s'%spec.short_name

msg/templates/urtps/Publisher.cpp.em

@@ -12,7 +12,7 @@
 @###############################################
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 
 topic = alias if alias else spec.short_name

msg/templates/urtps/Publisher.h.em

@@ -12,7 +12,7 @@
 @###############################################
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 
 topic = alias if alias else spec.short_name

msg/templates/urtps/RtpsTopics.cpp.em

@@ -13,7 +13,7 @@
 import os
 
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 from px_generate_uorb_topic_files import MsgScope # this is in Tools/
 

msg/templates/urtps/RtpsTopics.h.em

@@ -13,7 +13,7 @@
 import os
 
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 from px_generate_uorb_topic_files import MsgScope # this is in Tools/
 

msg/templates/urtps/Subscriber.cpp.em

@@ -12,7 +12,7 @@
 @###############################################
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 
 topic = alias if alias else spec.short_name

msg/templates/urtps/Subscriber.h.em

@@ -12,7 +12,7 @@
 @###############################################
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 
 topic = alias if alias else spec.short_name

msg/templates/urtps/microRTPS_agent.cpp.em

@@ -12,7 +12,7 @@
 @###############################################
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import * # this is in Tools/
 from px_generate_uorb_topic_files import MsgScope # this is in Tools/
 

msg/templates/urtps/msg.idl.em

@@ -38,7 +38,7 @@
 @################################################################################
 @{
 import genmsg.msgs
-import gencpp
+
 from px_generate_uorb_topic_helper import *  # this is in Tools/
 
 builtin_types = set()

msg/tools/gencpp

@@ -1 +0,0 @@
-Subproject commit ff6c9f3e8ee0a63be994e0b7dfc7a36cb0c1d8c7

msg/tools/genmsg

@@ -1 +0,0 @@
-Subproject commit 1ad8e136cd6311c6af12256fc39362334ca23988

msg/tools/px_generate_uorb_topic_files.py

@@ -45,11 +45,6 @@ import argparse
 import sys
 import errno
 
-px4_tools_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(px4_tools_dir + "/genmsg/src")
-sys.path.append(px4_tools_dir + "/gencpp/src")
-px4_msg_dir = os.path.join(px4_tools_dir, "..")
-
 try:
     import em
     import genmsg.template_tools

msg/tools/px_generate_uorb_topic_helper.py

@@ -43,7 +43,7 @@ import os
 import errno
 
 import genmsg.msgs
-import gencpp
+
 
 type_map = {
     'int8': 'int8_t',