Skip to content

Commit

Permalink
Up to date
Browse files Browse the repository at this point in the history
  • Loading branch information
saitoha committed May 19, 2014
1 parent 56fcce7 commit 69b0e87
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 17 deletions.
18 changes: 18 additions & 0 deletions .gitignore
Expand Up @@ -19,3 +19,21 @@
# generated by patch(1)
*.rej
*.orig

# autotools
autom4te.cache
config.h
config.h.in~
config.log
config.status
Makefile
libtool
stamp-h1
.libs
.deps

# OSX
.DS_Store

# project.vim
.vimprojects
13 changes: 7 additions & 6 deletions .travis.yml
Expand Up @@ -7,14 +7,15 @@ env:
- XCC=i686-w64-mingw32-gcc HOST=i686-w64-mingw32 WINE=wine
- XCC=i586-mingw32msvc-gcc HOST=i586-mingw32msvc WINE=wine
- XCC=x86_64-w64-mingw32-gcc HOST=x86_64-w64-mingw32 WINE=wine64
- XCC=clang HOST= WINE= GDKPIXBUF=" --enable-gdk-pixbuf2 "
- XCC=clang HOST= WINE= LIBCURL=" --enable-libcurl "
- XCC=clang HOST= WINE= GDKPIXBUF=" --enable-gdk-pixbuf2 " LIBCURL=" --enable-libcurl "
- XCC=clang HOST= WINE= GDKPIXBUF=" --with-gdk-pixbuf2 "
- XCC=clang HOST= WINE= LIBCURL=" --with-libcurl "
- XCC=clang HOST= WINE= GDKPIXBUF=" --with-gdk-pixbuf2 " LIBCURL=" --with-libcurl "

before_install:
- "sudo apt-get -qq update --force-yes > /dev/null"
- "if [ x$GDKPIXBUF != x ]; then sudo apt-get -qq install libgdk-pixbuf2.0-dev; fi"
- "if [ x$LIBCURL != x ]; then sudo apt-get -qq install libcurl4-openssl-dev; fi"
- "if [ x$WINE = x ]; then sudo apt-get install -qq valgrind > /dev/null; fi"
- "if [ x$WINE != x ]; then sudo apt-get install -qq wine > /dev/null; fi"
- "if [ x$XCC = xclang ]; then sudo apt-get install -qq clang; fi"
- "if [ x$XCC = xgcc ]; then sudo apt-get install -qq gcc; fi"
Expand All @@ -23,12 +24,11 @@ before_install:
- "if [ x$XCC = xx86_64-w64-mingw32-gcc ]; then sudo apt-get install -qq gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64; fi"

before_script:
- "uname -a"
- "uname -r"
- "CC=$XCC ./configure --host=$HOST $(GDKPIXBUF) $(LIBCURL)"
- "CC=$XCC ./configure --prefix=/usr --host=$HOST $(GDKPIXBUF) $(LIBCURL)"

script:
- "make"
- "sudo make install"
- "$WINE converters/img2sixel images/snake.jpg > snake1.sixel"
- "du -h snake1.sixel"
- "$WINE converters/img2sixel -p16 images/snake.jpg > snake2.sixel"
Expand All @@ -39,4 +39,5 @@ script:
- "du -h snake2.png"
- "$WINE converters/img2sixel snake1.png > snake3.sixel"
- "du -h snake3.sixel"
- "if [ x$WINE = x ]; then valgrind --leak-check=yes --error-limit=no img2sixel images/snake.jpg -dfs 2>&1 | tee valgrind.log | grep 'ERROR SUMMARY: 0 errors from 0 contexts' || exit 1; fi"

20 changes: 10 additions & 10 deletions configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for sixel 0.17.2.
# Generated by GNU Autoconf 2.69 for sixel 0.18.0.
#
# Report bugs to <user@zuse.jp>.
#
Expand Down Expand Up @@ -589,8 +589,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sixel'
PACKAGE_TARNAME='sixel'
PACKAGE_VERSION='0.17.2'
PACKAGE_STRING='sixel 0.17.2'
PACKAGE_VERSION='0.18.0'
PACKAGE_STRING='sixel 0.18.0'
PACKAGE_BUGREPORT='user@zuse.jp'
PACKAGE_URL=''

Expand Down Expand Up @@ -1336,7 +1336,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures sixel 0.17.2 to adapt to many kinds of systems.
\`configure' configures sixel 0.18.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1406,7 +1406,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of sixel 0.17.2:";;
short | recursive ) echo "Configuration of sixel 0.18.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1528,7 +1528,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
sixel configure 0.17.2
sixel configure 0.18.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1897,7 +1897,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by sixel $as_me 0.17.2, which was
It was created by sixel $as_me 0.18.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2772,7 +2772,7 @@ fi

# Define the identity of the package.
PACKAGE='sixel'
VERSION='0.17.2'
VERSION='0.18.0'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -13355,7 +13355,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by sixel $as_me 0.17.2, which was
This file was extended by sixel $as_me 0.18.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -13421,7 +13421,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
sixel config.status 0.17.2
sixel config.status 0.18.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -3,7 +3,7 @@

AC_PREREQ([2.60])
LT_PREREQ([2.4])
AC_INIT([sixel], [0.17.2], [user@zuse.jp])
AC_INIT([sixel], [0.18.0], [user@zuse.jp])
LS_LT_CURRENT=0
LS_LT_REVISION=0
LS_LT_AGE=0
Expand Down

0 comments on commit 69b0e87

Please sign in to comment.