From 70757b4144f2241271da0172715df0e6efef1b78 Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Wed, 14 Nov 2018 00:01:02 +0100 Subject: [PATCH 1/2] Issue with windows paths solved. --- uROS_Agent/uros_agent/__init__.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/uROS_Agent/uros_agent/__init__.py b/uROS_Agent/uros_agent/__init__.py index 612359e..bbce6b6 100644 --- a/uROS_Agent/uros_agent/__init__.py +++ b/uROS_Agent/uros_agent/__init__.py @@ -43,7 +43,7 @@ def GetPackage(Dir): break - return found_package_path + return found_package_path.replace("\\", "/") def GetPackageList(Dir): @@ -58,7 +58,7 @@ def GetPackageList(Dir): package_list.append(l) elif package_path != "COLCON_IGNORE": package_list.append(package_path) - + return package_list @@ -70,7 +70,7 @@ def GetInterfacePackages(packages_list): if element.text == "rosidl_interface_packages": package_interface_list.append(package) return package_interface_list - + def GetPackageName(package_path): xml_root = xml.etree.ElementTree.parse(package_path).getroot() @@ -88,8 +88,8 @@ def GetInterfacePackageMsgs(package_path): for file in files: if file.endswith(".msg"): full_path = os.path.join(root, file) - msg_list.append(full_path) - + msg_list.append(full_path.replace("\\", "/")) + return msg_list def GetInterfacePackageSrvs(package_path): @@ -99,8 +99,8 @@ def GetInterfacePackageSrvs(package_path): for file in files: if file.endswith(".srv"): full_path = os.path.join(root, file) - msg_list.append(full_path) - + msg_list.append(full_path.replace("\\", "/")) + return msg_list @@ -113,7 +113,7 @@ def ReadDefaultXMLs(Path): fd = open(full_path) print ("%s" % fd.read()) fd.close() - + def generate_XML(args): From 9b615a41741256abac149ae3c1b7a2bb2e2e41c0 Mon Sep 17 00:00:00 2001 From: Javier Moreno Date: Wed, 14 Nov 2018 13:17:15 +0100 Subject: [PATCH 2/2] Fixed issue when --merge-install is activated (Windows issue) --- uROS_Agent/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uROS_Agent/CMakeLists.txt b/uROS_Agent/CMakeLists.txt index 368b5ba..7a6676a 100644 --- a/uROS_Agent/CMakeLists.txt +++ b/uROS_Agent/CMakeLists.txt @@ -67,7 +67,7 @@ normalize_path(_DEFAULT_FASTRTPS_PROFILES_PATH "${_DEFAULT_FASTRTPS_PROFILES_PAT # Get colcon call dir -get_filename_component(_COLCON_CALL_DIR "${CMAKE_INSTALL_PREFIX}" DIRECTORY) +get_filename_component(_COLCON_CALL_DIR "${PROJECT_BINARY_DIR}" DIRECTORY) get_filename_component(_COLCON_CALL_DIR "${_COLCON_CALL_DIR}" DIRECTORY)