Skip to content
Snippets Groups Projects
Commit 17e5d61f authored by Apertis CI's avatar Apertis CI
Browse files

Import Upstream version 0.5.2

parent a6526dca
Branches debian/trixie
Tags debian/0.5.4-1
1 merge request!1Update from debian/bullseye for apertis/v2022dev2
Pipeline #502202 skipped
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 86 additions and 2193 deletions
.travis.yml deleted 100644 → 0
+ 0
− 15
View file @ a6526dca
sudo: required
dist: trusty
language: cpp
addons:
apt:
packages:
- libxml++2.6-dev
- libarchive-dev
script:
- autoreconf -fi
- ./configure --disable-static --enable-zhfst
- make -j3
- make -j1 check
ChangeLog
+ 5
− 1
View file @ 17e5d61f
678d45d (HEAD -> master, origin/master, origin/HEAD) Treat all tests as XFAIL_TESTS if zhfst support is disabled.
a949408 (HEAD -> master, origin/master, origin/HEAD) ICU is namespaced in newer versions (fixes #42)
e272cd2 Change correction finding order (issue #28); Require C++1y (C++14)
0521ea9 (tag: v0.5.0) Copyright extends to 2018.
e16dcbb Ready for release 0.5.0.
678d45d Treat all tests as XFAIL_TESTS if zhfst support is disabled.
a3f39d9 Merge pull request #31 from hfst/configure-explicit-error
bc1c9ea Separate counters (fixes #37, closes #38)
a4aeae0 Post-case-mangling unique test
......
ChangeLog.old
+ 18
− 1
View file @ 17e5d61f
4f2026c (HEAD -> master, origin/master, origin/HEAD) Add missing files to dist.
678d45d (HEAD -> master, origin/master, origin/HEAD) Treat all tests as XFAIL_TESTS if zhfst support is disabled.
a3f39d9 Merge pull request #31 from hfst/configure-explicit-error
bc1c9ea Separate counters (fixes #37, closes #38)
a4aeae0 Post-case-mangling unique test
1d088e1 Avoid shadowing multicharacter ascii-beginning symbols
69ab95d Merge pull request #35 from unhammer/renamespace-hfst_ol
d39b93c rename hfst_ol namespace to hfst_ospell to avoid conflicts
eccbd6f Bump actual version; Modernize for() loops
a9919f4 Merge pull request #33 from unhammer/analysisSymbols
f36de02 bump minor version because of new API function
019f303 New API fn analyseSymbols giving unconcatenated vector<string>'s
da508b7 Dirty hack to parse XML a bit better; ToDo: use actual portable XML library
dad7c5c Minimal XML parsing to get locale, title, and description for Voikko and other frontends
f40d4b5 (origin/configure-explicit-error) let './configure --enable-zhfst' fail if no libarchive found
a737b52 When using help2man remember -n description
1fc3fca Update copyright and authors listing
d791a41 (tag: v0.4.5) Release 0.4.5.
4f2026c Add missing files to dist.
bae21c3 Forgot to commit configure.ac... Update hfst-ospell manual and add man pages to dist.
7c8690a (tag: v0.4.4) Ready for release 0.4.4.
671efe6 Trusty has C++11
......
INSTALL deleted 100644 → 0
+ 0
− 234
View file @ a6526dca
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
Installation Names
==================
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
Makefile.am
+ 1
− 1
View file @ 17e5d61f
......@@ -54,7 +54,7 @@ endif
libhfstospell_la_SOURCES=hfst-ol.cc ospell.cc \
ZHfstOspeller.cc ZHfstOspellerXmlMetadata.cc
libhfstospell_la_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) $(PKG_CXXFLAGS)
libhfstospell_la_LDFLAGS=-no-undefined -version-info 10:0:0 \
libhfstospell_la_LDFLAGS=-no-undefined -version-info 11:0:0 \
$(PKG_LIBS)
# link sample program against library here
......
NEWS
+ 7
− 0
View file @ 17e5d61f
......@@ -4,6 +4,13 @@ NEWS for hfst-ospell
This file contains all noteworthy changes in HFST-ospell development between
releases. For full listing of changes see ChangeLog.
Noteworthy changes in 0.5.1
---------------------------
* change correction finding order (fixes issue #28)
* require C++1y (C++14)
* observe ICU namespacing (fixes issue #42)
Noteworthy changes in 0.5.0
---------------------------
......
ZHfstOspeller.cc
+ 20
− 2
View file @ 17e5d61f
......@@ -37,6 +37,12 @@ using std::map;
#include "hfst-ol.h"
#include "ZHfstOspeller.h"
#ifdef WIN32
#include <io.h>
#include <fcntl.h>
#include <windows.h>
#endif
namespace hfst_ospell
{
......@@ -85,19 +91,30 @@ inline Transducer* transducer_to_mem(archive* ar, archive_entry* entry) {
}
inline char* extract_to_tmp_dir(archive* ar) {
char* rv = strdup("/tmp/zhfstospellXXXXXXXX");
#ifdef WIN32
char rv[MAX_PATH+1];
if (!GetTempPathA(MAX_PATH, rv)) {
throw ZHfstZipReadingError("Could not get temporary path");
}
strcat(rv, "zhfstospellXXXXXX");
mktemp(rv);
int temp_fd = open(rv, _O_CREAT | _O_TRUNC | _O_RDWR);
#else
char rv[] = "/tmp/zhfstospellXXXXXXXX";
int temp_fd = mkstemp(rv);
#endif
int rr = archive_read_data_into_fd(ar, temp_fd);
if ((rr != ARCHIVE_EOF) && (rr != ARCHIVE_OK)) {
throw ZHfstZipReadingError("Archive not EOF'd or OK'd");
}
close(temp_fd);
return rv;
return strdup(rv);
}
inline Transducer* transducer_to_tmp_dir(archive* ar) {
char *filename = extract_to_tmp_dir(ar);
FILE* f = fopen(filename, "rb");
free(filename);
if (f == nullptr) {
throw ZHfstTemporaryWritingError("reading acceptor back from temp file");
}
......@@ -397,6 +414,7 @@ ZHfstOspeller::read_zhfst(const string& filename)
catch (...) {
char* temporary = extract_to_tmp_dir(ar);
metadata_.read_xml(temporary);
free(temporary);
}
}
else
......
autogen.sh deleted 100755 → 0
+ 0
− 1491
View file @ a6526dca
This diff is collapsed.
configure.ac
+ 12
− 13
View file @ 17e5d61f
......@@ -17,7 +17,7 @@
# autoconf requirements
AC_PREREQ([2.62])
AC_INIT([hfstospell], [0.5.0], [hfst-bugs@helsinki.fi], [hfstospell], [http://hfst.github.io])
AC_INIT([hfstospell], [0.5.2], [hfst-bugs@helsinki.fi], [hfstospell], [http://hfst.github.io])
LT_PREREQ([2.2.6])
......@@ -34,16 +34,14 @@ AC_CONFIG_HEADERS([config.h])
HFSTOSPELL_NAME=hfstospell
HFSTOSPELL_MAJOR=0
HFSTOSPELL_MINOR=5
HFSTOSPELL_EXTENSION=.0
HFSTOSPELL_EXTENSION=.2
HFSTOSPELL_VERSION=$HFSTOSPELL_MAJOR.$HFSTOSPELL_MINOR$HFSTOSPELL_EXTENSION
AC_SUBST(HFSTOSPELL_MAJOR)
AC_SUBST(HFSTOSPELL_MINOR)
AC_SUBST(HFSTOSPELL_VERSION)
AC_SUBST(HFSTOSPELL_NAME)
# Check for pkg-config first - the configuration won't work if it isn't available:
AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
AS_IF([test "x$PKGCONFIG" = xno], [AC_MSG_ERROR([pkg-config is required - please install])])
PKG_PROG_PKG_CONFIG
AC_PATH_PROG([DOXYGEN], [doxygen], [false])
AM_CONDITIONAL([CAN_DOXYGEN], [test "x$DOXYGEN" != xfalse])
......@@ -143,18 +141,19 @@ AC_TYPE_SIZE_T
AC_C_BIGENDIAN
# Checks for library functions
AC_FUNC_MALLOC
AC_CHECK_FUNCS([strndup error])
# Checks for system services
# Checks for highest supported C++ standard
# Require highest supported C++ standard
AC_LANG(C++)
AX_CHECK_COMPILE_FLAG([-std=c++17], [CXXFLAGS="$CXXFLAGS -std=c++17"], [
AX_CHECK_COMPILE_FLAG([-std=c++1z], [CXXFLAGS="$CXXFLAGS -std=c++1z"], [
AX_CHECK_COMPILE_FLAG([-std=c++14], [CXXFLAGS="$CXXFLAGS -std=c++14"], [
AX_CHECK_COMPILE_FLAG([-std=c++1y], [CXXFLAGS="$CXXFLAGS -std=c++1y"], [
AX_CHECK_COMPILE_FLAG([-std=c++11], [CXXFLAGS="$CXXFLAGS -std=c++11"], [
AC_MSG_ERROR([could not enable C++11 or newer])
AX_CHECK_COMPILE_FLAG([-std=c++20], [CXXFLAGS="$CXXFLAGS -std=c++20"], [
AX_CHECK_COMPILE_FLAG([-std=c++2a], [CXXFLAGS="$CXXFLAGS -std=c++2a"], [
AX_CHECK_COMPILE_FLAG([-std=c++17], [CXXFLAGS="$CXXFLAGS -std=c++17"], [
AX_CHECK_COMPILE_FLAG([-std=c++1z], [CXXFLAGS="$CXXFLAGS -std=c++1z"], [
AX_CHECK_COMPILE_FLAG([-std=c++14], [CXXFLAGS="$CXXFLAGS -std=c++14"], [
AX_CHECK_COMPILE_FLAG([-std=c++1y], [CXXFLAGS="$CXXFLAGS -std=c++1y"], [
AC_MSG_ERROR([Could not enable at least C++1y (C++14) - upgrade your compiler])
])
])
])
])
......
hfst-ospell-office.1
+ 1
− 1
View file @ 17e5d61f
.TH HFST-OSPELL-OFFICE "5" "March 2018" "hfst-ospell-office " "User Commands"
.TH HFST-OSPELL-OFFICE "1" "March 2018" "hfst-ospell-office " "User Commands"
.SH NAME
hfst-ospell-office \- Spell checker tool based on HFST
.SH SYNOPSIS
......
hfst-ospell.1
+ 1
− 1
View file @ 17e5d61f
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4.
.TH HFST-OSPELL "5" "March 2018" "hfst-ospell " "User Commands"
.TH HFST-OSPELL "1" "March 2018" "hfst-ospell " "User Commands"
.SH NAME
hfst-ospell \- Spell checker tool based on HFST
.SH SYNOPSIS
......
main.cc
+ 1
− 1
View file @ 17e5d61f
......@@ -61,7 +61,7 @@ static bool suggest_reals = false;
#ifdef WINDOWS
static std::string wide_string_to_string(const std::wstring & wstr)
{
int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)§wstr.size(), NULL, 0, NULL, NULL);
int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL);
std::string str( size_needed, 0 );
WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), &str[0], size_needed, NULL, NULL);
return str;
......
office.cc
+ 20
− 11
View file @ 17e5d61f
......@@ -49,6 +49,7 @@
#include <unicode/uloc.h>
#include <unicode/uchar.h>
#include <unicode/unistr.h>
using namespace icu;
#include "ZHfstOspeller.h"
......@@ -64,6 +65,7 @@ struct word_t {
};
std::vector<word_t> words(16);
std::string buffer;
std::vector<std::string> alts;
std::unordered_set<std::string> outputs;
UnicodeString ubuffer, uc_buffer;
size_t cw;
......@@ -74,24 +76,24 @@ bool uc_all = true;
bool find_alternatives(ZHfstOspeller& speller, size_t suggs) {
outputs.clear();
alts.clear();
for (size_t k=1 ; k <= cw ; ++k) {
// Gather corrections from all the tried variants, starting with verbatim and increasing mangling from there
for (size_t k=0 ; k < cw && alts.size()<suggs ; ++k) {
buffer.clear();
words[cw-k].buffer.toUTF8String(buffer);
words[k].buffer.toUTF8String(buffer);
hfst_ospell::CorrectionQueue corrections = speller.suggest(buffer);
if (corrections.size() == 0) {
continue;
}
std::cout << "&";
// Because speller.set_queue_limit() doesn't actually work, hard limit it here
for (size_t i=0, n=0, e=corrections.size() ; i<e && n<suggs ; ++i) {
std::cout << "\t";
for (size_t i=0, e=corrections.size() ; i<e && alts.size()<suggs ; ++i) {
buffer.clear();
if (cw - k != 0) {
words[0].buffer.tempSubString(0, words[cw-k].start).toUTF8String(buffer);
if (k != 0) {
words[0].buffer.tempSubString(0, words[k].start).toUTF8String(buffer);
}
if (uc_all) {
UnicodeString::fromUTF8(corrections.top().first).toUpper().toUTF8String(buffer);
......@@ -106,20 +108,27 @@ bool find_alternatives(ZHfstOspeller& speller, size_t suggs) {
else {
buffer.append(corrections.top().first);
}
if (cw - k != 0) {
words[0].buffer.tempSubString(words[cw-k].start + words[cw-k].count).toUTF8String(buffer);
if (k != 0) {
words[0].buffer.tempSubString(words[k].start + words[k].count).toUTF8String(buffer);
}
if (outputs.count(buffer) == 0) {
std::cout << buffer;
++n;
alts.push_back(buffer);
}
outputs.insert(buffer);
corrections.pop();
}
}
if (!alts.empty()) {
std::cout << "&";
for (auto& alt : alts) {
std::cout << "\t" << alt;
}
std::cout << std::endl;
return true;
}
return false;
}
......
windows-Makefile.am deleted 100644 → 0
+ 0
− 278
View file @ a6526dca
## Process this file with automake to produce Makefile.in
# Copyright 2010 University of Helsinki
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# to silence:
# libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
ACLOCAL_AMFLAGS=-I m4
# targets
if EXTRA_DEMOS
CONFERENCE_DEMOS=hfst-ospell-norvig hfst-ospell-fsmnlp-2012 hfst-ospell-cicling\
hfst-ospell-survey hfst-ospell-lrec2013 hfst-ispell
endif # EXTRA_DEMOS
bin_PROGRAMS=hfst-ospell $(CONFERENCE_DEMOS)
#lib_LTLIBRARIES=libhfstospell.la
man1_MANS=hfst-ospell.1
PKG_LIBS=
PKG_CXXFLAGS=
if WANT_ARCHIVE
PKG_LIBS+=$(LIBARCHIVE_LIBS)
PKG_CXXFLAGS+=$(LIBARCHIVE_CFLAGS)
endif
#if WANT_LIBXMLPP
#PKG_LIBS+=$(LIBXMLPP_LIBS)
#PKG_CXXFLAGS+=$(LIBXMLPP_CFLAGS)
#endif
if WANT_TINYXML2
PKG_LIBS+=$(TINYXML2_LIBS)
PKG_CXXFLAGS+=$(TINYXML2_CFLAGS)
endif
# library parts
#libhfstospell_la_SOURCES=
#libhfstospell_la_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) $(PKG_CXXFLAGS)
#libhfstospell_la_LDFLAGS=-no-undefined -version-info 4:0:0 \
$(PKG_LIBS)
# link sample program against library here
hfst_ospell_SOURCES=main.cc hfst-ol.cc ospell.cc \
ZHfstOspeller.cc ZHfstOspellerXmlMetadata.cc \
tinyxml2.cc \
libarchive/archive_acl.c \
libarchive/archive_acl_private.h \
libarchive/archive_check_magic.c \
libarchive/archive_crc32.h \
libarchive/archive_crypto.c \
libarchive/archive_crypto_private.h \
libarchive/archive_endian.h \
libarchive/archive_entry.c \
libarchive/archive_entry.h \
libarchive/archive_entry_copy_stat.c \
libarchive/archive_entry_link_resolver.c \
libarchive/archive_entry_locale.h \
libarchive/archive_entry_private.h \
libarchive/archive_entry_sparse.c \
libarchive/archive_entry_stat.c \
libarchive/archive_entry_strmode.c \
libarchive/archive_entry_xattr.c \
libarchive/archive_options.c \
libarchive/archive_options_private.h \
libarchive/archive_platform.h \
libarchive/archive_ppmd_private.h \
libarchive/archive_ppmd7.c \
libarchive/archive_ppmd7_private.h \
libarchive/archive_private.h \
libarchive/archive_rb.c \
libarchive/archive_rb.h \
libarchive/archive_read.c \
libarchive/archive_read_data_into_fd.c \
libarchive/archive_read_disk_entry_from_file.c \
libarchive/archive_read_disk_posix.c \
libarchive/archive_read_disk_private.h \
libarchive/archive_read_disk_set_standard_lookup.c \
libarchive/archive_read_extract.c \
libarchive/archive_read_open_fd.c \
libarchive/archive_read_open_file.c \
libarchive/archive_read_open_filename.c \
libarchive/archive_read_open_memory.c \
libarchive/archive_read_private.h \
libarchive/archive_read_set_options.c \
libarchive/archive_read_support_filter_all.c \
libarchive/archive_read_support_filter_compress.c \
libarchive/archive_read_support_filter_gzip.c \
libarchive/archive_read_support_filter_none.c \
libarchive/archive_read_support_filter_program.c \
libarchive/archive_read_support_filter_rpm.c \
libarchive/archive_read_support_filter_uu.c \
libarchive/archive_read_support_filter_xz.c \
libarchive/archive_read_support_format_7zip.c \
libarchive/archive_read_support_format_all.c \
libarchive/archive_read_support_format_ar.c \
libarchive/archive_read_support_format_by_code.c \
libarchive/archive_read_support_format_cab.c \
libarchive/archive_read_support_format_cpio.c \
libarchive/archive_read_support_format_empty.c \
libarchive/archive_read_support_format_iso9660.c \
libarchive/archive_read_support_format_lha.c \
libarchive/archive_read_support_format_mtree.c \
libarchive/archive_read_support_format_rar.c \
libarchive/archive_read_support_format_raw.c \
libarchive/archive_read_support_format_tar.c \
libarchive/archive_read_support_format_xar.c \
libarchive/archive_read_support_format_zip.c \
libarchive/archive_string.c \
libarchive/archive_string.h \
libarchive/archive_string_composition.h \
libarchive/archive_string_sprintf.c \
libarchive/archive_util.c \
libarchive/archive_virtual.c \
libarchive/archive_write.c \
libarchive/archive_write_disk_posix.c \
libarchive/archive_write_disk_private.h \
libarchive/archive_write_disk_set_standard_lookup.c \
libarchive/archive_write_open_fd.c \
libarchive/archive_write_open_file.c \
libarchive/archive_write_open_filename.c \
libarchive/archive_write_open_memory.c \
libarchive/archive_write_private.h \
libarchive/archive_write_add_filter_compress.c \
libarchive/archive_write_add_filter_gzip.c \
libarchive/archive_write_add_filter_none.c \
libarchive/archive_write_add_filter_program.c \
libarchive/archive_write_add_filter_xz.c \
libarchive/archive_write_set_format.c \
libarchive/archive_write_set_format_7zip.c \
libarchive/archive_write_set_format_ar.c \
libarchive/archive_write_set_format_by_name.c \
libarchive/archive_write_set_format_cpio.c \
libarchive/archive_write_set_format_cpio_newc.c \
libarchive/archive_write_set_format_iso9660.c \
libarchive/archive_write_set_format_mtree.c \
libarchive/archive_write_set_format_pax.c \
libarchive/archive_write_set_format_shar.c \
libarchive/archive_write_set_format_ustar.c \
libarchive/archive_write_set_format_gnutar.c \
libarchive/archive_write_set_format_xar.c \
libarchive/archive_write_set_format_zip.c \
libarchive/archive_write_set_options.c \
libarchive/config_freebsd.h \
libarchive/archive_read_support_filter_bzip2.c \
libarchive/archive_write_add_filter_bzip2.c \
libarchive/filter_fork.c \
libarchive/filter_fork.h \
libarchive/archive_entry_copy_bhfi.c \
libarchive/archive_read_disk_windows.c \
libarchive/archive_windows.h \
libarchive/archive_windows.c \
libarchive/archive_write_disk_windows.c \
libarchive/filter_fork_windows.c
#hfst_ospell_LDADD=libhfstospell.la
hfst_ospell_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) \
$(PKG_CXXFLAGS)
if EXTRA_DEMOS
hfst_ospell_norvig_SOURCES=main-norvig.cc
#hfst_ospell_norvig_LDADD=libhfstospell.la
hfst_ospell_norvig_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) \
$(PKG_CXXFLAGS)
hfst_ospell_cicling_SOURCES=main-cicling.cc
#hfst_ospell_cicling_LDADD=libhfstospell.la
hfst_ospell_cicling_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) \
$(PKG_CXXFLAGS)
hfst_ospell_lrec2013_SOURCES=main-lrec2013.cc
#hfst_ospell_lrec2013_LDADD=libhfstospell.la
hfst_ospell_lrec2013_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) \
$(PKG_CXXFLAGS)
hfst_ospell_survey_SOURCES=main-survey.cc
#hfst_ospell_survey_LDADD=libhfstospell.la
hfst_ospell_survey_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) \
$(PKG_CXXFLAGS)
hfst_ospell_fsmnlp_2012_SOURCES=main-fsmnlp-2012.cc
#hfst_ospell_fsmnlp_2012_LDADD=libhfstospell.la
hfst_ospell_fsmnlp_2012_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) \
$(PKG_CXXFLAGS)
endif # EXTRA_DEMOS
hfst_ispell_SOURCES=main-ispell.cc
#hfst_ispell_LDADD=libhfstospell.la
hfst_ispell_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) \
$(PKG_CXXFLAGS)
# install headers for library in hfst's includedir
include_HEADERS=hfst-ol.h ospell.h ol-exceptions.h \
ZHfstOspeller.h ZHfstOspellerXmlMetadata.h tinyxml2.h
# pkgconfig
pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA=hfstospell.pc
# tests
if CAN_TEST
TXTS=acceptor.default.txt errmodel.default.txt errmodel.extrachars.txt
check_DATA=speller_basic.zhfst empty_descriptions.zhfst \
empty_titles.zhfst empty_locale.zhfst \
trailing_spaces.zhfst \
spl.hfstol sug.hfstol err.hfstol \
acceptor.default.hfst errmodel.default.hfst \
errmodel.extrachars.hfst bad_errormodel.zhfst
# Actual test scripts:
TESTS=basic-zhfst.sh basic-legacy.sh basic-zhfst-fallback.sh \
empty-descriptions.sh empty-titles.sh empty-locale.sh \
trailing-spaces.sh bad-errormodel.sh empty-zhfst.sh
XFAIL_TESTS=empty-descriptions.sh empty-titles.sh empty-locale.sh empty-zhfst.sh
EXTRA_DIST=$(TXTS) $(TESTS) \
basic_test.xml empty_descriptions.xml empty_titles.xml \
empty_locale.xml trailing_spaces.xml \
test.strings
clean-local:
-rm -rf $(check_DATA) index.xml
endif # CAN_TEST
# N.B. Do not parallel test, race condition exists
empty_descriptions.zhfst: acceptor.default.hfst errmodel.default.hfst empty_descriptions.xml
cp -f $(srcdir)/empty_descriptions.xml index.xml
$(ZIP) $(ZIPFLAGS) $@ acceptor.default.hfst errmodel.default.hfst index.xml
empty_titles.zhfst: acceptor.default.hfst errmodel.default.hfst empty_titles.xml
cp -f $(srcdir)/empty_titles.xml index.xml
$(ZIP) $(ZIPFLAGS) $@ acceptor.default.hfst errmodel.default.hfst index.xml
empty_locale.zhfst: acceptor.default.hfst errmodel.default.hfst empty_locale.xml
cp -f $(srcdir)/empty_locale.xml index.xml
$(ZIP) $(ZIPFLAGS) $@ acceptor.default.hfst errmodel.default.hfst index.xml
trailing_spaces.zhfst: acceptor.default.hfst errmodel.default.hfst trailing_spaces.xml
cp -f $(srcdir)/trailing_spaces.xml index.xml
$(ZIP) $(ZIPFLAGS) $@ acceptor.default.hfst errmodel.default.hfst index.xml
# N.B. Do not parallel test, race condition exists
speller_basic.zhfst: acceptor.default.hfst errmodel.default.hfst basic_test.xml
cp $(srcdir)/basic_test.xml index.xml
$(ZIP) $(ZIPFLAGS) $@ acceptor.default.hfst errmodel.default.hfst index.xml
bad_errormodel.zhfst: acceptor.default.hfst errmodel.extrachars.hfst index.xml
cp -f $(srcdir)/errmodel.extrachars.hfst errmodel.default.hfst
$(ZIP) $(ZIPFLAGS) $@ acceptor.default.hfst errmodel.default.hfst index.xml
sug.hfstol: acceptor.default.hfst
-ln -sf $< $@
spl.hfstol: acceptor.default.hfst
-ln -sf $< $@
err.hfstol: errmodel.default.hfst
-ln -sf $< $@
.txt.hfst:
hfst-txt2fst $< | hfst-fst2fst -f olw -o $@
.txt.hfstol:
hfst-txt2fst $< | hfst-fst2fst -f olw -o $@
hfst-ospell.1: hfst-ospell
help2man --no-discard-stderr $< > $@
windows-configure.ac deleted 100644 → 0
+ 0
− 143
View file @ a6526dca
## Process this file with autoconf to produce configure script
## Copyright (C) 2010 University of Helsinki
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# autoconf requirements
AC_PREREQ([2.62])
LT_PREREQ([2.2.6])
# init
AC_INIT([hfstospell], [0.3.0], [hfst-bugs@helsinki.fi], [hfstospell], [http://hfst.sf.net])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign check-news color-tests silent-rules])
AM_SILENT_RULES([yes])
AC_REVISION([$Revision: 3876 $])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([ospell.cc])
AC_CONFIG_HEADERS([config.h])
# Information on package
HFSTOSPELL_NAME=hfstospell
HFSTOSPELL_MAJOR=0
HFSTOSPELL_MINOR=3
HFSTOSPELL_EXTENSION=.0
HFSTOSPELL_VERSION=$HFSTOSPELL_MAJOR.$HFSTOSPELL_MINOR$HFSTOSPELL_EXTENSION
AC_SUBST(HFSTOSPELL_MAJOR)
AC_SUBST(HFSTOSPELL_MINOR)
AC_SUBST(HFSTOSPELL_VERSION)
AC_SUBST(HFSTOSPELL_NAME)
# Check for pkg-config first - the configuration won't work if it isn't available:
#AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
#AS_IF([test "x$PKGCONFIG" = xno], [AC_MSG_ERROR([pkg-config is required - please install])])
#AC_PATH_PROG([DOXYGEN], [doxygen], [false])
#AM_CONDITIONAL([CAN_DOXYGEN], [test "x$DOXYGEN" != xfalse])
# Settings
AC_ARG_ENABLE([extra_demos],
[AS_HELP_STRING([--enable-extra-demos],
[build conference demos for science reproduction @<:@default=no@:>@])],
[enable_extra_demos=$enableval], [enable_extra_demos=no])
AM_CONDITIONAL([EXTRA_DEMOS], [test x$enable_extra_demos != xno])
AC_ARG_ENABLE([zhfst],
[AS_HELP_STRING([--enable-zhfst],
[support zipped complex automaton sets @<:@default=check@:>@])],
[enable_zhfst=$enableval], [enable_zhfst=check])
AC_ARG_ENABLE([xml],
[AS_HELP_STRING([--enable-xml=LIBXML],
[support xml metadata for zipped automaton sets with library LIBXML @<:@default=libxmlpp@:>@])],
[enable_xml=$enableval], [enable_xml=libxmlpp])
AC_ARG_WITH([extract],
[AS_HELP_STRING([--with-extract=TARGET],
[extract zhfst archives to tmpdir or mem @<:@default=mem@:>@])],
[with_extract=$withval], [with_extract=mem])
AS_IF([test "x$with_extract" = xmem], [AC_DEFINE([ZHFST_EXTRACT_TO_MEM], [1],
[Define to extract zhfst archives to char buffer])],
[AS_IF([test "x$with_extract" = xtmpdir],
[AC_DEFINE([ZHFST_EXTRACT_TO_TMPDIR], [1],
[Define to extract zhfst to tmp dir])],
[AC_MSG_ERROR([Use with-extract to mem or tmpdir])])])
# Checks for programs
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_PROG_CC
AC_PROG_CXX
AC_LIBTOOL_WIN32_DLL
LT_INIT
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PATH_PROG([HFST_TXT2FST], [hfst-txt2fst], [false])
AC_PATH_PROG([HFST_FST2FST], [hfst-fst2fst], [false])
AC_PATH_PROG([ZIP], [zip], [false])
AM_CONDITIONAL([CAN_TEST],
[test x$HFST_TXT2FST != xfalse -a x$HFST_FST2FST != xfalse -a x$ZIP != xfalse])
# Checks for libraries
#AS_IF([test x$enable_zhfst != xno],
# [PKG_CHECK_MODULES([LIBARCHIVE], [libarchive > 3],
# [AC_DEFINE([HAVE_LIBARCHIVE], [1], [Use archives])
# enable_zhfst=yes],
# [enable_zhfst=no])])
AC_DEFINE([HAVE_LIBARCHIVE], [1], [Use archives])
AM_CONDITIONAL([WANT_ARCHIVE], [test x$enable_zhfst != xno])
#AS_IF([test x$enable_xml = xlibxmlpp],
# [PKG_CHECK_MODULES([LIBXMLPP], [libxml++-2.6 >= 2.10.0],
# [AC_DEFINE([HAVE_LIBXML], [1], [Use libxml++])],
# [AC_MSG_WARN([libxml++ failed, disabling xml])
# enable_xml=no])])
#AM_CONDITIONAL([WANT_LIBXMLPP], [test x$enable_xml = xlibxmlpp])
#AS_IF([test x$enable_xml = xtinyxml2],
# [PKG_CHECK_MODULES([TINYXML2], [tinyxml2 >= 1.0.8],
# [AC_DEFINE([HAVE_TINYXML2], [1], [Use tinyxml])],
# [AC_MSG_WARN([tinyxml missing, xml disabled])
# enable_xml=no])])
AC_DEFINE([HAVE_TINYXML2], [1], [Use tinyxml])
AM_CONDITIONAL([WANT_TINYXML2], [test x$enable_xml = xtinyxml2])
# Checks for header files
AC_CHECK_HEADERS([getopt.h error.h])
# Checks for types
AC_TYPE_SIZE_T
# Checks for structures
# Checks for compiler characteristics
# Checks for library functions
AC_FUNC_MALLOC
AC_CHECK_FUNCS([strndup error])
# Checks for system services
# config files
AC_CONFIG_FILES([Makefile hfstospell.pc])
# output
AC_OUTPUT
cat <<EOF
-- Building $PACKAGE_STRING
* zhfst support: $enable_zhfst
* extracting to: $with_extract
* xml support: $enable_xml
* conference demos: $enable_extra_demos
EOF
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Apertis Website Terms of Use Privacy Policy