Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-08 08:53:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: cope with location of AP_Periph in Tools directory

Browse Source
This commit is contained in:
Andrew Tridgell 2019-10-25 12:12:44 +11:00
parent 6f9fda5094
commit cd98659abe
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/scripts/build_binaries.py
View File

@ -224,12 +224,18 @@ is bob we will attempt to checkout bob-AVR'''
with open(filepath, "w") as x: with open(filepath, "w") as x:
x.write(string) x.write(string)
def version_h_path(self, src):
'''return path to version.h'''
if src == 'AP_Periph':
return os.path.join('Tools', src, "version.h")
return os.path.join(src, "version.h")
def addfwversion_gitversion(self, destdir, src): def addfwversion_gitversion(self, destdir, src):
# create git-version.txt: # create git-version.txt:
gitlog = self.run_git(["log", "-1"]) gitlog = self.run_git(["log", "-1"])
gitversion_filepath = os.path.join(destdir, "git-version.txt") gitversion_filepath = os.path.join(destdir, "git-version.txt")
gitversion_content = gitlog gitversion_content = gitlog
versionfile = os.path.join(src, "version.h") versionfile = self.version_h_path(src)
if os.path.exists(versionfile): if os.path.exists(versionfile):
content = self.read_string_from_filepath(versionfile) content = self.read_string_from_filepath(versionfile)
match = re.search('define.THISFIRMWARE "([^"]+)"', content) match = re.search('define.THISFIRMWARE "([^"]+)"', content)
@ -246,7 +252,7 @@ is bob we will attempt to checkout bob-AVR'''
def addfwversion_firmwareversiontxt(self, destdir, src): def addfwversion_firmwareversiontxt(self, destdir, src):
# create firmware-version.txt # create firmware-version.txt
versionfile = os.path.join(src, "version.h") versionfile = self.version_h_path(src)
if not os.path.exists(versionfile): if not os.path.exists(versionfile):
self.progress("%s does not exist" % (versionfile,)) self.progress("%s does not exist" % (versionfile,))
return return