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

Use autogen

parent 3088719b
Pipeline #76724 failed with stages
in 2 minutes and 27 seconds
......@@ -45,8 +45,6 @@
/m4
/mdate-sh
/missing
/po/Makefile
/po/Makefile.in
/po/Makefile.in.in
/po/Makevars.template
/po/POTFILES
......@@ -87,6 +85,10 @@
/src/program/tarot-dog.h
/src/program/tarot-handful.c
/src/program/tarot-handful.h
/src/program/tarot-help.c
/src/program/tarot-help.h
/src/program/tarot-license.c
/src/program/tarot-license.h
/src/program/tarot-new.c
/src/program/tarot-new.h
/src/program/tarot-play.c
......@@ -95,6 +97,8 @@
/src/program/tarot-setup.h
/src/program/tarot-status.c
/src/program/tarot-status.h
/src/program/tarot-version.c
/src/program/tarot-version.h
/src/program/tarot.6.gz
/test-driver
/texinfo.tex
......
......@@ -2,9 +2,6 @@ image: debian:latest
stages:
- dist
- check
- package-src
- package
- manual
dist:
......@@ -16,33 +13,6 @@ dist:
- public
expire_in: 1 week
build:
stage: check
image: debian:latest
script: "./ci/build.sh"
artifacts:
paths:
- public
expire_in: 1 week
deb-src:
stage: package-src
image: debian:latest
script: "./ci/deb-src.sh"
artifacts:
paths:
- public
expire_in: 1 week
deb:
stage: package
image: debian:latest
script: "./ci/deb.sh"
artifacts:
paths:
- public
expire_in: 1 week
pages:
stage: manual
script: "./ci/pages.sh"
......
2018-08-21 gettextize <bug-gnu-gettext@gnu.org>
* m4/lib-ld.m4: Upgrade to gettext-0.19.8.1.
* m4/lib-link.m4: Upgrade to gettext-0.19.8.1.
* m4/lib-prefix.m4: Upgrade to gettext-0.19.8.1.
* Makefile.am (SUBDIRS): Add po.
* configure.ac (AC_CONFIG_FILES): Add po/Makefile.in.
2018-08-21 gettextize <bug-gnu-gettext@gnu.org>
* m4/gettext.m4: Upgrade to gettext-0.19.8.1.
* m4/iconv.m4: Upgrade to gettext-0.19.8.1.
* m4/lib-ld.m4: Upgrade to gettext-0.19.8.1.
* m4/lib-link.m4: Upgrade to gettext-0.19.8.1.
* m4/lib-prefix.m4: Upgrade to gettext-0.19.8.1.
* m4/nls.m4: Upgrade to gettext-0.19.8.1.
* m4/po.m4: Upgrade to gettext-0.19.8.1.
* m4/progtest.m4: Upgrade to gettext-0.19.8.1.
* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.19.8.
2018-08-19 Vivien Kraus <vivien@planete-kraus.eu>
* configure.ac: Remove the code coverage, since it disables
......
FROM debian:stable
RUN apt-get update
RUN apt-get install -y --no-install-recommends texlive-base texlive-latex-base git ca-certificates texlive-fonts-recommended texlive-generic-recommended autoconf automake gettext autopoint libtool texinfo gnulib autoconf-archive gobject-introspection make gcc valac valac-vapi gtk-doc-tools flex bison gperf nettle-dev libgtk-3-dev libgirepository1.0-dev emacs org-mode indent doxygen graphviz lcov dejagnu check libxml2-utils xsltproc wget gengetopt help2man libreadline-dev libunistring-dev valgrind
RUN apt-get install -y --no-install-recommends texlive-base texlive-latex-base git ca-certificates texlive-fonts-recommended texlive-generic-recommended autoconf automake gettext autopoint libtool texinfo gnulib autoconf-archive gobject-introspection make gcc valac valac-vapi gtk-doc-tools flex bison gperf nettle-dev libgtk-3-dev libgirepository1.0-dev emacs org-mode indent doxygen graphviz lcov dejagnu check libxml2-utils xsltproc wget gengetopt help2man libreadline-dev libunistring-dev valgrind autogen
RUN apt-get upgrade -y
MAINTAINER framagit.org/gugurumbe/tarot
\ No newline at end of file
......@@ -18,7 +18,8 @@
SUBDIRS = po lib
AUTOMAKE_OPTIONS = subdir-objects
mansixdir = $(datadir)/man6
mandir = $(datadir)/man
mansixdir = $(mandir)/man6
bin_PROGRAMS =
bin_SCRIPTS =
dist_bin_SCRIPTS =
......@@ -42,9 +43,6 @@ dist_noinst_SCRIPTS = \
run-tarot.sh \
build-aux/git-version-gen \
ci/dist.sh \
ci/build.sh \
ci/deb-src.sh \
ci/deb.sh \
ci/pages.sh
nodist_noinst_DATA =
......@@ -88,7 +86,6 @@ AM_TAROT_LOG_FLAGS =
include doc/Makefile.am
include src/Makefile.am
include games/Makefile.am
include debian/Makefile.am
TESTS += $(check_PROGRAMS)
indent_verbose = $(indent_verbose_@AM_V@)
......@@ -101,7 +98,7 @@ indent: $(INDENTED)
org_verbose = $(org_verbose_@AM_V@)
org_verbose_ = $(org_verbose_@AM_DEFAULT_V@)
org_verbose_0 = @echo "ORG-EXPORT $@";
README: %reldir%/tarot.org
README: %reldir%/tarot.org %reldir%/ci/dist.sh
$(org_verbose) ($(EMACS) \
--batch -q \
-l "$(srcdir)/setup.el" \
......
......@@ -168,7 +168,7 @@ http://gugurumbe.frama.io/tarot/tarot-devel.tar.gz
|
| apt-get update
| apt-get upgrade -y
| apt-get install -y --no-install-recommends texlive-base texlive-latex-base git ca-certificates texlive-fonts-recommended texlive-generic-recommended autoconf automake gettext autopoint libtool texinfo gnulib autoconf-archive make gcc flex bison gperf emacs org-mode indent check gengetopt help2man libreadline-dev libunistring-dev valgrind
| apt-get install -y --no-install-recommends texlive-base texlive-latex-base git ca-certificates texlive-fonts-recommended texlive-generic-recommended autoconf automake gettext autopoint libtool texinfo gnulib autoconf-archive make gcc flex bison gperf emacs org-mode indent check gengetopt help2man libreadline-dev libunistring-dev valgrind autogen
| ./autogen.sh
| ./configure CFLAGS="-Wall -Wextra -g -O0" \
| YFLAGS="--report=all" \
......@@ -180,7 +180,6 @@ http://gugurumbe.frama.io/tarot/tarot-devel.tar.gz
|
| # Build the recursive targets in parallel depth-first:
|
| (cd lib && make -j 16) || exit 1
| # src/program/tarot is called when making the manual page.
| make -j 16 src/program/tarot || exit 1
|
......
......@@ -19,7 +19,7 @@
(echo "@setfilename tarot.info" \
&& echo '\bye') > doc/tarot.texi || exit 1
gnulib-tool --libtool \
--import malloc-gnu getopt-gnu assert gettext-h setlocale xalloc fmemopen
gnulib-tool --libtool --import \
malloc getopt-gnu assert xalloc gettext-h setlocale
autoreconf -vif || exit 1
rm doc/tarot.texi || exit 1
#!/bin/sh
VERSION=$(cat public/.version)
apt-get update
apt-get upgrade -y
apt-get install -y --no-install-recommends build-essential libreadline-dev libunistring-dev gettext check valgrind
cp public/tarot-$VERSION.tar.gz . || exit 1
tar xf tarot-$VERSION.tar.gz || exit 1
mkdir prefix || exit 1
mkdir build || exit 1
cd build/ || exit 1
../tarot-$VERSION/configure CFLAGS="-Wall -Wextra -g -O0" \
YFLAGS="--report=all" \
--prefix="$PWD/../prefix" \
--enable-silent-rules=yes \
|| (cat config.log; exit 1)
make -j 16 TESTS_ENVIRONMENT="valgrind --tool=memcheck" check || exit 1
echo "$(date): tests passed" > ../public/tests-passed.txt
#!/bin/sh
VERSION=$(cat public/.version)
VERSION_SHORT=$(echo "$VERSION" | cut -d '-' -f 1)
apt-get update
apt-get upgrade -y
apt-get install -y --no-install-recommends build-essential libreadline-dev libunistring-dev gettext dh-make dpkg-dev
cp public/tarot-$VERSION.tar.gz tarot_$VERSION_SHORT.orig.tar.gz || exit 1
tar xf tarot_$VERSION_SHORT.orig.tar.gz || exit 1
cd tarot-$VERSION || exit 1
dpkg-buildpackage -us -uc || exit 1
cd .. || exit 1
mkdir public/debian || exit 1
cp tarot_*.*-*.debian.tar.xz public/debian || exit 1
cp tarot-dbgsym_*.*-*_*.deb public/debian || exit 1
cp tarot_*.*-*.dsc public/debian || exit 1
cp tarot_*.*-*_*.buildinfo public/debian || exit 1
cp tarot_*.*-*_*.changes public/debian || exit 1
cp tarot_*.*-*_*.deb public/debian || exit 1
cp tarot_$VERSION_SHORT.orig.tar.gz public/debian || exit 1
#!/bin/sh
apt-get update
apt-get upgrade -y
cd public/debian || exit 1
apt install -y ./tarot_*.*-*_*.deb
tarot --help || exit 1
tarot --version || exit 1
echo "" | tarot || exit 1
......@@ -2,7 +2,7 @@
apt-get update
apt-get upgrade -y
apt-get install -y --no-install-recommends texlive-base texlive-latex-base git ca-certificates texlive-fonts-recommended texlive-generic-recommended autoconf automake gettext autopoint libtool texinfo gnulib autoconf-archive make gcc flex bison gperf emacs org-mode indent check gengetopt help2man libreadline-dev libunistring-dev valgrind
apt-get install -y --no-install-recommends texlive-base texlive-latex-base git ca-certificates texlive-fonts-recommended texlive-generic-recommended autoconf automake gettext autopoint libtool texinfo gnulib autoconf-archive make gcc flex bison gperf emacs org-mode indent check gengetopt help2man libreadline-dev libunistring-dev valgrind autogen
./autogen.sh
./configure CFLAGS="-Wall -Wextra -g -O0" \
YFLAGS="--report=all" \
......@@ -14,7 +14,6 @@ make indent || exit 1
# Build the recursive targets in parallel depth-first:
(cd lib && make -j 16) || exit 1
# src/program/tarot is called when making the manual page.
make -j 16 src/program/tarot || exit 1
......
......@@ -22,6 +22,7 @@ AM_MISSING_PROG([BISON], [bison])
AM_MISSING_PROG([HELP2MAN], [help2man])
AM_MISSING_PROG([INDENT], [indent])
AM_MISSING_PROG([EMACS], [emacs])
AM_MISSING_PROG([AUTOGEN], [autogen])
AC_ARG_ENABLE([valgrind], AS_HELP_STRING([--enable-valgrind=yes],
[Run the unit tests under valgrind (slow, incompatible with asan)]))
AS_IF([test "x$enable_valgrind" = "xyes"], [
......@@ -50,8 +51,10 @@ AS_IF([test "x$with_libunistring" != "xno"], [
AX_TAROT_PACKAGE([libunistring], [libunistring], [], [-lunistring],
[], [u8_mblen], [
AC_DEFINE([HAVE_LIBUNISTRING], [1], [Headers and functions of libunistring are available])
AM_CONDITIONAL([HAVE_LIBUNISTRING], [true])
], [
AC_DEFINE([HAVE_LIBUNISTRING], [0], [Some headers or functions of libunistring are not available])
AM_CONDITIONAL([HAVE_LIBUNISTRING], [false])
AS_IF([test "x$with_libunistring" = "xyes"], [
AC_MSG_ERROR([libunistring is not working.])
])
......
# Makefile.am
#
# Copyright (C) 2018 Vivien Kraus <vivien@planete-kraus.eu>
#
# 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/>.
EXTRA_DIST += \
%reldir%/changelog \
%reldir%/changelog.in \
%reldir%/compat \
%reldir%/control \
%reldir%/copyright \
%reldir%/manpage.1.ex \
%reldir%/manpage.sgml.ex \
%reldir%/manpage.xml.ex \
%reldir%/menu.ex \
%reldir%/postinst.ex \
%reldir%/postrm.ex \
%reldir%/preinst.ex \
%reldir%/prerm.ex \
%reldir%/README.Debian \
%reldir%/README.source \
%reldir%/rules \
%reldir%/source/format \
%reldir%/tarot.cron.d.ex \
%reldir%/tarot.default.ex \
%reldir%/tarot.doc-base.EX \
%reldir%/tarot-docs.docs \
%reldir%/watch.ex
%reldir%/changelog: %reldir%/changelog.in .version
$(AM_V_GEN) sed "s/VERSION/$$(echo $(VERSION) | cut -d - -f 1)/g" \
%reldir%/changelog.in \
> %reldir%/changelog
tarot for Debian
---------------
-- Vivien Kraus <vivien@planete-kraus.eu> Mon, 20 Aug 2018 22:17:26 +0200
tarot for Debian
---------------
<this file describes information about the source package, see Debian policy
manual section 4.14. You WILL either need to modify or delete this file>
-- Vivien Kraus <vivien@planete-kraus.eu> Mon, 20 Aug 2018 22:17:26 +0200
tarot (VERSION-1) unstable; urgency=medium
* Initial release
-- Vivien Kraus <vivien@planete-kraus.eu> Mon, 20 Aug 2018 22:17:26 +0200
Source: tarot
Section: games
Priority: optional
Maintainer: Vivien Kraus <vivien@planete-kraus.eu>
Build-Depends: debhelper (>= 9), libreadline-dev, libunistring-dev, gettext
Standards-Version: 3.9.8
Homepage: http://gugurumbe.frama.io/tarot/share/doc/tarot/tarot.html/index.html
Vcs-Git: https://framagit.org/gugurumbe/tarot.git
Vcs-Browser: https://framagit.org/gugurumbe/tarot
Package: tarot
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, readline-common, libunistring0, gettext
Description: A card *game* with up to 5 *players*
Tarot is a card game popular in some countries. This package
implements the game.
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: tarot
Source: <url://example.com>
Files: *
Copyright: 2017 2018 Vivien Kraus <vivien@planete-kraus.eu>
License: GPL-3+
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/>.
.\" Hey, EMACS: -*- nroff -*-
.\" (C) Copyright 2018 Vivien Kraus <vivien@planete-kraus.eu>,
.\"
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH Tarot SECTION "August 20 2018"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
tarot \- program to do something
.SH SYNOPSIS
.B tarot
.RI [ options ] " files" ...
.br
.B bar
.RI [ options ] " files" ...
.SH DESCRIPTION
This manual page documents briefly the
.B tarot
and
.B bar
commands.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
\fBtarot\fP is a program that...
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of options is included below.
For a complete description, see the Info files.
.TP
.B \-h, \-\-help
Show summary of options.
.TP
.B \-v, \-\-version
Show version of program.
.SH SEE ALSO
.BR bar (1),
.BR baz (1).
.br
The programs are documented fully by
.IR "The Rise and Fall of a Fooish Bar" ,
available via the Info system.
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