Updated CI build machine configs
authorkhizmax <libcds.dev@gmail.com>
Mon, 13 Mar 2017 20:36:19 +0000 (23:36 +0300)
committerkhizmax <libcds.dev@gmail.com>
Mon, 13 Mar 2017 20:36:19 +0000 (23:36 +0300)
build/CI/VASEx-CI-2/cds-libs
build/CI/VASEx-CI-2/ci-build
build/CI/VASEx-CI-2/ci-env
build/CI/VASEx-CI/cds-libs
build/CI/VASEx-CI/ci-build
build/CI/VASEx-CI/ci-env
build/CI/cmake-gen
build/CI/gen-all

index 86cee66..6b27eb7 100644 (file)
@@ -11,7 +11,7 @@ gtest-include:          $GTEST_ROOT/googletest/include
 gcc-4.8-root:           $GCC48_ROOT/bin
 gcc-4.8-cxx:            g++-4.8
 gcc-4.8-cc:             gcc-4.8
-gcc-4.8-exe-ldflags:    -L$GCC48_ROOT/lib -Wl,-rpath=$GCC48_ROOT/lib
+gcc-4.8-exe-ldflags:    -L$GCC48_ROOT/lib64 -Wl,-rpath=$GCC48_ROOT/lib64
 gcc-4.8-extlib:         rt
 gcc-4.8-boost:          $BOOST_ROOT
 gcc-4.8-64-boost-lib:   stage64-gcc4.8/lib
@@ -80,8 +80,8 @@ clang-3.7-ld-lib-path:    $GCC6_ROOT/lib64
 clang-3.7-cxx:            clang++
 clang-3.7-cc:             clang
 clang-3.7-cxxflags:       -stdlib=libc++ -Wdocumentation
-clang-3.7-exe-ldflags:    -L$CLANG37_ROOT/lib -Wl,-rpath=$CLANG37_ROOT/lib
-clang-3.7-extlib:         rt c++abi
+clang-3.7-exe-ldflags:    -L$CLANG37_ROOT/lib -Wl,-rpath=$CLANG37_ROOT/lib -lc++abi
+clang-3.7-extlib:         rt
 clang-3.7-boost:          $BOOST_ROOT
 clang-3.7-64-boost-lib:   stage64-clang3.7/lib
 clang-3.7-gtest:          $GTEST_ROOT
@@ -121,6 +121,21 @@ clang-3.9-gtest:          $GTEST_ROOT
 clang-3.9-64-gtest-lib:   $GTEST_ROOT/lib-clang3.9/libgtest.a
 
 
+########################################
+# clang-4
+clang-4-root:           $CLANG4_ROOT/bin
+clang-4-cxx:            clang++
+clang-4-cc:             clang
+clang-4-cxxflags:       -stdlib=libc++ -Wdocumentation
+clang-4-exe-ldflags:    -L$CLANG4_ROOT/lib -Wl,-rpath=$CLANG4_ROOT/lib
+clang-4-extlib:         rt
+clang-4-boost:          $BOOST_ROOT
+clang-4-64-boost-lib:   stage64-clang4/lib
+clang-4-64-asan-boost-lib:   stage64-clang4-asan/lib
+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
+
 
 
 
index 2dddd2d..ec8394e 100755 (executable)
@@ -49,6 +49,11 @@ case "$TOOLSET" in
        $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
+       EXIT_CODE=$?
+       ;;
     * )
        echo "Undefined toolset '$TOOLSET'"
        exit 1
index 189c56c..23b1c84 100644 (file)
@@ -15,11 +15,13 @@ CLANG36_ROOT=$TOOLSET_ROOT/clang-3.6
 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
 
 CLANG_STDLIB="-stdlib=libc++"
 CLANG37_CXXFLAGS=$CLANG_STDLIB
 CLANG38_CXXFLAGS=$CLANG_STDLIB
 CLANG39_CXXFLAGS=$CLANG_STDLIB
+CLANG4_CXXFLAGS=$CLANG_STDLIB
 
 LIB_ROOT=$HOME/lib
 BOOST_ROOT=$LIB_ROOT/boost
index f0b391d..b4417f8 100644 (file)
@@ -11,7 +11,7 @@ gtest-include:          $GTEST_ROOT/googletest/include
 gcc-4.8-root:           $GCC48_ROOT/bin
 gcc-4.8-cxx:            g++-4.8
 gcc-4.8-cc:             gcc-4.8
-gcc-4.8-exe-ldflags:    -L$GCC48_ROOT/lib -Wl,-rpath=$GCC48_ROOT/lib
+gcc-4.8-exe-ldflags:    -L$GCC48_ROOT/lib64 -Wl,-rpath=$GCC48_ROOT/lib64
 gcc-4.8-boost:          $BOOST_ROOT
 gcc-4.8-64-boost-lib:   stage64-gcc4.8/lib
 gcc-4.8-gtest:          $GTEST_ROOT
@@ -58,7 +58,7 @@ gcc-6-64-gtest-lib:   $GTEST_ROOT/lib-gcc6/libgtest.a
 ########################################
 # clang-3.6
 clang-3.6-root:           $CLANG36_ROOT/bin
-clang-3.6-ld-lib-path:    $GCC5_ROOT/lib64
+clang-3.6-ld-lib-path:    $GCC6_ROOT/lib64
 clang-3.6-cxx:            clang++
 clang-3.6-cc:             clang
 clang-3.6-cxxflags:       -Wdocumentation
@@ -109,6 +109,20 @@ clang-3.9-gtest:          $GTEST_ROOT
 clang-3.9-64-gtest-lib:   $GTEST_ROOT/lib-clang3.9/libgtest.a
 
 
+########################################
+# clang-4
+clang-4-root:           $CLANG4_ROOT/bin
+clang-4-cxx:            clang++
+clang-4-cc:             clang
+clang-4-cxxflags:       -stdlib=libc++ -Wdocumentation
+clang-4-exe-ldflags:    -L$CLANG4_ROOT/lib -Wl,-rpath=$CLANG4_ROOT/lib
+clang-4-boost:          $BOOST_ROOT
+clang-4-64-boost-lib:   stage64-clang4/lib
+clang-4-64-asan-boost-lib:   stage64-clang4-asan/lib
+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
+
 
 
 
index 9923a19..32f00a1 100755 (executable)
@@ -49,6 +49,11 @@ case "$TOOLSET" in
        $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
+       exit $?
+       ;;
     * )
        echo "Undefined toolset '$TOOLSET'"
        exit 1
index f79eabb..ac08807 100644 (file)
@@ -16,11 +16,13 @@ CLANG36_ROOT=$TOOLSET_ROOT/clang-3.6
 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
 
 CLANG_STDLIB="-stdlib=libc++"
 CLANG37_CXXFLAGS=$CLANG_STDLIB
 CLANG38_CXXFLAGS=$CLANG_STDLIB
 CLANG39_CXXFLAGS=$CLANG_STDLIB
+CLANG4_CXXFLAGS=$CLANG_STDLIB
 
 LIB_ROOT=$HOME/lib
 BOOST_ROOT=$LIB_ROOT/boost
index ce9c2ad..b38f806 100755 (executable)
@@ -31,7 +31,6 @@ my $ext_lib=get_prop("extlib");
 my $ld_lib_path=get_prop("ld-lib-path");
 my $cmake_flags=get_prop("cmake-flags");
 
-
 my $filename="cds-$build-$compiler-$bitness";
 open( my $out, ">", $filename )  or die "Cannot open cds-$build-$compiler-$bitness";
 
index 01224a1..c841a0f 100755 (executable)
@@ -21,4 +21,8 @@
 ./cmake-gen clang-3.9 64 dbg
 ./cmake-gen clang-3.9 64 rel
 ./cmake-gen clang-3.9 64 asan
-./cmake-gen clang-3.9 64 tsan
\ No newline at end of file
+./cmake-gen clang-3.9 64 tsan
+./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