Merge pull request #196 from stlab/develop

Release 1.3.3
stlab · Oct 25, 2018 · 278d1b0 · 278d1b0
2 parents 3cb8d9b + 1a9ec94
commit 278d1b0
Show file tree

Hide file tree

Showing 46 changed files with 810 additions and 446 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -43,12 +43,7 @@ build_script:
   - IF EXIST build RMDIR /S /Q build
   - MKDIR build
   - cd build
-  - cmake -G "Visual Studio 15 Win64" -D BOOST_ROOT=C:/Libraries/boost_1_65_1 -D CMAKE_BUILD_TYPE=debug -D stlab_testing=ON -D coroutine=ON ..
-  - cmake  --build .
-  - test\Debug\stlab.test.channel.test --log_level=message
-  - test\Debug\stlab.test.cow.test --log_level=message
-  - test\Debug\stlab.test.future.test --log_level=message
-  - test\Debug\stlab.test.serial_queue.test.exe
-  - test\Debug\stlab.test.task.test --log_level=message
-  - test\Debug\stlab.test.tuple.test --log_level=message
+  - cmake -G "Visual Studio 15 2017 Win64" -D BOOST_ROOT=C:/Libraries/boost_1_65_1 -D CMAKE_BUILD_TYPE=debug -D Boost_USE_STATIC_LIBS=ON ..
+  - cmake --build . --config Release
+  - ctest -C Release 
 
diff --git a/.travis.yml b/.travis.yml
@@ -10,17 +10,16 @@ cache:
 addons:
   apt:
     sources:
-      - sourceline: "deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.8 main"
-        key_url : "http://apt.llvm.org/llvm-snapshot.gpg.key"
+      - sourceline: deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.8 main
+        key_url: http://apt.llvm.org/llvm-snapshot.gpg.key
       - ubuntu-toolchain-r-test
-#      - george-edison55-precise-backports
     packages:
       - g++-5
       - clang-3.8
 
 branches:
   except: /pr\/.*/
-  
+
 matrix:
   include:
     #
@@ -34,13 +33,14 @@ matrix:
         - brew upgrade python
         - brew uninstall libyaml
         - pip3 install --no-cache-dir pyyaml
-        - pip3 install conan
+        - pip3 install --user conan
+        - export PATH=$PATH:/Users/travis/Library/Python/3.7/bin
         - ./enhance_conan.sh
 
       env:
         build_type=debug
-        options="-D stlab_testing=ON"
-        
+        options=""
+
     - os: osx
       compiler: clang
       osx_image: xcode9
@@ -49,27 +49,40 @@ matrix:
         - brew upgrade python
         - brew uninstall libyaml
         - pip3 install --no-cache-dir pyyaml
-        - pip3 install conan
+        - pip3 install --user conan
+        - export PATH=$PATH:/Users/travis/Library/Python/3.7/bin
         - ./enhance_conan.sh
 
       env:
         build_type=release
-        options="-D stlab_testing=ON"
+        options=""
 
     #
-    # Linux Clang, Debug & Release
+    # Linux Clang, Debug & Release, with and without coroutines
     #
     - os: linux
       compiler: clang
       env:
         build_type=debug
-        options="-D stlab_testing=ON"
-        
+        options=""
+
     - os: linux
       compiler: clang
       env:
         build_type=release
-        options="-D stlab_testing=ON"
+        options=""
+
+#    - os: linux
+#      compiler: clang
+#      env:
+#        build_type=debug
+#        options="-Dstlab.coroutines=ON"
+#
+#    - os: linux
+#      compiler: clang
+#      env:
+#        build_type=release
+#        options="-Dstlab.coroutines=ON"
 
     #
     # Linux GCC, Debug & Release
@@ -78,13 +91,13 @@ matrix:
       compiler: gcc
       env:
         build_type=debug
-        options="-D stlab_testing=ON"
+        options=""
 
     - os: linux
       compiler: gcc
       env:
         build_type=release
