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

Changes to how source generating scripts are called from cmakelists

Browse Source
This commit is contained in:
Ben Thompson
2016-07-14 13:12:52 -05:00
parent 424628349b
commit 934920d73e
5 changed files with 25 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -33,6 +33,10 @@ dbcon/ddlpackage/ddl-gram.cpp
dbcon/ddlpackage/ddl-gram.h
dbcon/dmlpackage/dml-gram.cpp
dbcon/dmlpackage/dml-gram.h
dbcon/ddlpackage/ddl-scan.cpp
dbcon/ddlpackage/ddl-scan.h
dbcon/dmlpackage/dml-scan.cpp
dbcon/dmlpackage/dml-scan.h
ddlproc/DDLProc
decomsvr/DecomSvr
dmlproc/DMLProc
@ -45,6 +49,7 @@ oamapps/postConfigure/installer
oamapps/postConfigure/mycnfUpgrade
oamapps/postConfigure/patchInstaller
oamapps/postConfigure/postConfigure
oamapps/postConfigure/getMySQLpw
oamapps/sendtrap/sendtrap
oamapps/serverMonitor/ServerMonitor
oamapps/traphandler/trapHandler

18
dbcon/ddlpackage/CMakeLists.txt
View File

@ -2,23 +2,11 @@
include_directories( ${ENGINE_COMMON_INCLUDES} )
ADD_CUSTOM_COMMAND(
OUTPUT ddl-gram.cpp ddl-gram-temp.cpp
OUTPUT ddl-gram.cpp ddl-scan.cpp
COMMAND ./ddl-gram.sh ${BISON_EXECUTABLE}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ddl.y
)
ADD_CUSTOM_TARGET(
ddlgramSRC ALL DEPENDS ddl-gram-temp.cpp
)
ADD_CUSTOM_COMMAND(
OUTPUT ddl-scan.cpp ddl-scan-temp.cpp
COMMAND ./ddl-scan.sh ${LEX_EXECUTABLE}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ddl.l
)
ADD_CUSTOM_TARGET(
ddlscanSRC ALL DEPENDS ddl-scan-temp.cpp
DEPENDS ddl.y ddl.l
)
########### next target ###############
@ -44,7 +32,7 @@ set(ddlpackage_LIB_SRCS
add_library(ddlpackage SHARED ${ddlpackage_LIB_SRCS})
add_dependencies(ddlpackage ddlgramSRC ddlscanSRC)
add_dependencies(ddlpackage ddl-gram.cpp ddl-scan.cpp)
set_target_properties(ddlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)

18
dbcon/dmlpackage/CMakeLists.txt
View File

@ -2,23 +2,11 @@
include_directories( ${ENGINE_COMMON_INCLUDES} )
ADD_CUSTOM_COMMAND(
OUTPUT dml-gram.cpp dml-gram-temp.cpp
OUTPUT dml-gram.cpp dml-scan.cpp
COMMAND ./dml-gram.sh ${BISON_EXECUTABLE}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS dml.y
)
ADD_CUSTOM_TARGET(
dmlgramSRC ALL DEPENDS dml-gram-temp.cpp
)
ADD_CUSTOM_COMMAND(
OUTPUT dml-scan.cpp dml-scan-temp.cpp
COMMAND ./dml-scan.sh ${LEX_EXECUTABLE}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS dml.l
)
ADD_CUSTOM_TARGET(
dmlscanSRC ALL DEPENDS dml-scan-temp.cpp
DEPENDS dml.y dml.l
)
########### next target ###############
@ -44,7 +32,7 @@ set(dmlpackage_LIB_SRCS
add_library(dmlpackage SHARED ${dmlpackage_LIB_SRCS})
add_dependencies(dmlpackage dmlgramSRC dmlscanSRC)
add_dependencies(dmlpackage dml-gram.cpp dml-scan.cpp)
set_target_properties(dmlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)

40
utils/loggingcpp/CMakeLists.txt
View File

@ -2,7 +2,6 @@
include_directories( ${ENGINE_COMMON_INCLUDES} )
########### next target ###############
set(loggingcpp_LIB_SRCS
@ -16,42 +15,15 @@ set(loggingcpp_LIB_SRCS
add_library(loggingcpp SHARED ${loggingcpp_LIB_SRCS})
ADD_CUSTOM_COMMAND(TARGET loggingcpp PRE_BUILD
COMMAND ./genMsgAndErrId.sh
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS genMsgId.pl genErrId.pl
)
set_target_properties(loggingcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR})
install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_ETCDIR})
#
#
# TODO BEN FIX ME
#
#
execute_process(
COMMAND ./genMsgId.pl > messageids-temp.h
COMMAND diff -abBq messageids-temp.h messageids.h >/dev/null 2>&1;
if [ $$? -ne 0 ]; then
mv -f messageids-temp.h messageids.h;
else
touch messageids.h;
fi;
rm -f messageids-temp.h
)
execute_process(
COMMAND ./genErrId.pl > errorids-temp.h
COMMAND diff -abBq errorids-temp.h errorids.h >/dev/null 2>&1;
if [ $$? -ne 0 ]; then
mv -f errorids-temp.h errorids.h;
else
touch errorids.h;
fi;
rm -f errorids-temp.h
)
########### install files ###############
#install(FILES loggingid.h messageobj.h messagelog.h messageids.h logger.h errorcodes.h exceptclasses.h sqllogger.h stopwatch.h idberrorinfo.h errorids.h DESTINATION include)
#install(FILES MessageFile.txt ErrorMessage.txt DESTINATION )

8
utils/loggingcpp/genMsgAndErrId.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/sh
./genMsgId.pl > messageids-temp.h
diff -abBq messageids-temp.h messageids.h >/dev/null 2>&1; if [ $? -ne 0 ]; then mv -f messageids-temp.h messageids.h; else touch messageids.h; fi;
rm -f messageids-temp.h
./genErrId.pl > errorids-temp.h
diff -abBq errorids-temp.h errorids.h >/dev/null 2>&1; if [ $? -ne 0 ]; then mv -f errorids-temp.h errorids.h; else touch errorids.h; fi;
rm -f errorids-temp.h