Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

waf: moved SKETCHBOOK to AP_BUILD_ROOT in ap_version.h

This commit is contained in:
Andrew Tridgell 2023-10-19 12:39:01 +11:00 committed by Peter Barker
parent dc95121b15
commit 1d05196b52
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tools/ardupilotwaf/boards.py
View File

@ -508,6 +508,7 @@ class Board:
def build(self, bld): def build(self, bld):
bld.ap_version_append_str('GIT_VERSION', bld.git_head_hash(short=True)) bld.ap_version_append_str('GIT_VERSION', bld.git_head_hash(short=True))
bld.ap_version_append_int('GIT_VERSION_INT', int("0x" + bld.git_head_hash(short=True), base=16)) bld.ap_version_append_int('GIT_VERSION_INT', int("0x" + bld.git_head_hash(short=True), base=16))
bld.ap_version_append_str('AP_BUILD_ROOT', bld.srcnode.abspath())
import time import time
ltime = time.localtime() ltime = time.localtime()
if bld.env.build_dates: if bld.env.build_dates:

6
wscript
View File

@ -584,12 +584,6 @@ def configure(cfg):
else: else:
cfg.env.ENABLE_HEADER_CHECKS = False cfg.env.ENABLE_HEADER_CHECKS = False
# TODO: Investigate if code could be changed to not depend on the
# source absolute path.
cfg.env.prepend_value('DEFINES', [
'SKETCHBOOK="' + cfg.srcnode.abspath() + '"',
])
# Always use system extensions # Always use system extensions
cfg.define('_GNU_SOURCE', 1) cfg.define('_GNU_SOURCE', 1)