Skip to content

Commit

Permalink
Autotools (#43)
Browse files Browse the repository at this point in the history
VPATH-compatible autotools
  • Loading branch information
ftyers authored Jul 6, 2020
1 parent 9773c17 commit a3964ec
Show file tree
Hide file tree
Showing 15 changed files with 232 additions and 145 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ jobs:
sudo apt-get -qy update
sudo apt-get -qfy install wget ca-certificates
wget -q https://apertium.projectjj.com/apt/install-nightly.sh -O - | sudo bash
sudo apt-get -qfy install --no-install-recommends build-essential cmake lttoolbox-dev pkg-config libxml2-dev
- name: cmake
run: cmake .
sudo apt-get -qfy install --no-install-recommends build-essential autoconf autotools-dev lttoolbox-dev pkg-config libxml2-dev
- name: autoreconf
run: autoreconf -fvi
- name: configure
run: ./configure
- name: build
run: cmake --build . -v -j 4
run: make -j4 V=1 VERBOSE=1
- name: tests
run: ctest -V
run: make test
- name: make install
run: sudo cmake --install .
run: sudo make install
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,17 @@ apertium-anaphora
CTestTestfile.cmake
Testing/
apertium-validate-anaphora
INSTALL
Makefile.in
aclocal.m4
autom4te.cache
build
configure
depcomp
install-sh
missing
src/Makefile.in
config.log
config.status
.deps
*.o
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ compiler:

before_install:
- wget https://apertium.projectjj.com/apt/install-nightly.sh -O - | sudo bash
- sudo apt-get install -qfy build-essential cmake lttoolbox-dev pkg-config libxml2-dev
- sudo apt-get install -qfy build-essential autoconf autotools-dev lttoolbox-dev pkg-config libxml2-dev

script:
- $CXX --version
- export V=1 VERBOSE=1
- cmake .
- cmake --build . -j 4
- ctest -V
- cmake --install .
- autoreconf -fvi
- ./configure
- make -j4
- make test
- sudo make install
83 changes: 0 additions & 83 deletions CMakeLists.txt

This file was deleted.

Empty file added ChangeLog
Empty file.
9 changes: 9 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pkgconfigdir = $(libdir)/pkgconfig
dist_pkgconfig_DATA = apertium-anaphora.pc

SUBDIRS = src

EXTRA_DIST=autogen.sh

test:
pushd $(abs_srcdir)/tests/ && bash test.sh $(abs_builddir)/src/apertium-anaphora && popd
Empty file added NEWS
Empty file.
10 changes: 7 additions & 3 deletions README
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Apertium Anaphora Resolution
## Google Summer of Code 2019

[![Build Status](https://travis-ci.com/apertium/apertium-anaphora.svg?branch=master)](https://travis-ci.com/apertium/apertium-anaphora)

### Documentation
http://wiki.apertium.org/wiki/Anaphora_Resolution_Module

### How to Run
- `./cmake.sh`
- `make -j4`
- `./autogen.sh [--prefix=/path/to/your/prefix]`
- `make`
- `sudo make install`
- Usage: `apertium-anaphora [-z] apertium-xxx-yyy.xxx-yyy.arx [input [output]]`

Expand All @@ -26,3 +26,7 @@ http://wiki.apertium.org/wiki/Anaphora_Resolution_Module
This package is licensed under the [GNU General Public License](https://www.gnu.org/licenses/licenses.html#GPL) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

If it becomes necessary, we are open to dual-licensing the package under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0).

### Acknowledgements

Google Summer of Code 2019
35 changes: 35 additions & 0 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#! /bin/sh

# If the user specified a --prefix, take that, otherwise /usr/local/
# is the default.
PREFIX=/usr/local
prefixnext=false
for i in "$@"; do
case $i in
--prefix=*) # equals separated:
PREFIX="${i#*=}"
;;
--prefix) # space separated:
prefixnext=true
;;
*)
$prefixnext && PREFIX="$i" && prefixnext=false
;;
esac
done

# Set the paths needed by libtool/pkg-config/aclocal etc. By inferring
# them based on --prefix , users don't have to edit ~/.bashrc. We only
# append, so if a user has some other preference, that will override.
PATH="${PATH}:/usr/local/bin"
export PATH
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PREFIX}/lib"
export LD_LIBRARY_PATH
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${PREFIX}/share/pkgconfig:${PREFIX}/lib/pkgconfig"
export PKG_CONFIG_PATH
ACLOCAL_PATH="${ACLOCAL_PATH}:${PREFIX}/share/aclocal"
export ACLOCAL_PATH


# Pass on all args to configure
autoreconf -fi && ./configure "$@"
29 changes: 0 additions & 29 deletions cmake.sh

This file was deleted.

54 changes: 54 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
AC_PREREQ(2.61)

AC_INIT([apertium-anaphora], [1.0.0], [[email protected]])
AM_INIT_AUTOMAKE
AC_CONFIG_MACRO_DIR([m4])

AC_PROG_CXX
AM_SANITY_CHECK
AC_LANG_CPLUSPLUS

CFLAGS="-Wall -Wextra $CFLAGS"
CXXFLAGS="-Wall -Wextra $CXXFLAGS"

PKG_CHECK_MODULES([LTTOOLBOX], [lttoolbox >= 3.5.2])
AC_SUBST(LTTOOLBOX_CFLAGS)
AC_SUBST(LTTOOLBOX_LIBS)

PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)

CPPFLAGS="$CPPFLAGS $CFLAGS $LTTOOLBOX_CFLAGS $LIBXML_CFLAGS"
LIBS="$LIBS $LTTOOLBOX_LIBS $LIBXML_LIBS"

# Checks for highest supported C++ standard
AC_LANG(C++)
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_PATH_PROG(BASH, bash, no)
if test x$ac_cv_path_BASH = x
then
AC_MSG_ERROR([You don't have bash installed.])
fi
if test x$ac_cv_path_BASH = xno
then
AC_MSG_ERROR([You don't have bash installed.])
fi

AC_CONFIG_FILES([
apertium-anaphora.pc
Makefile
src/Makefile
])
AC_OUTPUT
74 changes: 74 additions & 0 deletions m4/ax_check_compile_flag.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
#
# DESCRIPTION
#
# Check whether the given FLAG works with the current language's compiler
# or gives an error. (Warnings, however, are ignored)
#
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
# success/failure.
#
# If EXTRA-FLAGS is defined, it is added to the current language's default
# flags (e.g. CFLAGS) when the check is done. The check is thus made with
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
# force the compiler to issue an error when a bad flag is given.
#
# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
#
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
#
# LICENSE
#
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
#
# 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 the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# 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/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
# scripts that are the output of Autoconf when processing the Macro. You
# need not follow the terms of the GNU General Public License when using
# or distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
#
# This special exception to the GPL applies to versions of the Autoconf
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.

#serial 3

AC_DEFUN([AX_CHECK_COMPILE_FLAG],
[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
[AS_VAR_SET(CACHEVAR,[yes])],
[AS_VAR_SET(CACHEVAR,[no])])
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
[m4_default([$2], :)],
[m4_default([$3], :)])
AS_VAR_POPDEF([CACHEVAR])dnl
])dnl AX_CHECK_COMPILE_FLAGS
17 changes: 0 additions & 17 deletions src/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit a3964ec

Please sign in to comment.