fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 05:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

px_process_params: fix scope when script is called from repo root

Browse Source 
If called with ./Tools/px_process_params.py, the path would start with
src/<module>, and thus not match the regex "^.*/src/"
This commit is contained in:
Beat Küng
2017-07-14 11:57:11 +02:00
parent 41e53ef949
commit 45bc882f5d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/px4params/srcscanner.py
+1 -1
View File
@@ -34,7 +34,7 @@ class SourceScanner(object):
Scans provided file and passes its contents to the parser using Scans provided file and passes its contents to the parser using
parser.Parse method. parser.Parse method.
""" """
prefix = "^.*" + os.path.sep + "src" + os.path.sep prefix = "^(|.*" + os.path.sep + ")src" + os.path.sep
scope = re.sub(prefix.replace("\\", "/"), "", os.path.dirname(os.path.relpath(path)).replace("\\", "/")) scope = re.sub(prefix.replace("\\", "/"), "", os.path.dirname(os.path.relpath(path)).replace("\\", "/"))
with codecs.open(path, 'r', 'utf-8') as f: with codecs.open(path, 'r', 'utf-8') as f:
Tools/px_process_params.py
+2 -1
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
############################################################################ ############################################################################
# #
# Copyright (C) 2013-2014 PX4 Development Team. All rights reserved. # Copyright (C) 2013-2017 PX4 Development Team. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@@ -41,6 +41,7 @@
# Currently supported formats are: # Currently supported formats are:
# * XML for the parametric UI generator # * XML for the parametric UI generator
# * Human-readable description in DokuWiki page format # * Human-readable description in DokuWiki page format
# * Human-readable description in Markdown page format for the PX4 dev guide
# #
# This tool also allows to automatically upload the human-readable version # This tool also allows to automatically upload the human-readable version
# to the DokuWiki installation via XML-RPC. # to the DokuWiki installation via XML-RPC.