Merge branch 'develop'

.travis.yml

@@ -2,7 +2,7 @@ os:
   - linux
   - osx
 dist: trusty
-sudo: required
+sudo: false
 language: c
 compiler:
 - clang

README.md

@@ -1,6 +1,6 @@
 # ProgressBar
 
-[![Linux / macOS build](https://img.shields.io/travis/limix/progressbar/master.svg?label=Linux%20%2F%20macOS&style=flat-square)](https://travis-ci.org/limix/progressbar) [![Windows build](https://img.shields.io/appveyor/ci/horta/progressbar/master.svg?label=Windows&style=flat-square)](https://ci.appveyor.com/project/Horta/progressbar/branch/master)
+[![Release](http://github-release-version.herokuapp.com/github/limix/progressbar/release.svg?style=flat-square)](https://github.com/limix/progressbar/releases/latest) [![Linux / macOS build](https://img.shields.io/travis/limix/progressbar/master.svg?label=Linux%20%2F%20macOS&style=flat-square)](https://travis-ci.org/limix/progressbar) [![Windows build](https://img.shields.io/appveyor/ci/horta/progressbar/master.svg?label=Windows&style=flat-square)](https://ci.appveyor.com/project/Horta/progressbar/branch/master)
 
 ProgressBar is a C library for displaying attractive progress bars on the command line.
 It's heavily influenced by the ruby ProgressBar gem, whose api and behaviour it imitates.

VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

install.bat

@@ -7,6 +7,8 @@ set FILE=progressbar-%VERSION%.zip
 set DIR=progressbar-%VERSION%
 set URL=https://github.com/limix/progressbar/archive/%VERSION%.zip
 
+echo [0/5] Library(progressbar==%VERSION%)
+
 :: Ancient Windows don't support TLS 1.1 and 1.2, so we fall back to insecure download.
 set Version=
 for /f "skip=1" %%v in ('wmic os get version') do if not defined Version set Version=%%v
@@ -40,15 +42,13 @@ curl %CURL_INSECURE% -fsS -o %FILE% -L %URL% >>%LOG_FILE% 2>&1
 if %ERRORLEVEL% NEQ 0 (echo FAILED. && echo Log can be found at %LOG_FILE%. && exit /B 1) else (echo done.)
 
 echo|set /p="[2/5] Extracting... "
-rem 7z x %FILE% -y >>%LOG_FILE% 2>&1
 powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('%FILE%', '.'); }"
-
 if %ERRORLEVEL% NEQ 0 (echo FAILED. && echo Log can be found at %LOG_FILE%. && exit /B 1) else (echo done.)
 
 cd %DIR% && mkdir build && cd build
 
 echo|set /p="[3/5] Configuring... "
-cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release >>%LOG_FILE% 2>&1
+cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%programfiles%\progressbar" >>%LOG_FILE% 2>&1
 if %ERRORLEVEL% NEQ 0 (echo FAILED. && echo Log can be found at %LOG_FILE%. && exit /B 1) else (echo done.)
 
 echo|set /p="[4/5] Compiling... "
@@ -57,6 +57,7 @@ if %ERRORLEVEL% NEQ 0 (echo FAILED. && echo Log can be found at %LOG_FILE%. && e
 
 echo|set /p="[5/5] Installing... "
 nmake install >>%LOG_FILE% 2>&1
+set PATH=%PATH%;%programfiles%\progressbar\bin
 if %ERRORLEVEL% NEQ 0 (echo FAILED. && echo Log can be found at %LOG_FILE%. && exit /B 1) else (echo done.)
 
 cd %ORIGIN% >nul 2>&1