Merge branch 'develop' into coverage

.gitignore

@@ -53,7 +53,9 @@ stamp-h1
 wic_install.reg
 wic_uninstall.reg
 libsixel.pc
-converters/snake.png
+package.json.in
+include/*.h
 converters/img2sixel
 converters/sixel2png
-converters/snake.sixel
+converters/*.sixel
+converters/*.png

.travis.yml

@@ -2,19 +2,21 @@
 language: c
 
 env:
-  - XCC=clang HOST= WINE=
-  - XCC=gcc HOST= WINE=
-  - XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" WINE=wine
-  - XCC=i586-mingw32msvc-gcc HOST="--host=i586-mingw32msvc" WINE=wine
-  - XCC=x86_64-w64-mingw32-gcc HOST="--host=x86_64-w64-mingw32" WINE=wine64
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2"
-  - XCC=clang HOST= WINE= LIBCURL="--with-libcurl"
-  - XCC=clang HOST= WINE= GD="--with-gd"
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2" LIBCURL="--with-libcurl"
-  - XCC=clang HOST= WINE= GD="--with-gd" LIBCURL="--with-libcurl"
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd"
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl"
-  - XCC=clang HOST= WINE= GDKPIXBUF="--with-gdk-pixbuf2" GD="--with-gd" LIBCURL="--with-libcurl" GCOV="--enable-gcov" STATIC="--disable-shared"
+  - 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=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"
 
 before_install:
   - "sudo apt-get -qq update --force-yes > /dev/null"
@@ -32,23 +34,13 @@ before_install:
   - "if [ x$GCOV != x ]; then sudo pip install cpp-coveralls pyyaml; fi"
 
 before_script:
-  - "echo ./configure --prefix=/usr ${HOST} ${GDKPIXBUF} ${GD} ${LIBCURL} ${GCOV} ${STATIC}"
-  - "CC=$XCC ./configure --prefix=/usr ${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"
-  - "$WINE converters/img2sixel images/snake.jpg > snake1.sixel"
-  - "du -h snake1.sixel"
-  - "$WINE converters/img2sixel -p16 images/snake.jpg > snake2.sixel"
-  - "du -h snake2.sixel"
-  - "$WINE converters/sixel2png -i snake1.sixel -o snake1.png"
-  - "du -h snake1.png"
-  - "$WINE converters/sixel2png < snake2.sixel > snake2.png"
-  - "du -h snake2.png"
-  - "$WINE converters/img2sixel snake1.png > snake3.sixel"
-  - "du -h snake3.sixel"
+  - "make test | tee log | grep succeeded || (cat log|tail -n5; exit 1)"
 
 after_success:
-  - "if [ x$WINE = x ]; then make valgrind && exit 0 || cat valgrind.log && exit 1; fi"
-  - "if [ x$GCOV != x ]; then make coveralls || exit 1 ; fi"
+  - "make valgrind || (cat valgrind.log && exit 1)"
+  - "make coveralls"