Merge branch 'develop'

Author: iMichka

.coveragerc

@@ -1,5 +1,5 @@
 [run]
-source = pygccxml,docs/example,unittests
+source = pygccxml,docs/examples,unittests
 # unittest/misc contains some tests that are just there for debugging
 # purposes and which do not need to be covered.
 omit = unittests/misc

.gitattributes

@@ -0,0 +1 @@
+README.rst merge=ours

.gitignore

@@ -9,4 +9,6 @@ dist
 build
 pygccxml.egg-info
 *.prof
-.coverage
+.coverage*
+docs/examples/caching/example.hpp.xml
+test_cost.log

.travis.yml

@@ -27,6 +27,68 @@ matrix:
     - os: linux
       python: 3.5
       env: XML_GENERATOR="castxml"
+    - os: linux
+      python: 3.5
+      env:
+       - XML_GENERATOR="castxml"
+       - COMPILER=g++-5
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+          # gcc 5.2.1
+            - g++-5
+    - os: linux
+      dist: trusty
+      sudo: required
+      python: 3.5
+      env: XML_GENERATOR="castxml"
+    - os: linux
+      dist: trusty
+      sudo: required
+      python: 3.5
+      env:
+         # gcc 4.8.2 with c++03
+         - XML_GENERATOR="castxml"
+         - CPPSTD="-std=c++03"
+    - os: linux
+      dist: trusty
+      sudo: required
+      python: 3.5
+      env:
+         # gcc 4.8.2 with c++11
+         - XML_GENERATOR="castxml"
+         - CPPSTD="-std=c++11"
+    - os: linux
+      dist: trusty
+      sudo: required
+      python: 3.5
+      env:
+       - XML_GENERATOR="castxml"
+       - COMPILER=g++-5
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            # gcc 5.3.0
+            - g++-5
+    - os: linux
+      dist: trusty
+      sudo: required
+      python: 3.5
+      env:
+       - XML_GENERATOR="castxml"
+       - COMPILER=g++-5
+       - CPPSTD="-std=c++14"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            # gcc 5.3.0
+            - g++-5
     - os: osx
       osx_image: xcode7.2
       language: generic
@@ -52,13 +114,13 @@ before_install:
   # Download castxml binaries
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
       if [ ! -e ${HOME}/castxml ]; then
-        curl https://midas3.kitware.com/midas/download/item/318762/castxml-macosx.tar.gz | tar zxf - -C ${HOME};
+        wget -O - https://midas3.kitware.com/midas/download/bitstream/460403/castxml-macosx.tar.gz | tar zxf - -C ${HOME};
       fi;
     fi
 
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ $XML_GENERATOR == "castxml" ]]; then
       if [ ! -e ${HOME}/castxml ]; then
-        wget -O - https://midas3.kitware.com/midas/download/item/318227/castxml-linux.tar.gz | tar zxf - -C ${HOME};
+        wget -O - https://midas3.kitware.com/midas/download/bitstream/460468/castxml-linux.tar.gz | tar zxf - -C ${HOME};
       fi;
     fi
 
@@ -71,6 +133,26 @@ before_install:
   - if [[ "$XML_GENERATOR" == "gccxml" ]]; then sudo apt-get update -qq; fi
   - if [[ "$XML_GENERATOR" == "gccxml" ]]; then sudo apt-get install -qq gccxml; fi
 
+  # Patch the c++ version to test on the fly
+  - if [[ $CPPSTD == "-std=c++03" ]]; then
+      cd unittests && sed -i s%compiler=None,%compiler=None,\\n\ \ \ \ \ \ \ \ cflags=\"-std=c++03\",%g autoconfig.py && cd ..;
+    fi
+
+  # Patch the c++ version to test on the fly
+  - if [[ $CPPSTD == "-std=c++11" ]]; then
+      cd unittests && sed -i s%compiler=None,%compiler=None,\\n\ \ \ \ \ \ \ \ cflags=\"-std=c++11\",%g autoconfig.py && cd ..;
+    fi
+
+  # Patch the c++ version to test on the fly
+  - if [[ $CPPSTD == "-std=c++14" ]]; then
+      cd unittests && sed -i s%compiler=None,%compiler=None,\\n\ \ \ \ \ \ \ \ cflags=\"-std=c++14\",%g autoconfig.py && cd ..;
+    fi
+
+  # Patch the compiler path on the fly for gcc5 testing
+  - if [[ "$COMPILER" == "g++-5" ]] && [[ $XML_GENERATOR == "castxml" ]]; then
+      cd unittests && sed -i s%compiler=None%compiler=\"/usr/bin/g++-5\"%g autoconfig.py && cd ..;
+    fi
+
   # Install pep8, needed by the unit tests
   - pip install pep8