-        options="-D stlab_testing=ON"
+        options=""
 
     #
     # Address sanitizer
@@ -93,8 +106,8 @@ matrix:
       compiler: clang
       env:
         build_type=debug
-        flags="-fsanitize=address;-fno-omit-frame-pointer;"
-        options="-D stlab_testing=ON"
+        flags="-fsanitize=address -fno-omit-frame-pointer -fno-sanitize-recover=all"
+        options=""
 
     #
     # Undefined behavior sanitizer
@@ -103,8 +116,8 @@ matrix:
       compiler: clang
       env:
         build_type=debug
-        flags="-fsanitize=undefined;-fno-omit-frame-pointer;"
-        options="-D stlab_testing=ON"
+        flags="-fsanitize=undefined -fno-omit-frame-pointer -fno-sanitize-recover=all"
+        options=""
 
     #
     # Thread sanitizer
@@ -114,8 +127,8 @@ matrix:
       env:
         build_type=debug
         TSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions"
-        flags="-fsanitize=thread;-fno-omit-frame-pointer;"
-        options="-D stlab_testing=ON"
+        flags="-fsanitize=thread -fno-omit-frame-pointer -fno-sanitize-recover=all"
+        options=""
 
     #
     # Coverage
@@ -125,7 +138,7 @@ matrix:
       env:
         build_type=debug
         coverage=TRUE
-        options="-D stlab_testing=ON -D coverage=ON"
+        options="-D stlab.coverage=ON"
       packages:
         - lcov
       after_success:
@@ -139,18 +152,17 @@ matrix:
       compiler: clang
       env:
         build_type=debug
-        options="-D stlab_testing=ON"
+        options=""
       before_install:
         - pip install --user conan
         - ./enhance_conan.sh
         - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
       addons:
         apt:
           sources:
-            - sourceline: "deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.8 main"
-              key_url : "http://apt.llvm.org/llvm-snapshot.gpg.key"
+            - sourceline: deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.8 main
+              key_url: http://apt.llvm.org/llvm-snapshot.gpg.key
             - ubuntu-toolchain-r-test
-#            - george-edison55-precise-backports
           packages:
             - g++-5
             - clang-3.8
@@ -166,9 +178,9 @@ matrix:
 
 before_install:
   - pip install --user conan
-  - ./enhance_conan.sh  
-  
-  
+  - ./enhance_conan.sh
+
+
 install:
   ############################################################################
   # All the dependencies are installed in ${HOME}/deps/
@@ -188,17 +200,17 @@ install:
       brew install cmake || brew upgrade cmake
     fi
   - cmake --version
-  
+
   ############################################################################
   # Go back to the root of the project and setup the build directory
   ############################################################################  
   - cd "${TRAVIS_BUILD_DIR}"
-  
-  
+
+
 script:
   - .travis/build.sh
 
-  
+
 notifications:
   recipients:
     - [email protected]

diff --git a/.travis/build.sh b/.travis/build.sh
@@ -27,8 +27,7 @@ if [ "$NPROC" == "" ] ; then
   NPROC=`nproc`
 fi
 
-if [ ! -z "$flags" ]; then extra_flags="-D stlab_appended_flags=$flags"; fi
-
+if [ ! -z "$flags" ]; then extra_flags="-D CMAKE_CXX_FLAGS=$flags"; fi
 cmake -D CMAKE_BUILD_TYPE=$build_type $options $extra_flags ..
 if [ $? -ne 0 ]; then exit 1; fi
 

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,12 @@
+## v1.3.3 - 2018 - October - 25
+
+- Fixed Issues 
+   - [#154](https://github.com/stlab/libraries/issues/154) : Compilation error with gcc
+   - Race condition in timed blocking_get
+
+- Enhancements
+   - The library can now be included as cmake dependency (Many thanks to Austin McCartney)  
+
 ## v1.3.2 - 2018 - July - 28
 
 - Fixed Issues