From 3232dcdf01f879d9d5805a20cbf96284502e1109 Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 5 Mar 2017 21:37:39 +0300 Subject: [PATCH] Improved CI scripts --- build/CI/VASEx-CI-2/cds-libs | 15 ++++++++------- build/CI/VASEx-CI/cds-libs | 14 +++++++------- build/CI/cmake-gen | 2 ++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/build/CI/VASEx-CI-2/cds-libs b/build/CI/VASEx-CI-2/cds-libs index 6ad08453..86cee666 100644 --- a/build/CI/VASEx-CI-2/cds-libs +++ b/build/CI/VASEx-CI-2/cds-libs @@ -40,8 +40,8 @@ gcc-5-boost: $BOOST_ROOT gcc-5-exe-ldflags: -Wl,-rpath=$GCC5_ROOT/lib64 gcc-5-extlib: rt gcc-5-64-boost-lib: stage64-gcc5/lib -gcc-5-64-asan-boost-lib: stage64-gcc5-asan -gcc-5-64-tsan-boost-lib: stage64-gcc5-tsan +gcc-5-64-asan-boost-lib: stage64-gcc5-asan/lib +gcc-5-64-tsan-boost-lib: stage64-gcc5-tsan/lib gcc-5-gtest: $GTEST_ROOT gcc-5-64-gtest-lib: $GTEST_ROOT/lib-gcc5/libgtest.a @@ -54,8 +54,8 @@ gcc-6-boost: $BOOST_ROOT gcc-6-exe-ldflags: -Wl,-rpath=$GCC6_ROOT/lib64 gcc-6-extlib: rt gcc-6-64-boost-lib: stage64-gcc6/lib -gcc-6-64-asan-boost-lib: stage64-gcc6-asan -gcc-6-64-tsan-boost-lib: stage64-gcc6-tsan +gcc-6-64-asan-boost-lib: stage64-gcc6-asan/lib +gcc-6-64-tsan-boost-lib: stage64-gcc6-tsan/lib gcc-6-gtest: $GTEST_ROOT gcc-6-64-gtest-lib: $GTEST_ROOT/lib-gcc6/libgtest.a @@ -80,12 +80,13 @@ 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-exe-ldflags: -L$CLANG37_ROOT/lib -Wl,-rpath=$CLANG37_ROOT/lib clang-3.7-extlib: rt c++abi clang-3.7-boost: $BOOST_ROOT clang-3.7-64-boost-lib: stage64-clang3.7/lib clang-3.7-gtest: $GTEST_ROOT clang-3.7-64-gtest-lib: $GTEST_ROOT/lib-clang3.7/libgtest.a +clang-3.7-cmake-flags: -DCMAKE_C_COMPILER_WORKS=1 -DCMAKE_CXX_COMPILER_WORKS=1 ######################################## @@ -114,8 +115,8 @@ clang-3.9-exe-ldflags: -L$CLANG39_ROOT/lib -Wl,-rpath=$CLANG39_ROOT/lib clang-3.9-extlib: rt clang-3.9-boost: $BOOST_ROOT clang-3.9-64-boost-lib: stage64-clang3.9/lib -clang-3.9-64-asan-boost-lib: stage64-clang3.9-asan -clang-3.9-64-tsan-boost-lib: stage64-clang3.9-tsan +clang-3.9-64-asan-boost-lib: stage64-clang3.9-asan/lib +clang-3.9-64-tsan-boost-lib: stage64-clang3.9-tsan/lib clang-3.9-gtest: $GTEST_ROOT clang-3.9-64-gtest-lib: $GTEST_ROOT/lib-clang3.9/libgtest.a diff --git a/build/CI/VASEx-CI/cds-libs b/build/CI/VASEx-CI/cds-libs index d317734d..f0b391de 100644 --- a/build/CI/VASEx-CI/cds-libs +++ b/build/CI/VASEx-CI/cds-libs @@ -37,8 +37,8 @@ gcc-5-cc: gcc-5 gcc-5-boost: $BOOST_ROOT gcc-5-exe-ldflags: -Wl,-rpath=$GCC5_ROOT/lib64 gcc-5-64-boost-lib: stage64-gcc5/lib -gcc-5-64-asan-boost-lib: stage64-gcc5-asan -gcc-5-64-tsan-boost-lib: stage64-gcc5-tsan +gcc-5-64-asan-boost-lib: stage64-gcc5-asan/lib +gcc-5-64-tsan-boost-lib: stage64-gcc5-tsan/lib gcc-5-gtest: $GTEST_ROOT gcc-5-64-gtest-lib: $GTEST_ROOT/lib-gcc5/libgtest.a @@ -50,8 +50,8 @@ gcc-6-cc: gcc-6 gcc-6-boost: $BOOST_ROOT gcc-6-exe-ldflags: -Wl,-rpath=$GCC6_ROOT/lib64 gcc-6-64-boost-lib: stage64-gcc6/lib -gcc-6-64-asan-boost-lib: stage64-gcc6-asan -gcc-6-64-tsan-boost-lib: stage64-gcc6-tsan +gcc-6-64-asan-boost-lib: stage64-gcc6-asan/lib +gcc-6-64-tsan-boost-lib: stage64-gcc6-tsan/lib gcc-6-gtest: $GTEST_ROOT gcc-6-64-gtest-lib: $GTEST_ROOT/lib-gcc6/libgtest.a @@ -79,7 +79,7 @@ clang-3.7-boost: $BOOST_ROOT clang-3.7-64-boost-lib: stage64-clang3.7/lib clang-3.7-gtest: $GTEST_ROOT clang-3.7-64-gtest-lib: $GTEST_ROOT/lib-clang3.7/libgtest.a - +clang-3.7-cmake-flags: -DCMAKE_C_COMPILER_WORKS=1 -DCMAKE_CXX_COMPILER_WORKS=1 ######################################## # clang-3.8 @@ -103,8 +103,8 @@ clang-3.9-cxxflags: -stdlib=libc++ -Wdocumentation clang-3.9-exe-ldflags: -L$CLANG39_ROOT/lib -Wl,-rpath=$CLANG39_ROOT/lib clang-3.9-boost: $BOOST_ROOT clang-3.9-64-boost-lib: stage64-clang3.9/lib -clang-3.9-64-asan-boost-lib: stage64-clang3.9-asan -clang-3.9-64-tsan-boost-lib: stage64-clang3.9-tsan +clang-3.9-64-asan-boost-lib: stage64-clang3.9-asan/lib +clang-3.9-64-tsan-boost-lib: stage64-clang3.9-tsan/lib clang-3.9-gtest: $GTEST_ROOT clang-3.9-64-gtest-lib: $GTEST_ROOT/lib-clang3.9/libgtest.a diff --git a/build/CI/cmake-gen b/build/CI/cmake-gen index a69a97d0..ce9c2ad6 100755 --- a/build/CI/cmake-gen +++ b/build/CI/cmake-gen @@ -29,6 +29,7 @@ my $ldflags=get_prop("ldflags"); my $cmake_exe_ldflags=get_prop("exe-ldflags"); 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"; @@ -65,6 +66,7 @@ print $out " -DBOOST_LIBRARYDIR=\$BOOST_ROOT/$boost_libs \\\n" if $boost_libs; print $out " -DGTEST_INCLUDE_DIRS=$gtest_inc \\\n" if $gtest_inc; print $out " -DGTEST_LIBRARY=$gtest_lib \\\n" if $gtest_lib; print $out " -DEXTERNAL_SYSTEM_LIBS=\"$ext_lib\" \\\n" if $ext_lib; +print $out " $cmake_flags \\\n" if $cmake_flags; print $out " \$CDS_SOURCE && \\\n"; print $out "make -j $make_jobs \$* \n"; -- 2.34.1