From 9739fe95e608845311f5cdc60d07d02af0b96b81 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Mon, 12 Aug 2019 14:22:44 +0200 Subject: ninja: Working detection of custom supplier Datalog files. --- src/ee/tools/templates/build.ninja.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/ee/tools/templates') diff --git a/src/ee/tools/templates/build.ninja.j2 b/src/ee/tools/templates/build.ninja.j2 index 8ca5d3a..c68f505 100644 --- a/src/ee/tools/templates/build.ninja.j2 +++ b/src/ee/tools/templates/build.ninja.j2 @@ -148,9 +148,7 @@ build $public_dir/{{ s.key }}/parts.xml: part-apply-function $public_dir/{{ s.ke build $public_dir/{{ s.key }}/souffle/facts.dl: part-apply-souffle-pre $public_dir/{{ s.key }}/downloaded.xml work = $public_dir/{{ s.key }}/souffle -{%- set main="$souffle_src/" + s.key + ".dl" %} -{%- set alt="$public_dir/custom/" + s.key + "-souffle.dl" %} -build $public_dir/{{ s.key }}/souffle/out/add_fact.csv: souffle {{ alt if is_file(alt) else main }} | {{ main }} $public_dir/{{ s.key }}/souffle/facts.dl +build $public_dir/{{ s.key }}/souffle/out/add_fact.csv: souffle {{ s.souffle_script }} | {{ main }} $public_dir/{{ s.key }}/souffle/facts.dl work = $public_dir/{{ s.key }}/souffle build {{ s.part_db }}: part-apply-souffle-post $public_dir/{{ s.key }}/souffle/out/add_fact.csv -- cgit v1.2.3