From: khizmax Date: Fri, 8 Sep 2017 05:39:01 +0000 (+0300) Subject: CI: added clang-5 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=49c0aa6b50ba412f206f06419adf1bf2213ae373 CI: added clang-5 --- diff --git a/build/CI/VASEx-CI-2/cds-libs b/build/CI/VASEx-CI-2/cds-libs index acc24ad8..6baa98e7 100644 --- a/build/CI/VASEx-CI-2/cds-libs +++ b/build/CI/VASEx-CI-2/cds-libs @@ -65,7 +65,7 @@ gcc-7-root: $GCC7_ROOT/bin gcc-7-cxx: g++-7 gcc-7-cc: gcc-7 gcc-7-boost: $BOOST_ROOT -gcc-7-cxxflags: -march=native +gcc-7-cxxflags: -march=native -Waligned-new gcc-7-exe-ldflags: -Wl,-rpath=$GCC7_ROOT/lib64 gcc-7-extlib: rt gcc-7-64-boost-lib: stage64-gcc7/lib @@ -152,6 +152,25 @@ clang-4-gtest: $GTEST_ROOT clang-4-64-gtest-lib: $GTEST_ROOT/lib-clang4/libgtest.a +######################################## +# clang-5 +clang-5-root: $CLANG5_ROOT/bin +clang-5-cxx: clang++ +clang-5-cc: clang +clang-5-cxxflags: -stdlib=libc++ -Wdocumentation +clang-5-exe-ldflags: -L$CLANG5_ROOT/lib -Wl,-rpath=$CLANG5_ROOT/lib +clang-5-extlib: rt +clang-5-boost: $BOOST_ROOT +clang-5-64-boost-lib: stage64-clang5/lib +clang-5-64-asan-boost-lib: stage64-clang5-asan/lib +clang-5-64-tsan-boost-lib: stage64-clang5-tsan/lib +clang-5-gtest: $GTEST_ROOT +clang-5-64-gtest-lib: $GTEST_ROOT/lib-clang5/libgtest.a + + + + + diff --git a/build/CI/VASEx-CI-2/ci-build b/build/CI/VASEx-CI-2/ci-build index 6ba9b7b4..3f3c194f 100755 --- a/build/CI/VASEx-CI-2/ci-build +++ b/build/CI/VASEx-CI-2/ci-build @@ -11,52 +11,57 @@ env|sort case "$TOOLSET" in "x64-gcc-4.8") echo "GCC-4.8 '$BUILD_TYPE', toolset root: $GCC48_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-4.8-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-4.8-64 $* EXIT_CODE=$? ;; "x64-gcc-4.9") echo "GCC-4.9 '$BUILD_TYPE', toolset root: $GCC49_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-4.9-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-4.9-64 $* EXIT_CODE=$? ;; "x64-gcc-5") echo "GCC-5 '$BUILD_TYPE', toolset root: $GCC5_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-5-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-5-64 $* EXIT_CODE=$? ;; "x64-gcc-6") echo "GCC-6 '$BUILD_TYPE', toolset root: $GCC6_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-6-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-6-64 $* EXIT_CODE=$? ;; "x64-gcc-7") echo "GCC-7 '$BUILD_TYPE', toolset root: $GCC7_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-7-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-7-64 $* EXIT_CODE=$? ;; "x64-clang-3.6") echo "clang-3.6 '$BUILD_TYPE', toolset root: $CLANG36_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.6-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.6-64 $* EXIT_CODE=$? ;; "x64-clang-3.7") echo "clang-3.7 '$BUILD_TYPE', toolset root: $CLANG37_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.7-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.7-64 $* EXIT_CODE=$? ;; "x64-clang-3.8") echo "clang-3.8 '$BUILD_TYPE', toolset root: $CLANG38_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.8-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.8-64 $* EXIT_CODE=$? ;; "x64-clang-3.9") echo "clang-3.9 '$BUILD_TYPE', toolset root: $CLANG39_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.9-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.9-64 $* EXIT_CODE=$? ;; "x64-clang-4") echo "clang-4 '$BUILD_TYPE', toolset root: $CLANG4_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-4-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-4-64 $* + EXIT_CODE=$? + ;; + "x64-clang-5") + echo "clang-5 '$BUILD_TYPE', toolset root: $CLANG5_ROOT" + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-5-64 $* EXIT_CODE=$? ;; * ) diff --git a/build/CI/VASEx-CI-2/ci-env b/build/CI/VASEx-CI-2/ci-env index 32a50b4b..ef935e9b 100644 --- a/build/CI/VASEx-CI-2/ci-env +++ b/build/CI/VASEx-CI-2/ci-env @@ -17,12 +17,14 @@ CLANG37_ROOT=$TOOLSET_ROOT/clang-3.7 CLANG38_ROOT=$TOOLSET_ROOT/clang-3.8 CLANG39_ROOT=$TOOLSET_ROOT/clang-3.9 CLANG4_ROOT=$TOOLSET_ROOT/clang-4 +CLANG5_ROOT=$TOOLSET_ROOT/clang-5 CLANG_STDLIB="-stdlib=libc++" CLANG37_CXXFLAGS=$CLANG_STDLIB CLANG38_CXXFLAGS=$CLANG_STDLIB CLANG39_CXXFLAGS=$CLANG_STDLIB CLANG4_CXXFLAGS=$CLANG_STDLIB +CLANG5_CXXFLAGS=$CLANG_STDLIB LIB_ROOT=$HOME/lib BOOST_ROOT=$LIB_ROOT/boost diff --git a/build/CI/VASEx-CI/cds-libs b/build/CI/VASEx-CI/cds-libs index 6a4c646e..fceec590 100644 --- a/build/CI/VASEx-CI/cds-libs +++ b/build/CI/VASEx-CI/cds-libs @@ -58,11 +58,11 @@ gcc-6-64-gtest-lib: $GTEST_ROOT/lib-gcc6/libgtest.a ######################################## #GCC-7 -gcc-7-root: $GCC6_ROOT/bin +gcc-7-root: $GCC7_ROOT/bin gcc-7-cxx: g++-7 gcc-7-cc: gcc-7 gcc-7-boost: $BOOST_ROOT -gcc-7-cxxflags: -march=native +gcc-7-cxxflags: -march=native -Waligned-new gcc-7-exe-ldflags: -Wl,-rpath=$GCC7_ROOT/lib64 gcc-7-64-boost-lib: stage64-gcc7/lib gcc-7-64-asan-boost-lib: stage64-gcc7-asan/lib @@ -139,6 +139,19 @@ clang-4-64-tsan-boost-lib: stage64-clang4-tsan/lib clang-4-gtest: $GTEST_ROOT clang-4-64-gtest-lib: $GTEST_ROOT/lib-clang4/libgtest.a +######################################## +# clang-5 +clang-5-root: $CLANG5_ROOT/bin +clang-5-cxx: clang++ +clang-5-cc: clang +clang-5-cxxflags: -stdlib=libc++ -Wdocumentation +clang-5-exe-ldflags: -L$CLANG5_ROOT/lib -Wl,-rpath=$CLANG5_ROOT/lib +clang-5-boost: $BOOST_ROOT +clang-5-64-boost-lib: stage64-clang5/lib +clang-5-64-asan-boost-lib: stage64-clang5-asan/lib +clang-5-64-tsan-boost-lib: stage64-clang5-tsan/lib +clang-5-gtest: $GTEST_ROOT +clang-5-64-gtest-lib: $GTEST_ROOT/lib-clang5/libgtest.a diff --git a/build/CI/VASEx-CI/ci-build b/build/CI/VASEx-CI/ci-build index 95656abf..02e8cce1 100755 --- a/build/CI/VASEx-CI/ci-build +++ b/build/CI/VASEx-CI/ci-build @@ -11,52 +11,57 @@ env|sort case "$TOOLSET" in "x64-gcc-4.8") echo "GCC-4.8 '$BUILD_TYPE', toolset root: $GCC48_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-4.8-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-4.8-64 $* exit $? ;; "x64-gcc-4.9") echo "GCC-4.9 '$BUILD_TYPE', toolset root: $GCC49_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-4.9-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-4.9-64 $* exit $? ;; "x64-gcc-5") echo "GCC-5 '$BUILD_TYPE', toolset root: $GCC5_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-5-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-5-64 $* exit $? ;; "x64-gcc-6") echo "GCC-6 '$BUILD_TYPE', toolset root: $GCC6_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-6-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-6-64 $* exit $? ;; "x64-gcc-7") echo "GCC-7 '$BUILD_TYPE', toolset root: $GCC7_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-7-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-7-64 $* exit $? ;; "x64-clang-3.6") echo "clang-3.6 '$BUILD_TYPE', toolset root: $CLANG36_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.6-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.6-64 $* exit $? ;; "x64-clang-3.7") echo "clang-3.7 '$BUILD_TYPE', toolset root: $CLANG37_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.7-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.7-64 $* exit $? ;; "x64-clang-3.8") echo "clang-3.8 '$BUILD_TYPE', toolset root: $CLANG38_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.8-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.8-64 $* exit $? ;; "x64-clang-3.9") echo "clang-3.9 '$BUILD_TYPE', toolset root: $CLANG39_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.9-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.9-64 $* exit $? ;; "x64-clang-4") echo "clang-4 '$BUILD_TYPE', toolset root: $CLANG4_ROOT" - $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-4-64 + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-4-64 $* + exit $? + ;; + "x64-clang-5") + echo "clang-5 '$BUILD_TYPE', toolset root: $CLANG5_ROOT" + $CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-5-64 $* exit $? ;; * ) diff --git a/build/CI/VASEx-CI/ci-env b/build/CI/VASEx-CI/ci-env index 3c6fe156..1b06ceae 100644 --- a/build/CI/VASEx-CI/ci-env +++ b/build/CI/VASEx-CI/ci-env @@ -18,12 +18,14 @@ CLANG37_ROOT=$TOOLSET_ROOT/clang-3.7 CLANG38_ROOT=$TOOLSET_ROOT/clang-3.8 CLANG39_ROOT=$TOOLSET_ROOT/clang-3.9 CLANG4_ROOT=$TOOLSET_ROOT/clang-4 +CLANG5_ROOT=$TOOLSET_ROOT/clang-5 CLANG_STDLIB="-stdlib=libc++" CLANG37_CXXFLAGS=$CLANG_STDLIB CLANG38_CXXFLAGS=$CLANG_STDLIB CLANG39_CXXFLAGS=$CLANG_STDLIB CLANG4_CXXFLAGS=$CLANG_STDLIB +CLANG5_CXXFLAGS=$CLANG_STDLIB LIB_ROOT=$HOME/lib BOOST_ROOT=$LIB_ROOT/boost diff --git a/build/CI/gen-all b/build/CI/gen-all index c841a0f3..ebd9de33 100755 --- a/build/CI/gen-all +++ b/build/CI/gen-all @@ -12,6 +12,10 @@ ./cmake-gen gcc-6 64 rel ./cmake-gen gcc-6 64 tsan ./cmake-gen gcc-6 64 asan +./cmake-gen gcc-7 64 dbg +./cmake-gen gcc-7 64 rel +./cmake-gen gcc-7 64 tsan +./cmake-gen gcc-7 64 asan ./cmake-gen clang-3.6 64 dbg ./cmake-gen clang-3.6 64 rel ./cmake-gen clang-3.7 64 dbg @@ -25,4 +29,8 @@ ./cmake-gen clang-4 64 dbg ./cmake-gen clang-4 64 rel ./cmake-gen clang-4 64 asan -./cmake-gen clang-4 64 tsan \ No newline at end of file +./cmake-gen clang-4 64 tsan +./cmake-gen clang-5 64 dbg +./cmake-gen clang-5 64 rel +./cmake-gen clang-5 64 asan +./cmake-gen clang-5 64 tsan \ No newline at end of file