From 811a5120acddb350c41cb46f9ad84e6816c2cacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=B8rre=20Gaup?= Date: Mon, 26 Feb 2024 19:11:54 +0100 Subject: [PATCH] Revert "Use scripts from GiellaLTGramTools" This commit was way premature --- Makefile.am | 3 +++ am-shared/tools-grammarcheckers-dir-include.am | 2 +- am-shared/tools-grammarcheckers-tests-dir-include.am | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7118715c..b7105550 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,11 +130,14 @@ nobase_dist_pkgdata_SCRIPTS = \ scripts/iso639-to-name.sh \ scripts/iso-639-3.txt \ scripts/lookup2cg \ + scripts/make_grammarchecker_zip.py \ scripts/make-hfstspeller-version-easter-egg.sh \ scripts/make-lemmacount.json.sh \ scripts/make-maturity.json.sh \ scripts/merge-templates.sh \ scripts/morph-test.py \ + scripts/gramcheck-test.py \ + scripts/gramcheck_comparator.py \ scripts/new-language.sh \ scripts/patgen.exp \ scripts/predict.py \ diff --git a/am-shared/tools-grammarcheckers-dir-include.am b/am-shared/tools-grammarcheckers-dir-include.am index cda2c1cb..fb429ab5 100644 --- a/am-shared/tools-grammarcheckers-dir-include.am +++ b/am-shared/tools-grammarcheckers-dir-include.am @@ -149,7 +149,7 @@ else !CAN_PIP echo lxml and pip is missing so this may fail...: endif endif - make_grammarchecker_zip pipespec.xml $@ + $(AM_V_GEN)$(GTCORE)/scripts/make_grammarchecker_zip.py pipespec.xml $@ # Additional developer tools: dev: modes/$(GTLANG)gram.mode schemas.xml diff --git a/am-shared/tools-grammarcheckers-tests-dir-include.am b/am-shared/tools-grammarcheckers-tests-dir-include.am index c693b7d0..90184004 100644 --- a/am-shared/tools-grammarcheckers-tests-dir-include.am +++ b/am-shared/tools-grammarcheckers-tests-dir-include.am @@ -7,6 +7,6 @@ if WANT_GRAMCHECK # Default variable for all languages -TESTS_ENVIRONMENT = gramcheck-yaml -q -s ../$(GTLANG2).zcheck 2>/dev/null +TESTS_ENVIRONMENT = "$(GIELLA_CORE)/scripts/gramcheck-test.py" -q -s ../$(GTLANG2).zcheck 2>/dev/null endif # WANT_GRAMCHECK