Changeset 2533 in kBuild

Timestamp:

Aug 2, 2011 1:06:27 PM (13 years ago)

Author:

bird

Message:

header.kmk: Better assertion message.

File:

• trunk/kBuild/header.kmk (modified) (2 diffs)

trunk/kBuild/header.kmk

@@ -850 +850 @@
 
 ##
+# Show an assertion message.
+#
+# @param   $1   The assertion name.
+# @param   $2   The details.
+#
+define KB_FN_ASSERT_MSG
+$(info !! kBuild $1 Assertion Failed !!)
+ifdef target
+ $(info !! target:   $(target))
+ local varloc := $(where $(target))
+ if "$(varloc)" == "undefined"
+  local varloc := $(where $(target)_TEMPLATE)
+ endif
+ if "$(varloc)" == "undefined"
+  local varloc := $(where $(target)_SOURCES)
+ endif
+ if "$(varloc)" == "undefined"
+  local varloc := $(where $(target)_EXTENDS)
+ endif
+ if "$(varloc)" == "undefined"
+  local varloc := $(where target)
+ endif
+ ifneq ($(varloc),)
+  $(info !! location: $(varloc))
+ else
+  $(info !! probable location: $($(target)_DEFPATH)/Makefile.kmk)
+ endif
+endif
+$(info !! $2)
+$(error fixme)
+endef
+
+##
 # Throw an error if the given path $1 isn't absolute and assertions are enabled.
 #
@@ -856 +889 @@
 ifdef KBUILD_INTERNAL_STRICT
  KB_FN_ASSERT_ABSPATH = $(if-expr "$(abspath $($(strip $1)))" != "$(strip $($(strip $1)))",\
-        $(error kBuild abspath assertion failed: target=$(target) $1=$($(strip $1))))
+        $(evalcall KB_FN_ASSERT_MSG,abspath,$1 is:$(NLTAB)'$($(strip $1))'$(NLTAB)expected:$(NLTAB)'$(abspath $($(strip $1)))'))
 else
  KB_FN_ASSERT_ABSPATH :=