From a359a8f7b88d4ac303e5c297d3710776d0199af6 Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Thu, 22 May 2025 14:49:00 +0000 Subject: [PATCH] chore(build): fix MDB SOURCE vs BUILD path usages, cmakeflags sortes --- build/bootstrap_mcs.sh | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/build/bootstrap_mcs.sh b/build/bootstrap_mcs.sh index 211887f00..8bb8ea9de 100755 --- a/build/bootstrap_mcs.sh +++ b/build/bootstrap_mcs.sh @@ -39,7 +39,7 @@ echo "Arguments received: $@" message "Building Mariadb Server from $color_yellow$MDB_SOURCE_PATH$color_normal" optparse.define short=A long=asan desc="Build with ASAN" variable=ASAN default=false value=true -optparse.define short=a long=build-path variable=MARIA_BUILD_PATH default="$MDB_SOURCE_PATH"/../MariaDBBuild +optparse.define short=a long=build-path variable=MARIA_BUILD_PATH default="$MDB_SOURCE_PATH"/../BuildOf_$(basename "$MDB_SOURCE_PATH") optparse.define short=B long=run-microbench desc="Compile and run microbenchmarks " variable=RUN_BENCHMARKS default=false value=true optparse.define short=c long=cloud desc="Enable cloud storage" variable=CLOUD_STORAGE_ENABLED default=false value=true optparse.define short=C long=force-cmake-reconfig desc="Force cmake reconfigure" variable=FORCE_CMAKE_CONFIG default=false value=true @@ -246,25 +246,25 @@ modify_packaging() { construct_cmake_flags() { MDB_CMAKE_FLAGS=( - -DWITH_SYSTEMD=yes - -DPLUGIN_COLUMNSTORE=YES - -DPLUGIN_MROONGA=NO - -DPLUGIN_ROCKSDB=NO - -DPLUGIN_TOKUDB=NO - -DPLUGIN_CONNECT=NO - -DPLUGIN_SPIDER=NO - -DPLUGIN_OQGRAPH=NO - -DPLUGIN_SPHINX=NO - -DWITH_EMBEDDED_SERVER=NO -DBUILD_CONFIG=mysql_release - -DWITH_WSREP=NO - -DWITH_SSL=system - -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX - -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_BUILD_TYPE=$MCS_BUILD_TYPE - -DPLUGIN_GSSAPI=NO - -DMYSQL_MAINTAINER_MODE=NO + -DCMAKE_EXPORT_COMPILE_COMMANDS=1 + -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX -DCOLUMNSTORE_MAINTAINER=YES + -DMYSQL_MAINTAINER_MODE=NO + -DPLUGIN_COLUMNSTORE=YES + -DPLUGIN_CONNECT=NO + -DPLUGIN_GSSAPI=NO + -DPLUGIN_MROONGA=NO + -DPLUGIN_OQGRAPH=NO + -DPLUGIN_ROCKSDB=NO + -DPLUGIN_SPHINX=NO + -DPLUGIN_SPIDER=NO + -DPLUGIN_TOKUDB=NO + -DWITH_EMBEDDED_SERVER=NO + -DWITH_SSL=system + -DWITH_SYSTEMD=yes + -DWITH_WSREP=NO ) if [[ $SKIP_UNIT_TESTS = true ]]; then @@ -424,8 +424,8 @@ build_binary() { if [[ $FORCE_CMAKE_CONFIG = true ]]; then warn "Erasing cmake cache" - rm -f "$MDB_SOURCE_PATH/CMakeCache.txt" - rm -rf "$MDB_SOURCE_PATH/CMakeFiles" + rm -f "$MARIA_BUILD_PATH/CMakeCache.txt" + rm -rf "$MARIA_BUILD_PATH/CMakeFiles" fi message "Configuring cmake silently" @@ -436,10 +436,10 @@ build_binary() { message "Installing silently" && ${CMAKE_BIN_NAME} --install "$MARIA_BUILD_PATH" | spinner 30 + check_errorcode + message "Adding symbol link to compile_commands.json to the source root" ln -sf "$MARIA_BUILD_PATH/compile_commands.json" "$MDB_SOURCE_PATH" - - check_errorcode } check_user_and_group() { @@ -474,7 +474,7 @@ run_microbenchmarks_tests() { warn "Skipping microbenchmarks" else message "Runnning microbenchmarks" - cd $MDB_SOURCE_PATH + cd $MARIA_BUILD_PATH ${CTEST_BIN_NAME} . -V -R columnstore_microbenchmarks: -j $(nproc) --progress cd - >/dev/null fi