Merge pull request #2 from microROS/feature/WindowsFix

Feature/windows fix
This commit is contained in:
Borja Outerelo
2018-11-15 14:39:06 +01:00
committed by GitHub
2 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -67,7 +67,7 @@ normalize_path(_DEFAULT_FASTRTPS_PROFILES_PATH "${_DEFAULT_FASTRTPS_PROFILES_PAT
# Get colcon call dir # 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) get_filename_component(_COLCON_CALL_DIR "${_COLCON_CALL_DIR}" DIRECTORY)
+8 -8
View File
@@ -43,7 +43,7 @@ def GetPackage(Dir):
break break
return found_package_path return found_package_path.replace("\\", "/")
def GetPackageList(Dir): def GetPackageList(Dir):
@@ -58,7 +58,7 @@ def GetPackageList(Dir):
package_list.append(l) package_list.append(l)
elif package_path != "COLCON_IGNORE": elif package_path != "COLCON_IGNORE":
package_list.append(package_path) package_list.append(package_path)
return package_list return package_list
@@ -70,7 +70,7 @@ def GetInterfacePackages(packages_list):
if element.text == "rosidl_interface_packages": if element.text == "rosidl_interface_packages":
package_interface_list.append(package) package_interface_list.append(package)
return package_interface_list return package_interface_list
def GetPackageName(package_path): def GetPackageName(package_path):
xml_root = xml.etree.ElementTree.parse(package_path).getroot() xml_root = xml.etree.ElementTree.parse(package_path).getroot()
@@ -88,8 +88,8 @@ def GetInterfacePackageMsgs(package_path):
for file in files: for file in files:
if file.endswith(".msg"): if file.endswith(".msg"):
full_path = os.path.join(root, file) full_path = os.path.join(root, file)
msg_list.append(full_path) msg_list.append(full_path.replace("\\", "/"))
return msg_list return msg_list
def GetInterfacePackageSrvs(package_path): def GetInterfacePackageSrvs(package_path):
@@ -99,8 +99,8 @@ def GetInterfacePackageSrvs(package_path):
for file in files: for file in files:
if file.endswith(".srv"): if file.endswith(".srv"):
full_path = os.path.join(root, file) full_path = os.path.join(root, file)
msg_list.append(full_path) msg_list.append(full_path.replace("\\", "/"))
return msg_list return msg_list
@@ -113,7 +113,7 @@ def ReadDefaultXMLs(Path):
fd = open(full_path) fd = open(full_path)
print ("%s" % fd.read()) print ("%s" % fd.read())
fd.close() fd.close()
def generate_XML(args): def generate_XML(args):