Skip to content

Commit

Permalink
Start using GiellaLTGramTools (#44)
Browse files Browse the repository at this point in the history
* Use scripts from GiellaLTGramTools

* We don’t need scripts here, they have been moved to another repo

* Start using gtgramtool instead of scripts from giella-core

* Remove pip and lxml checks

* gtgramtool has moved -q option to yaml command

* Backwards compatibility breaking changes - up major version

---------

Co-authored-by: Sjur N Moshagen <[email protected]>
Co-authored-by: Flammie A Pirinen <[email protected]>
  • Loading branch information
3 people authored Apr 12, 2024
1 parent 3ef999b commit 9b5b845
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 1,347 deletions.
3 changes: 0 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,11 @@ 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 \
Expand Down
9 changes: 1 addition & 8 deletions am-shared/tools-grammarcheckers-dir-include.am
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,7 @@ $(GIELLA_GC_ERRORS): $(srcdir)/errors.source.xml
# Finally build the zcheck file:
$(GIELLA_GC_ZDISTRO): $(GIELLA_GC_ZIPFILES)
$(AM_V_at)rm -f $@
if !CAN_LXML
if CAN_PIP
$(AM_V_at)env python3 -m pip install -q lxml
else !CAN_PIP
echo lxml and pip is missing so this may fail...:
endif
endif
$(AM_V_GEN)$(GTCORE)/scripts/make_grammarchecker_zip.py pipespec.xml $@
gtgramtool build-archive pipespec.xml $@

# Additional developer tools:
dev: modes/$(GTLANG)gram.mode schemas.xml
Expand Down
2 changes: 1 addition & 1 deletion am-shared/tools-grammarcheckers-tests-dir-include.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
if WANT_GRAMCHECK

# Default variable for all languages
TESTS_ENVIRONMENT = "$(GIELLA_CORE)/scripts/gramcheck-test.py" -q -s ../$(GTLANG2).zcheck 2>/dev/null
TESTS_ENVIRONMENT = gtgramtool test -s ../$(GTLANG2).zcheck yaml -q 2>/dev/null

endif # WANT_GRAMCHECK
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_INIT([giella-core], [0.22.3], [[email protected]], [giella-core], [https://github.com/giellalt/giella-core])
AC_INIT([giella-core], [0.23.0], [[email protected]], [giella-core], [https://github.com/giellalt/giella-core])
AC_REVISION([$Revision$])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.9 tar-pax -Wall -Werror foreign])
Expand Down
297 changes: 0 additions & 297 deletions scripts/gramcheck-test.py

This file was deleted.

Loading

0 comments on commit 9b5b845

Please sign in to comment.