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 @@ ...@@ -3,8 +3,7 @@
;; This program is free software: you can redistribute it and/or modify ;; 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 ;; 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 ;; the Free Software Foundation, version 3 of the License.
;; your option) any later version.
;; ;;
;; This program is distributed in the hope that it will be useful, but ;; This program is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; WITHOUT ANY WARRANTY; without even the implied warranty of
...@@ -15,4 +14,4 @@ ...@@ -15,4 +14,4 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;; along with this program. If not, see <http://www.gnu.org/licenses/>.
((nil ((nil
(compile-command . "make -C @abs_top_srcdir@ VALAFLAGS=\"--no-color\" check distcheck"))) (compile-command . "cd @abs_top_builddir@ ; make .dir-locals.el && make VALAFLAGS=\"--no-color\" -j all && make VALAFLAGS=\"--no-color\" -j check && make -j distcheck && make -j git-check")))
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
.dir-locals.el .dir-locals.el
/**/*.def /**/*.def
/**/*.gir /**/*.gir
/**/*.go
/**/*.la /**/*.la
/**/*.lo /**/*.lo
/**/*.log /**/*.log
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
/INSTALL /INSTALL
/Makefile /Makefile
/Makefile.in /Makefile.in
/NEWS
/README /README
/README.md /README.md
/aclocal.m4 /aclocal.m4
...@@ -38,6 +40,8 @@ ...@@ -38,6 +40,8 @@
/depcomp /depcomp
/doc/basic-initialization /doc/basic-initialization
/doc/basic-initialization.c /doc/basic-initialization.c
/doc/dumb-ai
/doc/dumb-ai.c
/doc/duplicate-a-posteriori.c /doc/duplicate-a-posteriori.c
/doc/events /doc/events
/doc/events.c /doc/events.c
...@@ -52,25 +56,30 @@ ...@@ -52,25 +56,30 @@
/doc/tarot-features.man /doc/tarot-features.man
/doc/tarot-figures /doc/tarot-figures
/doc/tarot-mcts.man /doc/tarot-mcts.man
/doc/tarot-perceptron-bootstrap.man
/doc/tarot-stacking.man /doc/tarot-stacking.man
/doc/tarot-status.man /doc/tarot-status.man
/doc/tarot-tune /doc/tarot-tune
/doc/tarot.info /doc/tarot.info
/doc/tarot.man /doc/tarot.man
/doc/tarot.rng
/doc/tarot.texi /doc/tarot.texi
/doc/tarot.xml /doc/tarot.xml
/doc/xml /doc/xml
/doc/xml.c /doc/xml.c
/early-built-sources-task/Makefile.in
/eu.planete_kraus.Tarot.appdata.xml /eu.planete_kraus.Tarot.appdata.xml
/eu.planete_kraus.Tarot.appdata.xml.in /eu.planete_kraus.Tarot.appdata.xml.in
/eu.planete_kraus.Tarot.desktop /eu.planete_kraus.Tarot.desktop
/eu.planete_kraus.Tarot.json.in /eu.planete_kraus.Tarot.json.in
/git-version-gen /git-version-gen
/gitlog-to-changelog /gitlog-to-changelog
/guile-config-task/Makefile.in
/guix/gnu/packages/tarot.scm.in /guix/gnu/packages/tarot.scm.in
/index.html /index.html
/install-sh /install-sh
/lib /lib
/libtarot-task/Makefile.in
/libtool /libtool
/ltmain.sh /ltmain.sh
/m4 /m4
...@@ -97,6 +106,8 @@ ...@@ -97,6 +106,8 @@
/po/stamp-po /po/stamp-po
/po/tarot.pot /po/tarot.pot
/pre-inst-env /pre-inst-env
/programs-task/Makefile.in
/releases-task/Makefile.in
/releases.xml /releases.xml
/snippet /snippet
/src/gettext.h /src/gettext.h
...@@ -109,12 +120,17 @@ ...@@ -109,12 +120,17 @@
/src/libtarot/gobject/tarot-enums-stamp /src/libtarot/gobject/tarot-enums-stamp
/src/libtarot/gobject/tarot-gobject.c /src/libtarot/gobject/tarot-gobject.c
/src/libtarot/gobject/tarot-gobject.h /src/libtarot/gobject/tarot-gobject.h
/src/libtarot/guile/tarot/config.scm
/src/libtarot/hand/check_hand /src/libtarot/hand/check_hand
/src/libtarot/layout/check-layout /src/libtarot/layout/check-layout
/src/libtarot/perceptron/julien
/src/libtarot/pkgconfig/libtarot-gobject.pc /src/libtarot/pkgconfig/libtarot-gobject.pc
/src/libtarot/pkgconfig/libtarot.pc /src/libtarot/pkgconfig/libtarot.pc
/src/libtarot/semantic-api/api.sxml /src/libtarot/semantic-api/api.sxml
/src/libtarot/semantic-api/api.xml /src/libtarot/semantic-api/api.xml
/src/libtarot/semantic-api/tarot_guile.c
/src/libtarot/test/cheating-called-suit.c
/src/libtarot/test/cheating.c
/src/libtarot/test/dog-impossible /src/libtarot/test/dog-impossible
/src/libtarot/test/dog-impossible.c /src/libtarot/test/dog-impossible.c
/src/libtarot/test/empty-status /src/libtarot/test/empty-status
...@@ -125,6 +141,7 @@ ...@@ -125,6 +141,7 @@
/src/tarot-app/ai.c /src/tarot-app/ai.c
/src/tarot-app/card_painter.c /src/tarot-app/card_painter.c
/src/tarot-app/card_painter_default.c /src/tarot-app/card_painter_default.c
/src/tarot-app/card_painter_pixmap.c
/src/tarot-app/engine.c /src/tarot-app/engine.c
/src/tarot-app/gui/card_view.c /src/tarot-app/gui/card_view.c
/src/tarot-app/gui/widget.c /src/tarot-app/gui/widget.c
...@@ -150,5 +167,4 @@ ...@@ -150,5 +167,4 @@
/stamp-h1 /stamp-h1
/tarot-*.*.*.tar.gz /tarot-*.*.*.tar.gz
/test-driver /test-driver
/texinfo.tex /texinfo.tex
/tuneconfig.h \ No newline at end of file
\ No newline at end of file
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
# This program is free software: you can redistribute it and/or modify # 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 # 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 # the Free Software Foundation, version 3 of the License.
# your option) any later version.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
......
[submodule ".gnulib"] [submodule ".gnulib"]
path = .gnulib path = .gnulib
url = git://git.sv.gnu.org/gnulib.git url = https://framagit.org/play-tarot/gnulib.git
[submodule "src/libtarot/perceptron/julien"]
path = src/libtarot/perceptron/julien
url = https://framagit.org/gugurumbe/julien.git
Subproject commit de255f87357354e0f2422d9321fe9701b776ead5 Subproject commit 575b0ecbad2f34d5777f9562eebc2d0c815bfc5c
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
# This program is free software: you can redistribute it and/or modify # 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 # 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 # the Free Software Foundation, version 3 of the License.
# your option) any later version.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
......
# tarot implements the rules of the tarot game # 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 # 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 # 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 # the Free Software Foundation, version 3 of the License.
# your option) any later version.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
...@@ -14,7 +13,7 @@ ...@@ -14,7 +13,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = po lib SUBDIRS = po lib guile-config-task releases-task early-built-sources-task libtarot-task programs-task .
include defaults.am include defaults.am
...@@ -37,6 +36,7 @@ include appstream.am ...@@ -37,6 +36,7 @@ include appstream.am
include doc/Makefile.am include doc/Makefile.am
include src/Makefile.am include src/Makefile.am
include games/Makefile.am include games/Makefile.am
include cards/Makefile.am
include icon/Makefile.am include icon/Makefile.am
include gnulib.am include gnulib.am
include screenshots/Makefile.am include screenshots/Makefile.am
...@@ -58,29 +58,24 @@ AM_CPPFLAGS += \ ...@@ -58,29 +58,24 @@ AM_CPPFLAGS += \
-DLIBTAROT_VERSION_INFO="\"$(LIBTOOL_CURRENT):$(LIBTOOL_REVISION):$(LIBTOOL_AGE)\"" -DLIBTAROT_VERSION_INFO="\"$(LIBTOOL_CURRENT):$(LIBTOOL_REVISION):$(LIBTOOL_AGE)\""
AM_YFLAGS = -d AM_YFLAGS = -d
AM_CFLAGS += \ AM_CFLAGS += \
$(NETTLE_CFLAGS) $(XML_CFLAGS) $(NETTLE_CFLAGS) $(XML_CFLAGS) $(OPENMP_CFLAGS)
AM_LDADD += \ AM_LDADD += \
$(NETTLE_LIBS) $(XML_LIBS) $(NETTLE_LIBS) $(XML_LIBS) $(GUILE_LIBS) $(OPENMP_LIBS) \
BUILT_SOURCES += tuneconfig.h $(LIBTHREAD) \
$(LIB_SETLOCALE) \
$(LIB_SETLOCALE_NULL) \
$(LTLIBINTL) \
@INTL_MACOSX_LIBS@
if WITH_GOBJECT if WITH_GOBJECT
AM_CFLAGS += $(GOBJECT_CFLAGS) AM_CFLAGS += $(GOBJECT_CFLAGS)
AM_LDADD += $(GOBJECT_LIBS) AM_LDADD += $(GOBJECT_LIBS)
endif # WITH_GOBJECT endif # WITH_GOBJECT
PRIO_1 = lib/libgnu.la .PHONY: build-early-built-sources build-libtarot build-programs
PRIO_2 = eu.planete_kraus.Tarot.appdata.xml.in releases.xml build-early-built-sources:
PRIO_3 = src/libtarot/cards/tarot/cards_defs.h \ $(MAKE) $(AM_MAKEFLAGS) $(BUILT_SOURCES)
src/libtarot/cards/tarot/cards_private_impl.h \ build-libtarot:
$(dist_model_DATA:.model=.h) \ $(MAKE) $(AM_MAKEFLAGS) src/libtarot/libtarot.la
tuneconfig.h build-programs:
PRIO_4 = src/libtarot/semantic-api/api.xml $(MAKE) $(AM_MAKEFLAGS) $(bin_PROGRAMS)
PRIO_5 = $(bin_PROGRAMS)
.PHONY: safe
safe:
$(MAKE) $(AM_MAKEFLAGS) $(PRIO_1)
$(MAKE) $(AM_MAKEFLAGS) $(PRIO_2)
$(MAKE) $(AM_MAKEFLAGS) $(PRIO_3)
$(MAKE) $(AM_MAKEFLAGS) $(PRIO_4)
$(MAKE) $(AM_MAKEFLAGS) $(PRIO_5)
Waiting for the release...
\ No newline at end of file
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
# This program is free software: you can redistribute it and/or modify # 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 # 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 # the Free Software Foundation, version 3 of the License.
# your option) any later version.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
...@@ -42,4 +41,4 @@ $(srcdir)/%reldir%/eu.planete_kraus.Tarot.appdata.xml: %reldir%/eu.planete_kraus ...@@ -42,4 +41,4 @@ $(srcdir)/%reldir%/eu.planete_kraus.Tarot.appdata.xml: %reldir%/eu.planete_kraus
done done
@grep '<!--Copyright' $(srcdir)/%reldir%/eu.planete_kraus.Tarot.appdata.xml.in \ @grep '<!--Copyright' $(srcdir)/%reldir%/eu.planete_kraus.Tarot.appdata.xml.in \
>> $(srcdir)/%reldir%/eu.planete_kraus.Tarot.appdata.xml >> $(srcdir)/%reldir%/eu.planete_kraus.Tarot.appdata.xml
$(APPSTREAM_CLI) validate $(srcdir)/%reldir%/eu.planete_kraus.Tarot.appdata.xml $(APPSTREAM_UTIL) validate-strict --nonet $(srcdir)/%reldir%/eu.planete_kraus.Tarot.appdata.xml
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
# This program is free software: you can redistribute it and/or modify # 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 # 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 # the Free Software Foundation, version 3 of the License.
# your option) any later version.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
...@@ -18,18 +17,22 @@ ...@@ -18,18 +17,22 @@
(echo "@setfilename tarot.info" \ (echo "@setfilename tarot.info" \
&& echo '\bye') > doc/tarot.texi || exit 1 && echo '\bye') > doc/tarot.texi || exit 1
touch AUTHORS || exit 1 touch AUTHORS || exit 1
touch README || exit 1 touch README NEWS || exit 1
export PATH="$PWD/.gnulib:$PATH" export PATH="$PWD/.gnulib:$PATH"
if [ -d .gnulib ] if [ -d .gnulib ]
then then
git submodule update --init .gnulib || exit 1 git submodule update --init .gnulib || exit 1
fi fi
if [ -d src/libtarot/perceptron/julien ]
then
git submodule update --init src/libtarot/perceptron/julien || exit 1
fi
gnulib-tool --libtool \ gnulib-tool --libtool \
--import assert git-version-gen getopt-gnu setenv stdalign xalloc setlocale \ --import assert git-version-gen getopt-gnu setenv stdalign xalloc setlocale \
gitlog-to-changelog git-version-gen || exit 1 gitlog-to-changelog git-version-gen || exit 1
./gitlog-to-changelog > ChangeLog ./gitlog-to-changelog > ChangeLog
touch README || exit 1 touch README NEWS || exit 1
autoreconf -vif || exit 1 autoreconf -vif || exit 1
rm doc/tarot.texi || exit 1 rm doc/tarot.texi || exit 1
rm AUTHORS || exit 1 rm AUTHORS || exit 1
rm README || exit 1 rm README NEWS || exit 1
;; tarot implements the rules of the tarot game
;; Copyright (C) 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, 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
;; 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/>.
(specifications->manifest
'(
"appstream-glib"
"autoconf"
"autoconf-archive"
"automake"
"bash"
"bzip2"
"cairo"
"check"
"coreutils"
"curl"
"diffutils"
"emacs"
"emacs-htmlize"
"emacs-org"
"findutils"
"gawk"
"gcc-toolchain"
"gettext"
"git"
"glib:bin"
"gobject-introspection"
"grep"
"gtk+"
"guile"
"gzip"
"help2man"
"imagemagick"
"indent"
"jq"
"libtool"
"libxml2"
"libxslt"
"make"
"nettle"
"nss-certs"
"perl"
"pkg-config"
"r-ggplot2"
"r-glmnet"
"r-optparse"
"sed"
"tar"
"texinfo"
"texlive"
"vala"
"valgrind"
"wget"
"xz"
))
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
# This program is free software: you can redistribute it and/or modify # 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 # 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 # the Free Software Foundation, version 3 of the License.
# your option) any later version.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
......
# tarot implements the rules of the tarot game
# Copyright (C) 2019 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, 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
# 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/>.
# I took the public domain cards from wikipedia, removed the borders,
# resized them, balanced the colours.
dist_cards_DATA += \
$(srcdir)/%reldir%/card_0.png \
$(srcdir)/%reldir%/card_1.png \
$(srcdir)/%reldir%/card_2.png \
$(srcdir)/%reldir%/card_3.png \
$(srcdir)/%reldir%/card_4.png \
$(srcdir)/%reldir%/card_5.png \
$(srcdir)/%reldir%/card_6.png \
$(srcdir)/%reldir%/card_7.png \
$(srcdir)/%reldir%/card_8.png \
$(srcdir)/%reldir%/card_9.png \
$(srcdir)/%reldir%/card_10.png \
$(srcdir)/%reldir%/card_11.png \
$(srcdir)/%reldir%/card_12.png \
$(srcdir)/%reldir%/card_13.png \
$(srcdir)/%reldir%/card_14.png \
$(srcdir)/%reldir%/card_15.png \
$(srcdir)/%reldir%/card_16.png \
$(srcdir)/%reldir%/card_17.png \
$(srcdir)/%reldir%/card_18.png \
$(srcdir)/%reldir%/card_19.png \
$(srcdir)/%reldir%/card_20.png \
$(srcdir)/%reldir%/card_21.png \
$(srcdir)/%reldir%/card_22.png \
$(srcdir)/%reldir%/card_23.png \
$(srcdir)/%reldir%/card_24.png \
$(srcdir)/%reldir%/card_25.png \
$(srcdir)/%reldir%/card_26.png \
$(srcdir)/%reldir%/card_27.png \
$(srcdir)/%reldir%/card_28.png \
$(srcdir)/%reldir%/card_29.png \
$(srcdir)/%reldir%/card_30.png \
$(srcdir)/%reldir%/card_31.png \
$(srcdir)/%reldir%/card_32.png \
$(srcdir)/%reldir%/card_33.png \
$(srcdir)/%reldir%/card_34.png \
$(srcdir)/%reldir%/card_35.png \
$(srcdir)/%reldir%/card_36.png \
$(srcdir)/%reldir%/card_37.png \
$(srcdir)/%reldir%/card_38.png \
$(srcdir)/%reldir%/card_39.png \
$(srcdir)/%reldir%/card_40.png \
$(srcdir)/%reldir%/card_41.png \
$(srcdir)/%reldir%/card_42.png \
$(srcdir)/%reldir%/card_43.png \
$(srcdir)/%reldir%/card_44.png \
$(srcdir)/%reldir%/card_45.png \
$(srcdir)/%reldir%/card_46.png \
$(srcdir)/%reldir%/card_47.png \
$(srcdir)/%reldir%/card_48.png \
$(srcdir)/%reldir%/card_49.png \
$(srcdir)/%reldir%/card_50.png \
$(srcdir)/%reldir%/card_51.png \
$(srcdir)/%reldir%/card_52.png \
$(srcdir)/%reldir%/card_53.png \
$(srcdir)/%reldir%/card_54.png \
$(srcdir)/%reldir%/card_55.png \
$(srcdir)/%reldir%/card_56.png \
$(srcdir)/%reldir%/card_57.png \
$(srcdir)/%reldir%/card_58.png \
$(srcdir)/%reldir%/card_59.png \
$(srcdir)/%reldir%/card_60.png \
$(srcdir)/%reldir%/card_61.png \
$(srcdir)/%reldir%/card_62.png \
$(srcdir)/%reldir%/card_63.png \
$(srcdir)/%reldir%/card_64.png \
$(srcdir)/%reldir%/card_65.png \
$(srcdir)/%reldir%/card_66.png \
$(srcdir)/%reldir%/card_67.png \
$(srcdir)/%reldir%/card_68.png \
$(srcdir)/%reldir%/card_69.png \
$(srcdir)/%reldir%/card_70.png \
$(srcdir)/%reldir%/card_71.png \
$(srcdir)/%reldir%/card_72.png \
$(srcdir)/%reldir%/card_73.png \
$(srcdir)/%reldir%/card_74.png \
$(srcdir)/%reldir%/card_75.png \
$(srcdir)/%reldir%/card_76.png \
$(srcdir)/%reldir%/card_77.png
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