From 413ab5643bc3c204edd97e348bb0cbff9c77d2c9 Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Mon, 2 Jan 2023 20:56:40 +0100 Subject: [PATCH] Fix "dune build" for syntax_extensions - pa_unicode_macro.cma no longer "includes" helm_syntax_extensions.cma The only reason for this change, that makes camlp5o harder to call, is that dune enforces modules to belong to one library only. --- matita/components/content_pres/dune | 4 ++-- matita/components/grafite_parser/dune | 4 ++-- matita/components/syntax_extensions/dune | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/matita/components/content_pres/dune b/matita/components/content_pres/dune index 4ff7cd7a4..bb9096176 100644 --- a/matita/components/content_pres/dune +++ b/matita/components/content_pres/dune @@ -1,8 +1,8 @@ (library (name helm_content_pres) (libraries helm_content helm_syntax_extensions camlp5.gramlib ulex-camlp5 helm_grafite) - (preprocess (action (system "camlp5o -I components/syntax_extensions -I `ocamlfind query ulex-camlp5` pa_extend.cmo pa_ulex.cma pa_unicode_macro.cma -loc loc %{input-file}"))) - (preprocessor_deps ../syntax_extensions/pa_unicode_macro.cma) + (preprocess (action (system "camlp5o -I components/syntax_extensions -I `ocamlfind query ulex-camlp5` pa_extend.cmo pa_ulex.cma helm_syntax_extensions.cma pa_unicode_macro.cma -loc loc %{input-file}"))) + (preprocessor_deps ../syntax_extensions/pa_unicode_macro.cma ../syntax_extensions/helm_syntax_extensions.cma) (wrapped false)) (env (dev diff --git a/matita/components/grafite_parser/dune b/matita/components/grafite_parser/dune index f9ba525bc..329efec92 100644 --- a/matita/components/grafite_parser/dune +++ b/matita/components/grafite_parser/dune @@ -1,8 +1,8 @@ (library (name helm_grafite_parser) (libraries helm_grafite ulex-camlp5 helm_ng_disambiguation helm_ng_library helm_content_pres) - (preprocess (action (system "camlp5o -I components/syntax_extensions -I `ocamlfind query ulex-camlp5` pa_extend.cmo pa_ulex.cma pa_unicode_macro.cma -loc loc %{input-file}"))) - (preprocessor_deps ../syntax_extensions/pa_unicode_macro.cma) + (preprocess (action (system "camlp5o -I components/syntax_extensions -I `ocamlfind query ulex-camlp5` pa_extend.cmo pa_ulex.cma helm_syntax_extensions.cma pa_unicode_macro.cma -loc loc %{input-file}"))) + (preprocessor_deps ../syntax_extensions/pa_unicode_macro.cma ../syntax_extensions/helm_syntax_extensions.cma) (wrapped false)) (env (dev diff --git a/matita/components/syntax_extensions/dune b/matita/components/syntax_extensions/dune index 884403ee6..c780ece7f 100644 --- a/matita/components/syntax_extensions/dune +++ b/matita/components/syntax_extensions/dune @@ -16,7 +16,7 @@ (wrapped false) (preprocess (action (system "camlp5o q_MLast.cmo pa_extend.cmo -loc loc %{input-file}"))) (preprocessor_deps helm_syntax_extensions.cma) - (library_flags components/syntax_extensions/helm_syntax_extensions.cma) + ;(library_flags components/syntax_extensions/helm_syntax_extensions.cma) (modules pa_unicode_macro)) (library -- 2.39.2