From 4b0db29b938042effdd960eba28134fb70a04674 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 19 Oct 2023 12:39:01 +1100 Subject: [PATCH] waf: moved SKETCHBOOK to AP_BUILD_ROOT in ap_version.h --- Tools/ardupilotwaf/boards.py | 1 + wscript | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py index faf500cc24ee3..26e88c1b1621d 100644 --- a/Tools/ardupilotwaf/boards.py +++ b/Tools/ardupilotwaf/boards.py @@ -508,6 +508,7 @@ def pre_build(self, bld): def build(self, bld): 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_str('AP_BUILD_ROOT', bld.srcnode.abspath()) import time ltime = time.localtime() if bld.env.build_dates: diff --git a/wscript b/wscript index db52f181a7ddd..6f4d9d81b12f4 100644 --- a/wscript +++ b/wscript @@ -584,12 +584,6 @@ def configure(cfg): else: 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 cfg.define('_GNU_SOURCE', 1)