From 10fd2aface4486fc7f873dd2b54a1c2073c0b434 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 1 Dec 2015 14:46:45 +0200 Subject: Reimplement define as dynamic derivation rather than alias New syntax: define cli: file The rationale is we need to be able to assign the file extension (using type/pattern-specific variables). And if it is an alias, we will assign it to the original target type. Note that we could still support aliases if we need to. Will need to bring back the id member in target_type that would normally point to itself but for an alias would point to the origin. --- tests/define/buildfile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'tests/define/buildfile') diff --git a/tests/define/buildfile b/tests/define/buildfile index d3b9fc4..55b9e92 100644 --- a/tests/define/buildfile +++ b/tests/define/buildfile @@ -1,16 +1,14 @@ -#define # expected name -#define foo # expected = -#define foo= # expected name -#define foo=bar # unknown target type +#define # expected name +#define foo # expected : +#define foo: # expected name +#define foo: bar # unknown target type -define foo=file -foo{FOO}: # verify name is foo{FOO} and not file{FOO} with --verbose 6 +define foo: file +foo{FOO}: # verify name is foo{FOO} and not file{FOO} with --verbose 6 -#define foo=dir # already define in this scope +#define foo: dir # already define in this scope -define bar=foo -bar{FOO}: # verify name is foo{FOO} and not bar{FOO} with --verbose 6 -bar{BAR}: # verify name is bar{BAR} +define bar: foo +bar{BAR}: # verify name is bar{FOO} with --verbose 6 -define folder=dir -folder{./}: # verify prints "folder{} is up to date" +./: -- cgit v1.1