Commit c4aebb7b authored by Vivien Kraus's avatar Vivien Kraus
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !182
parents b3554f5d 595aafe6
Pipeline #202035 passed with stages
in 62 minutes and 15 seconds
......@@ -3,8 +3,7 @@
# 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.
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
......
......@@ -4,8 +4,7 @@
# 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.
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -19,6 +18,7 @@ apt-get update
apt-get upgrade -y
apt-get install -y \
build-essential \
guile-2.2-dev \
libglib2.0-dev \
libxml2 \
libxml2-dev \
......@@ -34,8 +34,9 @@ mkdir build || exit 1
cd build/
../tarot-$VERSION/configure \
--enable-silent-rules=yes \
--enable-valgrind=yes \
--disable-valgrind \
--disable-program \
CFLAGS="-O3 -fsanitize=undefined -fsanitize=address" \
|| (cat config.log; exit 1)
make -j 16 check || exit 1
make distclean || exit 1
......@@ -4,8 +4,7 @@
# 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.
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
......
......@@ -4,8 +4,7 @@
# 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.
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -22,7 +21,7 @@
apt-get update
apt-get upgrade -y
apt-get install -y \
appstream \
appstream-util \
autoconf \
autoconf-archive \
automake \
......@@ -38,6 +37,7 @@ apt-get install -y \
git \
gobject-introspection \
gperf \
guile-2.2-dev \
help2man \
imagemagick \
indent \
......@@ -77,7 +77,7 @@ sh autogen.sh VALAFLAGS="--target-glib=2.50" || exit 1
|| (cat config.log ; exit 1) \
|| exit 1
make .version || exit 1
make -j safe || exit 1
make -j || exit 1
make -j git-check || exit 1
make -j distcheck || exit 1
cd $SOURCE_TOP || exit 1
......
......@@ -4,8 +4,7 @@
# 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.
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
......
......@@ -4,8 +4,7 @@
# 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.
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -21,6 +20,7 @@ apt-get install -y \
build-essential \
curl \
git \
guile-2.2-dev \
libcairo2-dev \
libgirepository1.0-dev \
libglib2.0-dev \
......
......@@ -4,8 +4,7 @@
# 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.
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
......
......@@ -4,8 +4,7 @@
# 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.
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
......
# tarot implements the rules of the tarot game
# Copyright (C) 2017, 2018, 2019 Vivien Kraus
# Copyright (C) 2017, 2018, 2019, 2020 Vivien Kraus
# 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.
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -24,14 +23,17 @@ AC_CONFIG_HEADERS([config.h])
AC_ARG_ENABLE([runtime-prefix], AS_HELP_STRING([--enable-runtime-prefix=ENV],
[At runtime, prepend the value of the environment variable ENV to the installation prefix. This is useful to make the package relocatable. If ENV is empty or 'no', this is disabled.]))
AC_DEFINE_UNQUOTED([RUNTIME_PREFIX_ENV], "$enable_runtime_prefix", [Environment variable to look up the installation prefix])
AC_SUBST([RUNTIME_PREFIX_ENV], "$enable_runtime_prefix")
AC_ARG_VAR([USER_DATA_DIR_VARIABLE], [Which environment variable points to the user-local read-write directory. With freedesktop.org, it is XDG_DATA_HOME (default). With Windows it should be set to LOCALAPPDATA.])
AS_IF([test "x$USER_DATA_DIR_VARIABLE" == "x"], [
USER_DATA_DIR_VARIABLE="XDG_DATA_HOME"
])
AC_DEFINE_UNQUOTED([USER_DATA_DIR], "$USER_DATA_DIR_VARIABLE", [The environment variable pointing to user-local read-write storage (XDG_DATA_HOME).])
AC_SUBST([USER_DATA_DIR], "$USER_DATA_DIR_VARIABLE")
AC_ARG_ENABLE([textdomain-codeset], AS_HELP_STRING([--enable-textdomain-codeset=CODESET],
[Do not use the current locale for translation message; use the CODESET encoding. On Windows, set it to utf-8.]))
AC_DEFINE_UNQUOTED([TEXTDOMAIN_CODESET], "$enable_textdomain_codeset", [Force gettext encoding, if not set to no.])
AC_SUBST([TEXTDOMAIN_CODESET], "$enable_textdomain_codeset")
AC_CONFIG_MACRO_DIRS([m4])
AC_SUBST([VERSION_MAJOR], m4_esyscmd([./get-version.sh package | cut -d '.' -f 1]))
AC_SUBST([VERSION_MINOR], m4_esyscmd([./get-version.sh package | cut -d '.' -f 2]))
......@@ -48,6 +50,7 @@ gl_EARLY
AM_INIT_AUTOMAKE
AM_PROG_AR
LT_INIT
AC_OPENMP
AM_MISSING_PROG([INDENT], [indent])
AM_MISSING_PROG([EMACS], [emacs])
AC_ARG_ENABLE([valgrind], AS_HELP_STRING([--enable-valgrind=yes],
......@@ -63,7 +66,13 @@ AS_IF([test "x$enable_valgrind" = "xyes"], [
])
AM_CONDITIONAL([HAVE_VALGRIND], [test "x$HAVE_VALGRIND" = "xyes"])
AM_MISSING_PROG([XSLTPROC], [xsltproc])
AM_MISSING_PROG([XMLLINT], [xmllint])
HAVE_XMLLINT=1
AC_PATH_PROG([XMLLINT], [xmllint], [no])
AS_IF([test "x$XMLLINT" = "xno"], [
HAVE_XMLLINT=0
AM_MISSING_PROG([XMLLINT], [xmllint])
])
AM_CONDITIONAL([HAVE_XMLLINT], [test "x$HAVE_XMLLINT" = "x1"])
AM_MISSING_PROG([CONVERT], [convert])
AM_PROG_VALAC
AC_ARG_VAR([VALAFLAGS], [Additional flags to pass to the vala compiler])
......@@ -78,7 +87,7 @@ AM_MISSING_PROG([G_IR_COMPILER], [g-ir-compiler])
PKG_INSTALLDIR
AM_MISSING_PROG([HELP2MAN], [help2man])
AM_MISSING_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
AM_MISSING_PROG([APPSTREAM_CLI], [appstreamcli])
AM_MISSING_PROG([APPSTREAM_UTIL], [appstream-util])
AM_MISSING_PROG([MAKENSIS], [makensis])
AC_ARG_VAR([HOST_SYSROOT], [Where to steal the windows DLLs for gtk+ and friends. On Fedora it is /usr/x86_64-w64-mingw32/sys-root/mingw])
AC_CHECK_TOOL([WINDRES], [windres], [no])
......@@ -129,6 +138,7 @@ AM_CONDITIONAL([WITH_GOBJECT], [test "x$WITH_GOBJECT" != "xno"])
AC_SEARCH_LIBS([atan2], [m])
AC_SEARCH_LIBS([sin], [m])
AC_SEARCH_LIBS([cos], [m])
AC_SEARCH_LIBS([sqrt], [m])
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19.8])
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$PACKAGE", [This needs to be defined in config.h manually...])
......@@ -138,6 +148,19 @@ AC_ARG_WITH([static_program_name],
AS_IF([test "x$with_static_program_name" != "xno"], [
CPPFLAGS="$CPPFLAGS -Dprogram_name=tarot_libtarot_program_name"
])
HAVE_GUILE="0"
for guile_version in 2.2 2.0
do
AS_IF([test "x$HAVE_GUILE" == x0], [
PKG_CHECK_MODULES([GUILE], [guile-$guile_version], [HAVE_GUILE="1"], [true])
])
done
AS_IF([test "x$HAVE_GUILE" != "x0"], [
GUILE_PKG([2.2 2.0])
GUILE_PROGS
])
AC_DEFINE_UNQUOTED(HAVE_GUILE, $HAVE_GUILE, [Whether the tarot_guile_init () function works with guile])
AM_CONDITIONAL([HAVE_GUILE], [test "x$HAVE_GUILE" != "x0"])
# Checks for header files.
AC_HEADER_STDBOOL
......@@ -158,6 +181,11 @@ AC_SEARCH_LIBS([add_history], [history])
AC_CONFIG_FILES([ po/Makefile.in
Makefile
lib/Makefile
guile-config-task/Makefile
releases-task/Makefile
early-built-sources-task/Makefile
libtarot-task/Makefile
programs-task/Makefile
src/libtarot/pkgconfig/libtarot.pc
src/libtarot/pkgconfig/libtarot-gobject.pc
])
......
Markdown is supported
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