database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-3941 Ninja now builds MCS.

Browse Source 
Generated files in utils/loggingcpp/ are now moved into bin dir.
This commit is contained in:
Roman Nozdrin
2020-04-20 15:25:30 +03:00
parent b5bf8eb878
commit 6f3ae1b429
15 changed files with 41 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dbcon/ddlpackage/CMakeLists.txt
View File

@ -1,13 +1,11 @@
INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
#TODO: put generated files in the binary directory
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp
COMMAND /bin/sh ./ddl-gram.sh ${BISON_EXECUTABLE}
COMMAND /bin/sh ./ddl-scan.sh ${LEX_EXECUTABLE}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ddl.y ddl.l
)
FIND_PACKAGE(BISON REQUIRED)
BISON_TARGET(ddl_gram ddl.y ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.cpp DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h COMPILE_FLAGS "-l -d -p ddl")
FIND_PACKAGE(FLEX REQUIRED)
FLEX_TARGET(ddl_scan ddl.l ${CMAKE_CURRENT_BINARY_DIR}/ddl-scan.cpp COMPILE_FLAGS "-i -L -Pddl")
ADD_FLEX_BISON_DEPENDENCY(ddl_scan ddl_gram)
set_source_files_properties(ddl-scan.cpp PROPERTIES COMPILE_FLAGS -Wno-sign-compare)
@ -31,9 +29,9 @@ ADD_LIBRARY(ddlpackage SHARED
markpartition.cpp
restorepartition.cpp
droppartition.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp
)
${BISON_ddl_gram_OUTPUTS}
${FLEX_ddl_scan_OUTPUTS}
)
INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)

26
dbcon/ddlpackage/ddl-gram.sh
View File

@ -1,26 +0,0 @@
#!/bin/sh
#ddl-gram.cpp: ddl.y
$1 -y -l -v -d -p ddl -o ddl-gram-temp.cpp ddl.y
set +e; \
if [ -f ddl-gram.cpp ]; \
then diff -abBq ddl-gram-temp.cpp ddl-gram.cpp >/dev/null 2>&1; \
if [ $? -ne 0 ]; \
then mv -f ddl-gram-temp.cpp ddl-gram.cpp; \
else touch ddl-gram.cpp; \
fi; \
else mv -f ddl-gram-temp.cpp ddl-gram.cpp; \
fi
set +e; \
if [ -f ddl-gram.h ]; \
then diff -abBq ddl-gram-temp.hpp ddl-gram.h >/dev/null 2>&1; \
if [ $? -ne 0 ]; \
then mv -f ddl-gram-temp.hpp ddl-gram.h; \
else touch ddl-gram.h; \
fi; \
else mv -f ddl-gram-temp.hpp ddl-gram.h; \
fi
rm -f ddl-gram-temp.cpp ddl-gram-temp.hpp ddl-gram-temp.output

16
dbcon/ddlpackage/ddl-scan.sh
View File

@ -1,16 +0,0 @@
#!/bin/sh
#ddl-scan.cpp: ddl.l
$1 -i -L -P ddl -o ddl-scan-temp.cpp ddl.l
set +e;
if [ -f ddl-scan.cpp ];
then diff -abBq ddl-scan-temp.cpp ddl-scan.cpp >/dev/null 2>&1;
if [ "$?" -ne 0 ];
then mv -f ddl-scan-temp.cpp ddl-scan.cpp;
else touch ddl-scan.cpp;
fi;
else mv -f ddl-scan-temp.cpp ddl-scan.cpp;
fi
rm -f ddl-scan-temp.cpp