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/dmlpackage/CMakeLists.txt
View File

@ -1,14 +1,12 @@
INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
#TODO: put generated files in binary folder
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp
COMMAND /bin/sh ./dml-gram.sh ${BISON_EXECUTABLE}
COMMAND /bin/sh ./dml-scan.sh ${LEX_EXECUTABLE}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS dml.y dml.l
)
FIND_PACKAGE(BISON REQUIRED)
BISON_TARGET(dml_gram dml.y ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.cpp DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h COMPILE_FLAGS "-l -d -p dml")
FIND_PACKAGE(FLEX REQUIRED)
FLEX_TARGET(dml_scan dml.l ${CMAKE_CURRENT_BINARY_DIR}/dml-scan.cpp COMPILE_FLAGS "-i -L -Pdml")
ADD_FLEX_BISON_DEPENDENCY(dml_scan dml_gram)
set_source_files_properties(dml-scan.cpp PROPERTIES COMPILE_FLAGS -Wno-sign-compare)
@ -32,9 +30,9 @@ ADD_LIBRARY(dmlpackage SHARED
commanddmlpackage.cpp
dmlpkg.cpp
dmlparser.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp
)
${BISON_dml_gram_OUTPUTS}
${FLEX_dml_scan_OUTPUTS}
)
INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)

23
dbcon/dmlpackage/dml-gram.sh
View File

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

14
dbcon/dmlpackage/dml-scan.sh
View File

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