Browse Source

Merge pull request #2933 from UAVenture/ignore_conflict_files

Check supported extensions for rc.autostart generation
sbg
Lorenz Meier 9 years ago
parent
commit
eaac9d62ae
  1. 2
      Tools/px4airframes/srcparser.py
  2. 8
      Tools/px4airframes/srcscanner.py

2
Tools/px4airframes/srcparser.py

@ -151,7 +151,7 @@ class SourceParser(object): @@ -151,7 +151,7 @@ class SourceParser(object):
Returns list of supported file extensions that can be parsed by this
parser. The parser uses any extension.
"""
return [""]
return ["", ".hil"]
def Parse(self, path, contents):
"""

8
Tools/px4airframes/srcscanner.py

@ -16,9 +16,11 @@ class SourceScanner(object): @@ -16,9 +16,11 @@ class SourceScanner(object):
extensions = tuple(parser.GetSupportedExtensions())
for dirname, dirnames, filenames in os.walk(srcdir):
for filename in filenames:
path = os.path.join(dirname, filename)
if not self.ScanFile(path, parser):
return False
extension = os.path.splitext(filename)[1]
if extension in extensions:
path = os.path.join(dirname, filename)
if not self.ScanFile(path, parser):
return False
return True
def ScanFile(self, path, parser):

Loading…
Cancel
Save