Commit 0ad18859 authored by Maarten van Gompel's avatar Maarten van Gompel

New upstream version 0.20

parent 796c5c94
This diff is collapsed.
......@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS =-I m4 --install
SUBDIRS = src include docs m4 tests
EXTRA_DIST = bootstrap.sh AUTHORS TODO NEWS ticcutils.pc.in
EXTRA_DIST = bootstrap.sh AUTHORS TODO NEWS README.md ticcutils.pc.in codemeta.json
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ticcutils.pc
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -90,7 +90,8 @@ build_triplet = @build@
host_triplet = @host@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_osx_pkg.m4 \
$(top_srcdir)/m4/ax_boost_base.m4 \
$(top_srcdir)/m4/ax_boost_regex.m4 \
$(top_srcdir)/m4/ax_check_zlib.m4 \
$(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
......@@ -380,7 +381,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4 --install
SUBDIRS = src include docs m4 tests
EXTRA_DIST = bootstrap.sh AUTHORS TODO NEWS ticcutils.pc.in
EXTRA_DIST = bootstrap.sh AUTHORS TODO NEWS README.md ticcutils.pc.in codemeta.json
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ticcutils.pc
all: config.h
......@@ -639,7 +640,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -665,7 +666,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
......@@ -683,7 +684,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -693,7 +694,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
16 may 2018 0.20
[Ko van der Sloot]
* PrettyPrint: added printing of pairs
* several small bug fixes
* added more tests to 'make check'
* fixed icu::namespace issues
16 may 2018 0.19
[Ko van der Sloot]
* Bumped library version to 5.0
* Socketbasics:
- invalidate sockets, when something looks not OK
* Unicode:
- added Unicode (UTF8) aware versions of uppercase() and lowercase()
added a UnicodeString splitter, analogue to the 'old' TiCC::split()
functions
- added icu:: namespace (required for ICU61 and up)
- fixed a problem with Transcriptor rules not handled correctly.
* Small edits to fix some compiler warnings.
* fixed potential memory leaks in Trie.h and Tar.cxx
* CommandLine:
- implemented gnu-like extensions in commandline parsing.
(intermixing mass options with normal options)
* added tests for the new features/functions.
[Maarten van Gompel]
* added codemeta.json file
19 feb 2018 0.18
* added more unicode helper classes and functions:
- Unicode Filter class
- diacriticsfilter()
- Unicode Normalizer.
* small fix in Configuration Class
* Bumped library version to 4.0
* more tests added to 'make check'.
* overhauled autoconfigure stuff.
- MacOSX is now better supported.
- libzlib, libbz2 and libtar are no longer optional
07 nov 2017 0.16.1
[Ko vd Sloot]
New release due to mixup in the previous release
......
[![Build Status](https://travis-ci.org/LanguageMachines/ticcutils.svg?branch=master)](https://travis-ci.org/LanguageMachines/ticcutils) [![Language Machines Badge](http://applejack.science.ru.nl/lamabadge.php/ticcutils)](http://applejack.science.ru.nl/languagemachines/)
TiCC utils
==============
TiCC utils 0.18 (c) ILK/CLST 1998 - 2018
by Ko van der Sloot
Tilburg centre for Cognition and Communication, Tilburg University.
Centre for Language and Speach Technology, Radboud University
This module contains useful functions for general use in the TiCC software
stack and beyond.
TiCC utils is distributed under the GNU Public Licence (see the file ``COPYING``).
This software has been tested on:
- Intel/AMD platforms running several versions of Linux, including Ubuntu,
Debian and Fedora.
- 64 bits
- MAC platform running OS X 10.13
Compilers:
- GCC (4.9 - 7.0). It is highly recommended to upgrade to at least GCC 5.0
- CLANG. Preferrable a recent version which supporte OpenMP
Contents of this distribution:
- Sources
- Licensing information ( ``COPYING`` )
- Installation instructions ( ``INSTALL`` )
- Build system based on Gnu Autotools
- Documentation ( in the ``docs/`` directory )
Dependencies:
To be able to succesfully build libticcl from the tarball, you need the
following pakages:
- ``autotools``
- ``autoconf-archive``
- ``pkg-config``
- ``libxml2-dev``
- ``icu-dev``
- ``libboost-dev`` and ``libboost-regex-dev``
- ``libtar-dev``
- ``libbz2-dev``
- ``zlib1g-dev``
Installation Instructions
--------------------------------
To install ticcutils, first consult whether your distribution's package manager
has an up-to-date package. If not, for easy installation of ticcutils, it is
included as part of our software distribution LaMachine:
https://proycon.github.io/LaMachine .
To compile from source instead:
1. ``sh bootstrap.sh``
2. ``configure``
3. ``make``
4. ``make install``
5. *optional:* ``make check``
# generated automatically by aclocal 1.15 -*- Autoconf -*-
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.15], [],
m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.15])dnl
[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -332,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -408,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -605,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -626,7 +626,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -647,7 +647,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -697,7 +697,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -736,7 +736,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -765,7 +765,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -812,7 +812,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -831,7 +831,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -912,7 +912,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -972,7 +972,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1000,7 +1000,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1019,7 +1019,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1150,6 +1150,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/ac_osx_pkg.m4])
m4_include([m4/ax_boost_base.m4])
m4_include([m4/ax_boost_regex.m4])
m4_include([m4/ax_check_zlib.m4])
......
# $Id$
# $URL$
# bootstrap - script to bootstrap the distribution rolling engine
# usage:
......@@ -21,23 +18,6 @@
automake=automake
aclocal=aclocal
# if you want to autogenerate a ChangeLog form svn:
#
# svn2cl, a python script, as used in the GNU Enterprise project.
# By jcater (Jason Cater), contributions by reinhard (Reinhard Müller).
# Get it from
# http://www.gnuenterprise.org/cgi-bin/viewcvs.cgi/*checkout*/gnue/trunk/gnue-common/utils/svn2cl .
# svn2cl is used in Makefile.am too.
#
# (Another svn2cl implementation, in perl, is at
# http://www.contactor.se/~dast/svn/archive-2002-04/0910.shtml)
#
# see also toplevel Makefile.am
# test -f ChangeLog || {
# svn log --verbose > ChangeLog
#}
if $automake --version|head -1 |grep ' 1\.[4-9]'; then
echo "automake 1.4-1.9 is active. You should use automake 1.10 or later"
if test -f /etc/debian_version; then
......
{
"@context": [
"https://doi.org/10.5063/schema/codemeta-2.0",
"http://schema.org"
],
"@type": "SoftwareSourceCode",
"identifier": "ticcutils",
"name": "ticcutils",
"version": "0.19",
"description": "This module contains useful functions for general use in the TiCC software stack and beyond.",
"license": "https://spdx.org/licenses/GPL-3.0",
"url": "https://github.com/LanguageMachines/ticcutils",
"author": [
{
"@type": "Person",
"givenName": "Ko",
"familyName": "van der Sloot",
"email": "ko.vandersloot@let.ru.nl",
"affiliation": {
"@id": "https://www.ru.nl/clst",
"@type": "Organization",
"name": "Centre for Language and Speech Technology",
"url": "https://www.ru.nl/clst",
"parentOrganization": {
"@id": "https://www.ru.nl/cls",
"@type": "Organization",
"name": "Centre for Language Studies",
"url": "https://www.ru.nl/cls",
"parentOrganization": {
"@id": "https://www.ru.nl",
"name": "Radboud University",
"@type": "Organization",
"url": "https://www.ru.nl",
"location": {
"@type": "Place",
"name": "Nijmegen"
}
}
}
}
}
],
"sourceOrganization": { "@id": "https://www.ru.nl/clst" },
"programmingLanguage": {
"@type": "ComputerLanguage",
"identifier": "c++",
"name": "C++"
},
"operatingSystem": "POSIX",
"codeRepository": "https://github.com/LanguageMachines/ticcutils",
"softwareRequirements": [
{
"@type": "SoftwareApplication",
"identifier": "icu",
"name": "icu"
},
{
"@type": "SoftwareApplication",
"identifier": "libxml2",
"name": "libxml2"
}
],
"readme": "https://github.com/LanguageMachines/ticcutils/blob/master/README.md",
"issueTracker": "https://github.com/LanguageMachines/ticcutils/issues",
"contIntegration": "https://travis-ci.org/LanguageMachines/ticcutils",
"releaseNotes": "https://github.com/LanguageMachines/ticcutils/releases",
"developmentStatus": "active",
"keywords": [ "nlp", "natural language processing" ],
"dateCreated": "2011-03-27"
}
This diff is collapsed.
......@@ -6,7 +6,7 @@
/* define if the Boost library is available */
#undef HAVE_BOOST
/* define if the Boost::Regex library is available */
/* Define to 1 if you have boost regular expresions */
#undef HAVE_BOOST_REGEX
/* Define to 1 if you have the <bzlib.h> header file. */
......@@ -123,9 +123,6 @@
/* Define to 1 if `fork' works. */
#undef HAVE_WORKING_FORK
/* Define to 2 if you have boost regular expresions */
#undef HAVE_WORKING_REGEX
/* Define to 1 if `vfork' works. */
#undef HAVE_WORKING_VFORK
......
This diff is collapsed.
This diff is collapsed.
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT([ticcutils],[0.17],[lamasoftware@science.ru.nl])
AC_INIT([ticcutils],[0.20],[lamasoftware@science.ru.nl])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([.])
AC_CONFIG_MACRO_DIR([m4])
......@@ -19,7 +19,7 @@ if $cxx_flags_were_set; then
fi
# Checks for programs.
AC_PROG_CXX([g++] )
AC_PROG_CXX([g++ clang++] )
AC_PROG_LIBTOOL
LT_INIT
......@@ -38,18 +38,18 @@ fi
#checks for libraries.
AX_CHECK_ZLIB( [],
[AC_MSG_NOTICE([libzlib1g-dev not found. gz support disabled.])] )
[AC_MSG_ERROR([zlib not found. Please install libzlib1g-dev.])] )
# Checks for header files.
AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h unistd.h sys/time.h])
AC_CHECK_HEADERS([bzlib.h],
[LIBS="$LIBS -lbz2"],
[AC_MSG_NOTICE([libbz2-dev not found. bz2 support disabled])] )
[AC_MSG_ERROR([bz2lib not found. Please install libbz2-dev])] )
AC_CHECK_HEADERS([libtar.h],
[LIBS="$LIBS -ltar"],
[AC_MSG_NOTICE([libtar-dev not found. tar support disabled.])] )
[AC_MSG_ERROR([libtar not found. Please install libtar.])] )
# Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
......@@ -72,37 +72,31 @@ if test x"$ax_pthread_ok" = xyes; then
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
fi
# only require boost for OLD gcc compilers AND als stdlib++
# for now we HAV to stick to boost regex :{
# AX_COMPILER_VENDOR
# if test x"$ax_cv_cxx_compiler_vendor" = xgnu; then
# AX_COMPILER_VERSION
# AX_COMPARE_VERSION( [$ax_cv_cxx_compiler_version], [lt], [4.9],
# [AX_BOOST_BASE( [1.50],
# [AX_BOOST_REGEX
# LIBS="$LIBS $BOOST_REGEX_LIB"
# AC_DEFINE(HAVE_WORKING_REGEX, 2 , Define to 2 if you have boost regular expresions )],
# [AC_MSG_ERROR([No Regular expression support available. Please install libboost-regex-dev, or update gcc])])],
# AC_DEFINE(HAVE_WORKING_REGEX, 1 , Define to 1 if you have working native C++ regular expresions ) )
# else
# AC_DEFINE(HAVE_WORKING_REGEX, 1 , Define to 1 if you have native C++ regular expresions)
# fi
# for now we demand boost, because on some systems gcc4.8 is installed still
# and that fails on regex.
AX_BOOST_BASE( [1.50],
[AX_BOOST_REGEX
LIBS="$LIBS $BOOST_REGEX_LIB"
AC_DEFINE(HAVE_WORKING_REGEX, 2 , Define to 2 if you have boost regular expresions )],
AC_DEFINE(HAVE_BOOST_REGEX, 1 , [Define to 1 if you have boost regular expresions] )],
[AC_MSG_ERROR([No Regular expression support available. Please install libboost-regex-dev])])
PKG_PROG_PKG_CONFIG
if test "x$PKG_CONFIG_PATH" = x; then
export PKG_CONFIG_PATH="$prefix/lib/pkgconfig"
if test "x$prefix" = "xNONE"; then
prefix="/usr/local"
fi
if test "x$PKG_CONFIG_PATH" = x
then
export PKG_CONFIG_PATH="$prefix/lib/pkgconfig"
else
export PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
fi
AC_OSX_PKG( [icu4c] )
AC_MSG_NOTICE([pkg-config: PATH=$PKG_CONFIG_PATH])
PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.6.16] )
CXXFLAGS="$CXXFLAGS $XML2_CFLAGS"
LIBS="$LIBS $XML2_LIBS"
......
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2013-05-30.07; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -786,6 +786,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -92,7 +92,8 @@ build_triplet = @build@
host_triplet = @host@
subdir = docs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_osx_pkg.m4 \
$(top_srcdir)/m4/ax_boost_base.m4 \
$(top_srcdir)/m4/ax_boost_regex.m4 \
$(top_srcdir)/m4/ax_check_zlib.m4 \
$(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
......
......@@ -3,18 +3,18 @@
.SH NAME
ticc_prettyprint - format C++ containers
.SH SYNOPSYS
.SH SYNOPSIS
.B #include "ticcutils/PrettyPrint.h"
.B using namespace TiCC;
.SH DESCRIPTION
TiCC Pretty Print provides some C++ templates to output C++ containers in an
TiCC Pretty Print provides some C++ templates to output C++ containers in an
orderly fashion. It's not rocket science, nor complete. But for instance for
.B debugging
it is convenient to be able to output containers a bit readable.
To get usefull output, a well defined output operator is required for the
To get usefull output, a well defined output operator is required for the
elements in the container too.
TiCC output operators are currenly defined for:
......@@ -32,9 +32,9 @@ TiCC output operators are currenly defined for:
.B multimap<S,T>
To get usefull output, it is needed that an output operator is defined for
the elements
the elements
.B S
and
and
.B T
in the container too.
......@@ -146,11 +146,11 @@ Or something similar.
.RE
Why is this so? Well, we
.B didn't
provide an output operator for
provide an output operator for
.B myClass
pointers!
To fix this we have to change de definition of the output operator for
To fix this we have to change de definition of the output operator for
.B myClass
or just add a second definition, e.g. add:
......@@ -177,5 +177,3 @@ The output now indeed is what we expected:
.RE
.SH AUTHORS
Ko van der Sloot Timbl@uvt.nl
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -89,7 +89,8 @@ build_triplet = @build@
host_triplet = @host@
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_osx_pkg.m4 \
$(top_srcdir)/m4/ax_boost_base.m4 \
$(top_srcdir)/m4/ax_boost_regex.m4 \
$(top_srcdir)/m4/ax_check_zlib.m4 \
$(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
......
/*
Copyright (c) 2006 - 2017
Copyright (c) 2006 - 2018
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2017
Copyright (c) 2006 - 2018
CLST - Radboud University
ILK - Tilburg University
......@@ -38,7 +38,7 @@ namespace TiCC {
typedef std::map<std::string, ssMap> sssMap;
public:
Configuration();
void merge( const Configuration& );
void merge( const Configuration&, bool = false );
bool fill( const std::string& );
bool fill( const std::string&, const std::string& );
bool hasSection( const std::string& ) const;
......@@ -60,7 +60,6 @@ namespace TiCC {
std::string configDir() const { return lookUp( "configDir" ); };
private:
sssMap myMap;
std::string cdir; // not used. left here for binary compatibility
bool get_att_val( const std::string&, const std::string& );
};
......
/*
Copyright (c) 2006 - 2017
Copyright (c) 2006 - 2018
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2017
Copyright (c) 2006 - 2018
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2017
Copyright (c) 2006 - 2018
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2017
Copyright (c) 2006 - 2018
CLST - Radboud University
ILK - Tilburg University
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -90,7 +90,8 @@ build_triplet = @build@
host_triplet = @host@
subdir = include/ticcutils
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
<