Merge branch 'master' of github.com:LanguageMachines/mbt

Author: proycon

.gitignore

@@ -0,0 +1,46 @@
+ChangeLog
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+docs/Makefile
+docs/Makefile.in
+example/Makefile
+example/Makefile.in
+include/Makefile
+include/Makefile.in
+include/mbt/Makefile
+include/mbt/Makefile.in
+install-sh
+libtool
+ltmain.sh
+m4/
+mbt.pc
+missing
+src/.deps/
+src/.libs/
+src/*.lo
+src/*.o
+src/Makefile
+src/Makefile.in
+src/convert
+src/libmbt.la
+src/mbt
+src/mbtg
+src/simple.setting
+src/simpletest
+src/simpletest.log
+src/simpletest.trs
+src/test-suite.log
+stamp-h1
+test-driver

.travis.yml

@@ -1,28 +1,92 @@
+# whitelist
+branches:
+  only:
+    - master
+
+sudo: required
+dist: trusty
+group: edge
+
+notifications:
+  irc:
+    channels:
+      - "irc.uvt.nl#gitlama"
+    template:
+      - "%{repository_slug}#%{build_number} %{message} --> %{build_url}"
+    skip_join: true
+
 language: cpp
-compiler:
-    - gcc
-    - clang
+matrix:
+  include:
+    - os: linux
+      compiler: g++
+      cache: ccache
+      env:
+        - SCAN=echo
+
+    - os: linux
+      compiler: clang++
+      cache: ccache
+      env:
+        - SCAN=scan-build
+        - OPENMPFLAG=--disable-openmp
+
+    - os: osx
+      compiler: clang++
+      cache: ccache
+      env:
+        - SCAN=echo
+
 before_install:
-    - sudo apt-get update
-    - sudo apt-get install pkg-config autoconf-archive libicu-dev libxml2-dev libbz2-dev zlib1g-dev
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+        sudo apt-get update;
+        sudo apt-get install pkg-config autoconf-archive ccache cppcheck libicu-dev libxml2-dev libbz2-dev zlib1g-dev libboost-dev libboost-regex-dev libtar-dev;
+      fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+        brew update;
+        brew install pkg-config;
+        brew install autoconf-archive;
+        brew outdated || brew upgrade icu4c;
+        brew outdated || brew upgrade libxml2;
+        brew outdated || brew install bzip2;
+        brew outdated || brew install zlib;
+        brew install libtar;
+        brew install cppcheck;
+        brew install ccache;
+        brew outdated boost || brew upgrade boost;
+        brew install llvm;
+        export PATH="/usr/local/opt/llvm/bin:$PATH";
+        export LDFLAGS="-L/usr/local/opt/llvm/lib";
+        export CXXFLAGS="-I/usr/local/opt/llvm/include";
+      fi
+
+    - export PATH="/usr/lib/ccache/bin/:$PATH"
+
     - git clone https://github.com/proycon/ticcutils
     - cd ticcutils
     - bash bootstrap.sh
-    - ./configure
+    - ./configure $OPENMPFLAG
     - make
     - sudo make install
     - cd ..
     - git clone https://github.com/proycon/timbl
     - cd timbl
     - bash bootstrap.sh
-    - ./configure
+    - ./configure $OPENMPFLAG
     - make
     - sudo make install
     - cd ..
+
 install:
     - bash bootstrap.sh
-    - ./configure
+    - ./configure $OPENMPFLAG
+    - cppcheck --enable=all --quiet --error-exitcode=0 .
+    - $SCAN --status-bugs make
     - make
     - sudo make install
+
 script:
     - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib make check
+
+after_failure:
+  - cat src/test-suite.log

Makefile.am

@@ -5,10 +5,10 @@ ACLOCAL_AMFLAGS = -I m4 --install
 
 SUBDIRS = src include docs example
 
-EXTRA_DIST = bootstrap.sh AUTHORS TODO NEWS mbt.pc codemeta.json
+EXTRA_DIST = bootstrap.sh AUTHORS TODO NEWS README.md mbt.pc codemeta.json
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = mbt.pc
 
 ChangeLog: NEWS
-	svn update; svn2cl --include-rev
+	git pull; git2cl > ChangeLog

NEWS

@@ -1,3 +1,34 @@
+mbt version 3.3.1 2016-07-11
+[Ko van der Sloot]
+Bug fix release:
+A 3.2.17 tarball was released with the tag v3.3 which is confusing.
+So we release it again as 3.3.1 with the correct tarball.
+
+mbt version 3.2.17 2016-07-11
+[Ko van der Sloot]
+Maintenance release
+- fixed a bug due tot uninitialized memeory
+- code refactoring
+- added OPENMP safeguards
+- fixed statistics for Enriched format
+- fixed issue #3 (sending manifest to cerr not cout)
+
+mbt version 3.2.16 2016-07-11
+[Ko van der Sloot]
+Maintenance release
+- some code refactoring
+- fixed a problem with the -eNL option
+
+mbt version 3.2.15 2016-01-14
+[Ko van der Sloot]
+  * repository moved to GitHub
+  * added Travis support
+  * fixed storing path in settingsfile (don't!)
+  * when desired, generate a frequencylist of the tags
+  * use more ticcutils stuff (ComandLine)
+  * better sentence reading and warnings
+  * code cleanup an small fixes
+
 mbt version 3.2.12 2014-09-23
 [Ko van der Sloot]
   * release

README

@@ -1,42 +1 @@
-Mbt 3.2. (c) ILK/CNTS 1998-2010
-
-Tilburg Memory Based Learner
-
-Induction of Linguistic Knowledge Research Group, Tilburg University and
-Centre for Dutch Language and Speech, University of Antwerp
-
-This is an extension to the thirth main release of Mbt
-
-While this is NOT a Beta version it may still contain some bugs or
-behave not exactly as documented or expected. Comments and
-bug-reports are welcome at: [email protected]. Updates and more info
-may be found on our website: http://ilk.uvt.nl/ .
-
-Mbt is distributed under the GNU Public Licence (see the file COPYING)
-
-
-This software has been tested on:
-- Intel platform running several versions of Linux, including Ubuntu and Debian
-  buth 32 and 64 bits
-- Apple platform running MaxOSX
-
-Compilers:
-- GCC (4.7 - 4.9.0). It is highly recommended to upgrade to at least GCC 4.8
-
-Contents of this distribution:
-- sources
-- Licensing information ( COPYING )
-- Installation instructions ( INSTALL )
-- Build system based om Gnu Autotools
-- example data files ( in the demos directory )
-- documentation ( in the docs directory )
-
-Dependecies:
-To be able to succesfully build Timbl from the tarball, you need the
-following pakages:
-- pkg-config
-- timbl
-- timblserver
-- libxml2-dev
-
-
+Please see README.md for for information.

README.md

@@ -0,0 +1,53 @@
+[![Build Status](https://travis-ci.org/LanguageMachines/mbt.svg?branch=master)](https://travis-ci.org/LanguageMachines/mbt) [![Language Machines Badge](http://applejack.science.ru.nl/lamabadge.php/mbt)](http://applejack.science.ru.nl/languagemachines/)
+
+Mbt: Tilburg Memory Based Tagger
+===================================
+
+    Mbt 3.2 (c) CLST/ILK/CNTS 1998-2016
+    Centre for Language and Speech Technology, Radboud University Nijmegen
+    Induction of Linguistic Knowledge Research Group, Tilburg University and
+    Centre for Dutch Language and Speech, University of Antwerp
+
+**Website:** https://languagemachines.github.io/mbt
+
+Comments and bug-reports are welcome on our issue tracker at
+https://github.com/LanguageMachines/mbt/issues, or by mailing
+lamasoftware (at) science.ru.nl .
+
+Mbt is distributed under the GNU Public Licence v3 (see the file COPYING)
+
+This software has been tested on:
+- Intel platform running several versions of Linux, including Ubuntu, Debian,
+  Arch Linux, Fedora (both 32 and 64 bits)
+- Apple platform running Mac OS X 10.10
+
+Compilers:
+- GCC. It is highly recommended to upgrade to at least GCC 4.8
+- Clang
+
+Contents of this distribution:
+- sources
+- Licensing information ( ``COPYING`` )
+- Installation instructions ( ``INSTALL`` )
+- Build system based on GNU Autotools
+- example data files ( in the ``demos/`` directory )
+- documentation ( in the ``docs/`` directory )
+
+Dependencies:
+To be able to succesfully build Timbl from the tarball, you need the
+following pakages:
+- pkg-config
+- [timbl](https://github.com/LanguageMachines/timbl)
+- [ticcutils](https://github.com/LanguageMachines/ticcutils)
+
+
+To install Mbt, first consult whether your distribution's package manager has an up-to-date package.
+If not, for easy installation of Mbt, TiMBL, and all dependencies, it is included as part of our software
+distribution LaMachine: https://proycon.github.io/LaMachine .
+
+To compile and install manually from source instead, provided you have all the dependencies installed:
+
+    $ bash bootstrap.sh
+    $ ./configure
+    $ make
+    $ make install

bootstrap.sh

@@ -1,6 +1,3 @@
-# $Id$
-# $URL$
-
 # bootstrap - script to bootstrap the distribution rolling engine
 
 # usage:
@@ -22,7 +19,7 @@ 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
@@ -61,4 +58,3 @@ AUTOMAKE=automake ACLOCAL=aclocal autoreconf --install \
 # aclocal-1.9 \
 #     && automake-1.9 --add-missing --verbose --gnu \
 #     && autoconf
-

codemeta.json

@@ -84,7 +84,7 @@
 			"name": "timbl"
 		}
 	],
-	"readme": "https://github.com/LanguageMachines/mbt/blob/master/README",
+	"readme": "https://github.com/LanguageMachines/mbt/blob/master/README.md",
 	"issueTracker": "https://github.com/LanguageMachines/mbt/issues",
 	"contIntegration": "https://travis-ci.org/LanguageMachines/mbt",
 	"releaseNotes": "https://github.com/LanguageMachines/mbt/releases",

configure.ac

@@ -1,10 +1,8 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-# $Id$
-# $URL$
 
 AC_PREREQ(2.61)
-AC_INIT([mbt],[3.2.13],[timbl@uvt.nl])
+AC_INIT([mbt],[3.4],[[email protected].nl])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([.])
 AC_CONFIG_MACRO_DIR([m4])
@@ -47,34 +45,22 @@ if test x"$acx_pthread_ok" = xyes; then
 fi
 
 PKG_PROG_PKG_CONFIG
-# Checks for timbl library.
 
-# inspired by feh-1.3.4/configure.ac.  Tnx Tom Gilbert and feh hackers.
+if test "x$prefix" = "xNONE"; then
+   prefix="/usr/local"
+fi
 
-# ugly hack when PKG_CONFIG_PATH isn't defined.
-# couldn't get it to work otherwise
 if test "x$PKG_CONFIG_PATH" = x; then
-     export PKG_CONFIG_PATH=""
+    export PKG_CONFIG_PATH="$prefix/lib/pkgconfig"
+else
+    export PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
 fi
-AC_ARG_WITH(timbl,
-       [  --with-timbl=DIR       use timbl installed in <DIR>;
-               note that you can install timbl in a non-default directory with
-               ./configure --prefix=<DIR> in the timbl installation directory],
-       [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"],
-       [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"])
-#  AC_MSG_NOTICE( [pkg-config search path: $PKG_CONFIG_PATH] )
+
 PKG_CHECK_MODULES([timbl], [timbl >= 6.4.4] )
 CXXFLAGS="$CXXFLAGS $timbl_CFLAGS"
 LIBS="$LIBS $timbl_LIBS"
 
-AC_ARG_WITH(ticcutils,
-       [  --with-ticcutils=DIR       use ticcutils installed in <DIR>;
-               note that you can install ticcutils in a non-default directory with
-               ./configure --prefix=<DIR> in the ticcutils installation directory],
-       [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"],
-       [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"])
-#  AC_MSG_NOTICE( [pkg-config search path: $PKG_CONFIG_PATH] )
-PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.4] )
+PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.16] )
 CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS"
 LIBS="$LIBS $ticcutils_LIBS"
 

docs/mbt.1

@@ -2,7 +2,7 @@
 
 .SH NAME
 MBT \- Memory Based Tagger
-.SH SYNOPSYS
+.SH SYNOPSIS
 mbt [options]
 
 .SH DESCRIPTION