mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-21 21:55:34 +08:00
msg: remove gencpp and genmsh submodules; remove gencpp imports
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
@{
|
||||
import genmsg.msgs
|
||||
import gencpp
|
||||
|
||||
|
||||
cpp_class = 'px4_%s'%spec.short_name
|
||||
native_type = spec.short_name
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
@{
|
||||
import genmsg.msgs
|
||||
import gencpp
|
||||
|
||||
|
||||
native_type = '%s_s'%spec.short_name
|
||||
topic_name = spec.short_name
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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/
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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/
|
||||
|
||||
|
||||
@@ -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/
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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/
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
@################################################################################
|
||||
@{
|
||||
import genmsg.msgs
|
||||
import gencpp
|
||||
|
||||
from px_generate_uorb_topic_helper import * # this is in Tools/
|
||||
|
||||
builtin_types = set()
|
||||
|
||||
Submodule msg/tools/gencpp deleted from ff6c9f3e8e
Submodule msg/tools/genmsg deleted from 1ad8e136cd
@@ -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
|
||||
|
||||
@@ -43,7 +43,7 @@ import os
|
||||
import errno
|
||||
|
||||
import genmsg.msgs
|
||||
import gencpp
|
||||
|
||||
|
||||
type_map = {
|
||||
'int8': 'int8_t',
|
||||
|
||||
Reference in New Issue
Block a user