highlevel: merge exporterrors_highlevel.cpp into exporterrors.cpp

ElektraInitiative · Jan 4, 2019 · a070cd7 · a070cd7
1 parent f8055fd
commit a070cd7
Show file tree

Hide file tree

Showing 3 changed files with 370 additions and 397 deletions.
diff --git a/src/error/CMakeLists.txt b/src/error/CMakeLists.txt
@@ -1,13 +1,10 @@
 add_executable (elektra-export-errors exporterrors.cpp parser.hpp parser.cpp)
-add_executable (elektra-export-errors-highlevel exporterrors_highlevel.cpp parser.hpp parser.cpp)
 
 if (INSTALL_BUILD_TOOLS)
 	install (TARGETS elektra-export-errors DESTINATION bin)
-	install (TARGETS elektra-export-errors-highlevel DESTINATION bin)
 endif (INSTALL_BUILD_TOOLS)
 
 set_source_files_properties (elektra-export-errors OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/specification)
-set_source_files_properties (elektra-export-errors-highlevel OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/specification_highlevel)
 
 find_util (elektra-export-errors EXE_ERR_LOC EXE_ERR_ARG)
 set (BINARY_INCLUDE_DIR "${PROJECT_BINARY_DIR}/src/include")
@@ -16,20 +13,22 @@ add_custom_command (OUTPUT ${BINARY_INCLUDE_DIR}/kdberrors.h
 			    ${CMAKE_CURRENT_SOURCE_DIR}/specification
 		    COMMAND ${EXE_ERR_LOC}
 			    ARGS ${EXE_ERR_ARG}
+				 kdb
 				 ${CMAKE_CURRENT_SOURCE_DIR}/specification
 				 ${BINARY_INCLUDE_DIR}/kdberrors.h)
 add_custom_target (kdberrors_generated ALL DEPENDS ${BINARY_INCLUDE_DIR}/kdberrors.h)
 
-find_util (elektra-export-errors-highlevel EXE_ERR_LOC EXE_ERR_ARG)
+find_util (elektra-export-errors EXE_ERR_LOC EXE_ERR_ARG)
 file (MAKE_DIRECTORY ${BINARY_INCLUDE_DIR}/elektra)
 add_custom_command (OUTPUT ${BINARY_INCLUDE_DIR}/elektra/errorcodes.h
 			   ${BINARY_INCLUDE_DIR}/elektra/errors.h
 			   ${BINARY_INCLUDE_DIR}/elektra/errorsprivate.h
 			   ${PROJECT_BINARY_DIR}/src/error/elektra_errors.c
-		    DEPENDS elektra-export-errors-highlevel
+		    DEPENDS elektra-export-errors
 			    ${CMAKE_CURRENT_SOURCE_DIR}/specification_highlevel
 		    COMMAND ${EXE_ERR_LOC}
 			    ARGS ${EXE_ERR_ARG}
+				 highlevel
 				 ${CMAKE_CURRENT_SOURCE_DIR}/specification_highlevel
 				 ${BINARY_INCLUDE_DIR}/elektra/errorcodes.h
 				 ${BINARY_INCLUDE_DIR}/elektra/errors.h