Skip to content

Feature/windows fix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BorjaOuterelo merged 2 commits into from
Nov 15, 2018
Merged

Feature/windows fix #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70757b4
Issue with windows paths solved.
Nov 13, 2018
9b615a4
Fixed issue when --merge-install is activated (Windows issue)
Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion uROS_Agent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
16 changes: 8 additions & 8 deletions uROS_Agent/uros_agent/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def GetPackage(Dir):
break


return found_package_path
return found_package_path.replace("\\", "/")
Copy link
Copy Markdown
Contributor

@BorjaOuterelo BorjaOuterelo Nov 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be this solved using os.path.normpath?



def GetPackageList(Dir):
Expand All @@ -58,7 +58,7 @@ def GetPackageList(Dir):
package_list.append(l)
elif package_path != "COLCON_IGNORE":
package_list.append(package_path)

return package_list


Expand All @@ -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()
Expand All @@ -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):
Expand All @@ -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


Expand All @@ -113,7 +113,7 @@ def ReadDefaultXMLs(Path):
fd = open(full_path)
print ("%s" % fd.read())
fd.close()



def generate_XML(args):
Expand Down