Merge commit 'df053f91cca36f47d4b994938dbf2bf4f84b6e8e' into develop

This commit is contained in:
Tim Rühsen 2015-12-15 20:19:28 +01:00
commit c6048b0cdb
2 changed files with 47 additions and 6 deletions

41
.travis.yml Normal file
View File

@ -0,0 +1,41 @@
sudo: false
language: c
compiler:
- gcc
- clang
env:
- RUNTIME=libicu
- RUNTIME=libidn2
- RUNTIME=libidn
- RUNTIME=no
addons:
apt:
packages:
- automake
- autoconf
- autopoint
- libtool
- gtk-doc-tools
- gettext
- libidn11
- libidn11-dev
- libidn2-0
- libidn2-0-dev
- libicu48
- libicu-dev
- libunistring0
- libunistring-dev
script:
- ./autogen.sh
- ./configure && make -j4 && make check -j4
- ./configure --enable-runtime=$RUNTIME --enable-builtin=libicu && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=$RUNTIME --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=$RUNTIME --enable-builtin=libidn && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=$RUNTIME --disable-builtin && make clean && make -j4 && make check -j4
- ./configure --enable-gtk-doc && make -j4 && make check -j4
- make distcheck

View File

@ -1,21 +1,21 @@
# !/bin/sh -e
#!/bin/sh -e
AUTORECONF=`which autoreconf 2>/dev/null`
AUTORECONF=$(which autoreconf 2>/dev/null || true)
if test $? -ne 0; then
echo "No 'autoreconf' found. You must install the autoconf package."
exit 1
fi
GIT=`which git 2>/dev/null`
GIT=$(which git 2>/dev/null || true)
if test $? -ne 0; then
echo "No 'git' found. You must install the git package."
exit 1
fi
# create m4 before gtkdocize
mkdir m4 2>/dev/null
mkdir m4 2>/dev/null || true
GTKDOCIZE=`which gtkdocize 2>/dev/null`
GTKDOCIZE=$(which gtkdocize 2>/dev/null || true)
if test $? -ne 0; then
echo "No gtk-doc support found. You can't build the docs."
# rm because gtk-doc.make might be a link to a protected file
@ -29,7 +29,7 @@ fi
$GIT submodule init
$GIT submodule update
$AUTORECONF --install --force --symlink || exit $?
$AUTORECONF --install --force --symlink
echo
echo "----------------------------------------------------------------"