Skip to content

Note on Makefile.in: small difference compared to the upstream repository of Why3 #5

@dvraaij

Description

@dvraaij

I wanted to inform you that some lines that were added to Makefile.in in the upstream repository of Why3 in January last year were removed between two merge commits in this repository. The upstream commit can be found here and here.

From cde6ba24c9865a52a0eed0094a9db1b9bb5965af
     Merge remote-tracking branch 'why3-inria/master' into why3-devel

To   707fbc43c8321c2aa84b520a231a27e8bf3dd4eb
     Merge remote-tracking branch 'origin/master' into topic/528-manighetti-upstream-why3

--------------------------------- Makefile.in ---------------------------------
index 7f71cb79b..d39595b6d 100644
@@ -557,7 +557,6 @@ PLUGGENERATED = \
 PLUG_PARSER = genequlin dimacs
 PLUG_PRINTER =
 PLUG_TRANSFORM =
-PLUG_STRATEGIES = forward_propagation
 PLUG_TPTP = tptp_parser tptp_typing tptp_lexer tptp_printer
 PLUG_PYTHON = py_parser py_lexer py_main
 PLUG_MICROC = mc_parser mc_lexer mc_printer mc_main
@@ -610,7 +609,6 @@ endif
 PLUGMODULES = $(addprefix plugins/parser/, $(PLUG_PARSER)) \
 	      $(addprefix plugins/printer/, $(PLUG_PRINTER)) \
 	      $(addprefix plugins/transform/, $(PLUG_TRANSFORM)) \
-	      $(addprefix plugins/strategies/, $(PLUG_STRATEGIES)) \
 	      $(TPTPMODULES) $(PYTHONMODULES) $(MICROCMODULES) \
 	      $(CFGMODULES) \
 	      $(ADAMODULES) $(GNATJSONMODULES)
@@ -663,8 +661,6 @@ $(PLUG_PRINTER:%=lib/plugins/%.cmxs): lib/plugins/%.cmxs: plugins/printer/%.cmx
 $(PLUG_PRINTER:%=lib/plugins/%.cma): lib/plugins/%.cma: plugins/printer/%.cmo
 $(PLUG_TRANSFORM:%=lib/plugins/%.cmxs): lib/plugins/%.cmxs: plugins/transform/%.cmx
 $(PLUG_TRANSFORM:%=lib/plugins/%.cma): lib/plugins/%.cma: plugins/transform/%.cmo
-$(PLUG_STRATEGIES:%=lib/plugins/%.cmxs): lib/plugins/%.cmxs: plugins/strategies/%.cmx
-$(PLUG_STRATEGIES:%=lib/plugins/%.cma): lib/plugins/%.cma: plugins/strategies/%.cmo
 lib/plugins/tptp.cmxs: $(TPTPCMX)
 lib/plugins/tptp.cma: $(TPTPCMO)
 lib/plugins/python.cmxs: $(PYTHONCMX)

Maybe the removal was intentional and correct, but as it happened between two consecutive merge commits, it might have happened accidentally. I therefore decided to bring it to your attention.

I found these lines while investigating a build issue that I solved later.

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions