Merge branch 'release'

saitoha · Aug 21, 2015 · 8983ae6 · 8983ae6
2 parents 8849016 + a0f8fc4
commit 8983ae6
Show file tree

Hide file tree

Showing 331 changed files with 47,546 additions and 5,536 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,8 +54,8 @@ wic_install.reg
 wic_uninstall.reg
 libsixel.pc
 package.json.in
-include/sixel.h
-converters/snake.png
+include/*.h
 converters/img2sixel
 converters/sixel2png
-converters/snake.sixel
+converters/*.sixel
+converters/*.png
diff --git a/.travis.yml b/.travis.yml
@@ -2,21 +2,21 @@
 language: c
 
 env:
-  - XCC=gcc HOST= PREFIX=/usr DEBUG=--enable-debug WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
-  - XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" PREFIX="/usr/i686-w64-mingw32" DEBUG=--enable-debug WINE=wine
+  - XCC=gcc HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
+  - XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" PREFIX="/usr/i686-w64-mingw32" DEBUG="--enable--tests --enable-debug" WINE=wine
   - XCC=i586-mingw32msvc-gcc HOST="--host=i586-mingw32msvc" PREFIX="/usr/i586-mingw32msvc" WINE=wine
-  - XCC=x86_64-w64-mingw32-gcc HOST="--host=x86_64-w64-mingw32" PREFIX="/usr/x86_64-w64-mingw32" DEBUG=--enable-debug WINE=wine64
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= JPEG="--with-jpeg" PNG="--with-png"
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= GDKPIXBUF="--with-gdk-pixbuf2" JPEG=--without-jpeg PNG=--without-png
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= GDKPIXBUF="--with-gdk-pixbuf2" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
-  - XCC=gcc HOST= PREFIX=/usr DEBUG=--enable-debug WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG="--with-jpeg" PNG="--with-png" LIBCURL="--with-libcurl"
-  - XCC=clang HOST= PREFIX=/usr DEBUG=--enable-debug WINE= JPEG="--with-jpeg" PNG="--with-png" LIBCURL="--with-libcurl" GCOV="--enable-gcov" STATIC="--disable-shared"
+  - XCC=x86_64-w64-mingw32-gcc HOST="--host=x86_64-w64-mingw32" PREFIX="/usr/x86_64-w64-mingw32" DEBUG="--enable--tests --enable-debug" WINE=wine64
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= JPEG="--with-jpeg" PNG="--with-png"
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG=--without-jpeg PNG=--without-png
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" JPEG=--without-jpeg PNG=--without-png
+  - XCC=gcc HOST= PREFIX=/usr DEBUG="--enable--tests --enable-debug" WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" JPEG="--with-jpeg" PNG="--with-png" LIBCURL="--with-libcurl"
+  - XCC=clang HOST= PREFIX=/usr DEBUG="--enable-tests --enable-debug" WINE= JPEG="--with-jpeg" PNG="--with-png" LIBCURL="--with-libcurl" GCOV="--enable-gcov" STATIC="--disable-shared"
 
 before_install:
   - "sudo apt-get -qq update --force-yes > /dev/null"
@@ -34,12 +34,12 @@ before_install:
   - "if [ x$GCOV != x ]; then sudo pip install cpp-coveralls pyyaml; fi"
 
 before_script:
-  - "CC=$XCC ./configure --prefix=${PREFIX} ${DEBUG} ${HOST} ${GDKPIXBUF} ${GD} ${LIBCURL} ${GCOV} ${STATIC}"
+  - "CC=$XCC ./configure --prefix=${PREFIX} ${DEBUG} ${HOST} ${GDKPIXBUF} ${GD} ${LIBCURL} ${PNG} ${JPEG} ${GCOV} ${STATIC}"
 
 script:
   - "make"
   - "sudo make install"
-  - "make test | tee log | grep succeeded || (cat log|tail -n100; exit 1)"
+  - "make test | tee log | grep succeeded || (cat log|tail -n5; exit 1)"
 
 after_success:
   - "make valgrind || (cat valgrind.log && exit 1)"