Merge branch 'master' into manpage

.coveralls.yml

@@ -0,0 +1,2 @@
+
+repo_token: bD1axKh8NFv7xXkdK0KGWn7k43fklumoh

.gitignore

@@ -3,6 +3,11 @@
 *.lo
 *.o
 
+# gcov
+*.gcno
+*.gcda
+*.gcov
+
 # Compiled Dynamic libraries
 *.so
 *.dylib
@@ -12,6 +17,9 @@
 *.la
 *.a
 
+# Compiled Executable binary
+*.exe
+
 # swap files
 *.swp
 \#*\#
@@ -35,5 +43,19 @@ stamp-h1
 # OSX
 .DS_Store
 
+# editor
+*.un~
+
 # project.vim
 .vimprojects
+
+# project specific
+wic_install.reg
+wic_uninstall.reg
+libsixel.pc
+package.json.in
+include/sixel.h
+converters/snake.png
+converters/img2sixel
+converters/sixel2png
+converters/snake.sixel

.travis.yml

@@ -4,20 +4,22 @@ language: c
 env:
   - XCC=clang HOST= WINE=
   - XCC=gcc HOST= WINE=
-  - 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=" --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=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"
 
 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$GDKPIXBUF != x ]; then sudo apt-get -qq install pkg-config libgdk-pixbuf2.0-dev; fi"
+  - "if [ x$GD != x ]; then sudo apt-get -qq install libgd2-xpm-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"
@@ -26,9 +28,12 @@ before_install:
   - "if [ x$XCC = xi686-w64-mingw32-gcc ]; then sudo apt-get install -qq gcc-mingw-w64-i686 binutils-mingw-w64-i686; fi"
   - "if [ x$XCC = xi586-mingw32msvc-gcc ]; then sudo apt-get install -qq mingw32; fi"
   - "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"
+  - "if [ x$GCOV != x ]; then sudo apt-get install libyaml-dev; fi"
+  - "if [ x$GCOV != x ]; then sudo pip install cpp-coveralls pyyaml; fi"
 
 before_script:
-  - "CC=$XCC ./configure --prefix=/usr --host=$HOST $(GDKPIXBUF) $(LIBCURL)"
+  - "echo ./configure --prefix=/usr ${HOST} ${GDKPIXBUF} ${GD} ${LIBCURL} ${GCOV} ${STATIC}"
+  - "CC=$XCC ./configure --prefix=/usr ${HOST} ${GDKPIXBUF} ${GD} ${LIBCURL} ${GCOV} ${STATIC}"
 
 script:
   - "make"
@@ -43,5 +48,7 @@ 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"
+  - "if [ x$GCOV != x ]; then make coveralls; fi"
 
+after_success:
+  - "if [ x$WINE = x ]; then make valgrind && exit 0 || cat valgrind.log && exit 1; fi"