Merge pull request #41 from ctabin/travis-ci

Integration with Travis CI

Author: ctabin

.travis.yml

@@ -0,0 +1,26 @@
+dist: trusty
+language: cpp
+compiler: gcc
+
+matrix:
+  include:
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-8
+      env:
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+
+before_install:
+    - eval "${MATRIX_EVAL}"
+
+install:
+  - sudo apt-get install libbz2-dev valgrind
+  - make libraries
+
+script:
+  - make
+  - make tests

Makefile

@@ -1,4 +1,3 @@
-CC=g++
 CFLAGS=-W -Wall -Wextra -ansi -pedantic -std=c++0x
 OBJ=obj
 LIB=lib
@@ -17,21 +16,21 @@ all: libzippp-static libzippp-shared
 libzippp-compile:
 	rm -rf $(OBJ)
 	mkdir $(OBJ)
-	$(CC) -g -fPIC -c -I$(LIBZIP)/lib -I$(LIBZIP)/build -o $(OBJ)/libzippp.o $(CFLAGS) src/libzippp.cpp
+	$(CXX) -g -fPIC -c -I$(LIBZIP)/lib -I$(LIBZIP)/build -o $(OBJ)/libzippp.o $(CFLAGS) src/libzippp.cpp
 
 libzippp-static: libzippp-compile
 	ar rvs libzippp.a $(OBJ)/libzippp.o
 
 libzippp-shared: libzippp-compile
-	$(CC) -shared -o libzippp.so $(OBJ)/libzippp.o
+	$(CXX) -shared -o libzippp.so $(OBJ)/libzippp.o
 
 libzippp-tests: libzippp-static libzippp-shared
 	if [ -d $(ZLIB) ]; then \
-		$(CC) -o test_static -I$(ZLIB) -I$(LIBZIP)/lib -Isrc $(CFLAGS) tests/tests.cpp libzippp.a $(LIBZIP)/build/lib/libzip.a $(ZLIB)/libz.a $(CRYPTO_FLAGS); \
-		$(CC) -o test_shared -I$(ZLIB) -I$(LIBZIP)/lib -Isrc $(CFLAGS) tests/tests.cpp -L. -L$(LIBZIP)/build/lib -L$(ZLIB) -lzippp -lzip -lz $(CRYPTO_FLAGS) -Wl,-rpath=.; \
+		$(CXX) -o test_static -I$(ZLIB) -I$(LIBZIP)/lib -Isrc $(CFLAGS) tests/tests.cpp libzippp.a $(LIBZIP)/build/lib/libzip.a $(ZLIB)/libz.a -lbz2 $(CRYPTO_FLAGS); \
+		$(CXX) -o test_shared -I$(ZLIB) -I$(LIBZIP)/lib -Isrc $(CFLAGS) tests/tests.cpp -L. -L$(LIBZIP)/build/lib -L$(ZLIB) -lzippp -lzip -lz -lbz2 $(CRYPTO_FLAGS) -Wl,-rpath=.; \
 	else \
-		$(CC) -o test_static -I$(LIBZIP)/lib -Isrc $(CFLAGS) tests/tests.cpp libzippp.a $(LIBZIP)/build/lib/libzip.a -lz $(CRYPTO_FLAGS)o; \
-		$(CC) -o test_shared -I$(LIBZIP)/lib -Isrc $(CFLAGS) tests/tests.cpp -L. -L$(LIBZIP)/build/lib -lzippp -lzip -lz $(CRYPTO_FLAGS) -Wl,-rpath=.; \
+		$(CXX) -o test_static -I$(LIBZIP)/lib -Isrc $(CFLAGS) tests/tests.cpp libzippp.a $(LIBZIP)/build/lib/libzip.a -lz -lbz2 $(CRYPTO_FLAGS); \
+		$(CXX) -o test_shared -I$(LIBZIP)/lib -Isrc $(CFLAGS) tests/tests.cpp -L. -L$(LIBZIP)/build/lib -lzippp -lzip -lz -lbz2 $(CRYPTO_FLAGS) -Wl,-rpath=.; \
 	fi;
 
 clean-tests:

README.md

@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/ctabin/libzippp.svg?branch=master)](https://travis-ci.org/ctabin/libzippp)
 
 libzippp
 --------
@@ -20,16 +21,16 @@ Underlying libraries:
 
 ### LINUX
 
-0. Make sure you have the following commands: ```g++``` ```make``` ```tar``` ```wget```
-1. Download and compile the libraries (zlib and libzip) with the command: ```make libraries```
-2. Then create the static and shared libraries of libzippp: ```make```
-3. You may want to run the tests (optional): ```make tests```
+0. Make sure you have the following commands: `g++` `make` `tar` `wget`
+1. Download and compile the libraries (zlib and libzip) with the command: `make libraries`
+2. Then create the static and shared libraries of libzippp: `make`
+3. You may want to run the tests (optional): `make tests` (`libbz2-dev` package is needed to link statically)
 4. Now you just have to include the src folder in your include path and
   link against *libzippp.a* or *libzippp.so* (do not forget to also link 
   against libzip libraries in *lib/libzip-1.5.1/lib/.libs/*).
   An example of compilation with g++:
 
-```Shell
+```shell
 g++ -I./lib/libzip-1.5.1/lib -I./src \
     main.cpp libzippp.a \
     lib/libzip-1.5.1/lib/.libs/libzip.a \
@@ -203,11 +204,11 @@ You might already have libzip compiled elsewhere on your system. Hence, you
 don't need to run 'make libzip'. Instead, just put the libzip location when
 you compile libzipp:
 
-```Shell
+```shell
 make LIBZIP=path/to/libzip
 ```
 
-Under Debian, you'll have to install the package *zlib1g-dev* in order to compile
+Under Debian, you'll have to install the package `zlib1g-dev` in order to compile
 if you don't want to install zlib manually.
 
 ### WINDOWS