From 1fbc38d4841ed28a8c9864843253437e94c23116 Mon Sep 17 00:00:00 2001 From: Virgile Prevosto <virgile.prevosto@m4x.org> Date: Tue, 13 Sep 2022 15:02:36 +0200 Subject: [PATCH] [script] initial attempt at making use of ast diff info in %.eva computation --- share/analysis-scripts/analysis.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/share/analysis-scripts/analysis.mk b/share/analysis-scripts/analysis.mk index 1d5d87e03b5..a5a5c94a4a3 100644 --- a/share/analysis-scripts/analysis.mk +++ b/share/analysis-scripts/analysis.mk @@ -163,8 +163,8 @@ SHELL := $(shell which bash) %.parse: SOURCES = $(filter-out %/command,$^) %.parse: PARSE = $(FRAMAC) \ $(if $(AST_DIFF),\ - $(if $(wildcard $@/framac.sav),\ - -load $@/framac.reparse -then -ast-diff,),) \ + $(if $(wildcard $@/framac.sav $*.eva/framac.sav),\ + -load $@/framac.reparse -then -no-eva -ast-diff,),) \ $(FCFLAGS) \ $(if $(value MACHDEP),-machdep $(MACHDEP),) \ -cpp-extra-args="$(CPPFLAGS)" $(SOURCES) \ @@ -173,8 +173,11 @@ SHELL := $(shell which bash) @$(call display_command,$(PARSE)) mkdir -p $@ $(if $(AST_DIFF),\ - $(if $(wildcard $@/framac.sav),mv $@/framac.sav $@/framac.reparse,true)\ - ,true) + $(if $(wildcard $*.eva/framac.sav), \ + mv $*.eva/framac.sav $@/framac.reparse,\ + $(if $(wildcard $@/framac.sav), \ + mv $@/framac.sav $@/framac.reparse,true)),\ + true) mv -f $@/{command,running} { $(call time_with_output,$@/stats.txt) \ -- GitLab