From 5b4fa9de94b2dbde4ff24b5f691968e11f644c61 Mon Sep 17 00:00:00 2001 From: Sjur N Moshagen Date: Wed, 6 Mar 2024 10:57:18 +0200 Subject: [PATCH 1/2] [Template merge] Revert to multifile lemma extraction instead of for loop --- m4/giella-macros.m4 | 2 +- .../fstbased/desktop/hfst/accept-all-lemmas.sh.in | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/m4/giella-macros.m4 b/m4/giella-macros.m4 index f740727..7b41780 100644 --- a/m4/giella-macros.m4 +++ b/m4/giella-macros.m4 @@ -88,7 +88,7 @@ AC_MSG_RESULT([$GIELLA_CORE]) ############################################################### ### This is the version of the Giella Core that we require. ### ### UPDATE AS NEEDED. -_giella_core_min_version=0.22.0 +_giella_core_min_version=0.22.2 # GIELLA_CORE/GTCORE env. variable, required by the infrastructure to find scripts: AC_ARG_VAR([GIELLA_CORE], [directory for the Giella infra core scripts and other required resources]) diff --git a/test/tools/spellcheckers/fstbased/desktop/hfst/accept-all-lemmas.sh.in b/test/tools/spellcheckers/fstbased/desktop/hfst/accept-all-lemmas.sh.in index 9fbb2c3..eceb38a 100755 --- a/test/tools/spellcheckers/fstbased/desktop/hfst/accept-all-lemmas.sh.in +++ b/test/tools/spellcheckers/fstbased/desktop/hfst/accept-all-lemmas.sh.in @@ -28,13 +28,9 @@ checked_lemmas=checked_lemmas.txt ##### Extract lemmas - add additional egrep pattern as parameters: ##### ##### --include "(pattern1|pattern2|...)" ##### ##### --exclude "(pattern1|pattern2|...)" ##### -rm -f $lemmas -touch $lemmas -for f in $source_files; do - @GTCORE@/scripts/extract-lemmas.sh \ +@GTCORE@/scripts/extract-lemmas.sh \ --exclude "(CmpN/Only|ShCmp|\+Cmp\/SplitR| Rreal | R | Rnoun |\+V\+|NOT-TO-LEMMATEST)" \ - $f >> $lemmas -done + $source_files > $lemmas ####### Start testing: ####### From c8cdc3f1329663e4e39d0b0f5e48acfb72fd5601 Mon Sep 17 00:00:00 2001 From: Sjur N Moshagen Date: Wed, 6 Mar 2024 10:57:43 +0200 Subject: [PATCH 2/2] Apply changes 174 [skip ci] --- .gut/delta.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gut/delta.toml b/.gut/delta.toml index 7348a65..d254251 100644 --- a/.gut/delta.toml +++ b/.gut/delta.toml @@ -1,6 +1,6 @@ template = "https://github.com/giellalt/template-lang-und" -rev_id = 173 -template_sha = "7f7aaa49ffc6ff6884deab8fb0fe6cae98efc3b8" +rev_id = 174 +template_sha = "9adfddf1c24903287529424ab1d522b969b00b11" [replacements] __REPO__ = "lang-srs"