diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2015-01-06 21:44:01 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2015-01-06 21:44:01 +0200 |
commit | 5dfd8dd432785ca8d8b6d2c11bac9e110feda52b (patch) | |
tree | bfe12bf71b50e7916ab5b957ba216def8c41cbf9 /src/ellinika | |
parent | c5e668cfd92985ff7e3e4be7c6be8c3ea3e6d57f (diff) | |
download | ellinika-5dfd8dd432785ca8d8b6d2c11bac9e110feda52b.tar.gz ellinika-5dfd8dd432785ca8d8b6d2c11bac9e110feda52b.tar.bz2 |
Update for Guile 2.0
* .gitmodules: New file
* gint: New module.
* Makefile.am (ACLOCAL_AMFLAGS, SUBDIRS): Add gint
* autogen.sh: Create a placeholder for ChangeLog.
* configure.ac: Add gint.
* scm/Makefile.am: Add silent rule magic.
* src/cgi-bin/Makefile.am: Likewise.
* src/ellinika/Makefile.am: Likewise.
* xml/Makefile.am: Likewise.
* scm/dictrans.scm: Load (ice-9 syncase) only for Guile 1.x
* scm/neatrans.scm: Likewise.
* src/ellinika/conjugator.scm: Likewise.
* src/ellinika/elmorph.c (elstr)<phoneme_count,nsyl>: Change type
to size_t.
* xml/pl/Makefile.am: Force UTF-8 locale when building html.
Add silent rule magic.
* xml/ru/Makefile.am: Likewise.
* xml/uk/Makefile.am: Likewise.
Diffstat (limited to 'src/ellinika')
-rw-r--r-- | src/ellinika/Makefile.am | 60 | ||||
-rw-r--r-- | src/ellinika/conjugator.scm | 3 | ||||
-rw-r--r-- | src/ellinika/elmorph.c | 10 | ||||
-rw-r--r-- | src/ellinika/i18n.scm | 1 |
4 files changed, 37 insertions, 37 deletions
diff --git a/src/ellinika/Makefile.am b/src/ellinika/Makefile.am index 12e0392..5f476ef 100644 --- a/src/ellinika/Makefile.am +++ b/src/ellinika/Makefile.am @@ -1,8 +1,8 @@ # This file is part of Ellinika project. -# Copyright (C) 2004,2006,2007,2008,2011 Sergey Poznyakoff +# Copyright (C) 2004, 2006-2008, 2011, 2015 Sergey Poznyakoff # # Ellinika is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # @@ -11,48 +11,50 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -guiledir=$(GUILE_SITE)/$(PACKAGE) -guile_DATA=\ +sitedir=$(GUILE_SITE)/$(PACKAGE) +site_DATA=\ xlat.scm\ cgi.scm\ i18n.scm\ config.scm\ dico.scm\ elmorph.scm\ tenses.scm\ sql.scm\ conjugator.scm cgi.m4: Makefile - echo 'divert(-1)' > $@ - echo 'changequote([,])' >> $@ - echo 'changecom([;],[' >> $@ - echo '])' >> $@ - echo 'undefine([format])' >> $@ - echo 'define([IFACE],[$(APACHE_IFACE)])' >> $@ - echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'>>$@ - echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])' >> $@ - echo 'define([GUILE_SITE],[@GUILE_SITE@])' >> $@ - echo 'define([PACKAGE],[$(PACKAGE)])'>> $@ - echo 'define([PREFIX],[$(prefix)])' >> $@ - echo 'define([SYSCONFDIR],[$(sysconfdir)])' >> $@ - echo 'define([LOCALEDIR],[$(datadir)/locale])' >> $@ - echo 'define([HTMLDIR],[$(HTMLDIR)])' >> $@ - echo 'define([VERSION],[$(VERSION)])' >> $@ - echo 'define([LIBDIR],[$(pkglibdir)])' >> $@ - echo 'divert(0)dnl' >> $@ - echo '@AUTOGENERATED@' >> $@ + $(AM_V_GEN){ \ + echo 'divert(-1)'; \ + echo 'changequote([,])'; \ + echo 'changecom([;],['; \ + echo '])'; \ + echo 'undefine([format])'; \ + echo 'define([IFACE],[$(APACHE_IFACE)])'; \ + echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'; \ + echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])'; \ + echo 'define([GUILE_SITE],[@GUILE_SITE@])'; \ + echo 'define([PACKAGE],[$(PACKAGE)])'; \ + echo 'define([PREFIX],[$(prefix)])'; \ + echo 'define([SYSCONFDIR],[$(sysconfdir)])'; \ + echo 'define([LOCALEDIR],[$(datadir)/locale])'; \ + echo 'define([HTMLDIR],[$(HTMLDIR)])'; \ + echo 'define([VERSION],[$(VERSION)])'; \ + echo 'define([LIBDIR],[$(pkglibdir)])'; \ + echo 'divert(0)dnl'; \ + echo '@AUTOGENERATED@'; \ + } > cgi.m4 SUFFIXES = .scm4 .scm .x .scm4.scm: - m4 -I$(srcdir) cgi.m4 $< > $@ + $(AM_V_GEN)m4 -I$(srcdir) cgi.m4 $< > $@ cgi.scm: cgi.scm4 cgi.m4 config.scm: config.scm4 cgi.m4 elmorph.scm: elmorph.scm4 elmorph-public.scm cgi.m4 pkglib_LTLIBRARIES=libelmorph.la @@ -65,23 +67,15 @@ libelmorph_la_SOURCES = \ elmorph.c\ elmorph.h\ phoneme.y\ syllabificator.c DOT_X_FILES = elmorph.x utf8scm.x - BUILT_SOURCES = $(DOT_X_FILES) - DISTCLEANFILES = $(DOT_X_FILES) -snarfcppopts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - -.c.x: - AWK=$(AWK) \ - guile-snarf -o $@ $< $(snarfcppopts) - pkglibnames=elmorph install-data-hook: here=`pwd`; \ cd $(DESTDIR)$(pkglibdir);\ for name in $(pkglibnames); do \ @@ -93,6 +87,12 @@ install-data-hook: done; \ cd $$here AM_YFLAGS = -d YACCCOMPILE = $(srcdir)/yyrename '$(YACC) $(YFLAGS) $(AM_YFLAGS)' EXTRA_DIST = yyrename elmorph-public.scm + +AM_CPPFLAGS=-I. +CLEANFILES= +MAINTAINERCLEANFILES= +include ../../gint/gint.mk + diff --git a/src/ellinika/conjugator.scm b/src/ellinika/conjugator.scm index eae4ad0..f8b1eb0 100644 --- a/src/ellinika/conjugator.scm +++ b/src/ellinika/conjugator.scm @@ -20,13 +20,14 @@ (use-modules (srfi srfi-1) (ellinika elmorph) (ellinika i18n) (ellinika tenses) (ellinika sql)) -(use-syntax (ice-9 syncase)) +(if (= (string->number (major-version)) 1) + (use-modules (ice-9 syncase))) ;; Verb info ;; #:verb - Verb in dictionary form ;; #:conj - Conjugation class ;; diff --git a/src/ellinika/elmorph.c b/src/ellinika/elmorph.c index a06d43b..5094db8 100644 --- a/src/ellinika/elmorph.c +++ b/src/ellinika/elmorph.c @@ -1,8 +1,8 @@ /* This file is part of Ellinika project. - Copyright (C) 2011 Sergey Poznyakoff + Copyright (C) 2011, 2015 Sergey Poznyakoff Ellinika is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. @@ -25,29 +25,29 @@ struct elstr { unsigned *str; /* UTF-8 string */ size_t len; /* Its length */ struct phoneme *phoneme; /* Phonetical map*/ - unsigned phoneme_count; /* Number of phonemes */ + size_t phoneme_count; /* Number of phonemes */ struct syllable *sylmap; /* Syllable map (nsyl elements) */ - unsigned nsyl; /* Number of syllables. */ + size_t nsyl; /* Number of syllables. */ unsigned acc_syl; /* Number of the accented syllable (1-based, from the last syllable) */ unsigned acc_pos; /* Number of the accented character (0-based, from str[0]) */ }; scm_t_bits _elstr_tag; static void _elstr_syllabize(struct elstr *elstr, const char *func_name) { - unsigned i; + size_t i; free(elstr->phoneme); free(elstr->sylmap); if (phoneme_map(&elstr->phoneme, &elstr->phoneme_count, elstr->str, elstr->len)) @@ -193,13 +193,13 @@ _elstr_free(SCM smob) } static int _elstr_print(SCM smob, SCM port, scm_print_state *pstate) { struct elstr *elstr = (struct elstr *) SCM_CDR(smob); - int i, j; + size_t i, j; char *s; scm_puts("#<elstr ", port); if (elstr->sylmap) { scm_puts("``", port); for (i = 0; i < elstr->nsyl; i++) { diff --git a/src/ellinika/i18n.scm b/src/ellinika/i18n.scm index 474c8c9..c05d727 100644 --- a/src/ellinika/i18n.scm +++ b/src/ellinika/i18n.scm @@ -20,13 +20,12 @@ #:export (locale-setup)) (define-syntax _ (syntax-rules () ((_ msg) (gettext msg)))) - ;;; ISO 639 language code => ISO 3166 country code ;;; The corresponding country codes where selected using the following ;;; principles: ;;; 1. If the language is spoken in only one country, this country code is ;;; used. ;;; 2. If the language is spoken in more than one country, select the code of |