Skip to content

Commit 6c6303d

Browse files
committed
Move module.h to src/
1 parent 4486148 commit 6c6303d

9 files changed

+1351
-25
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ src/box/bootstrap.h
4949
src/lua/*.lua.c
5050
src/box/lua/*.lua.c
5151
src/tarantool
52-
src/trivia/module.h
52+
src/module.h
5353
tarantool-*.tar.gz
5454
test/lib/
5555
test/unit/*.test

Doxyfile.API.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@INCLUDE = @PROJECT_SOURCE_DIR@/Doxyfile
2-
INPUT = @PROJECT_BINARY_DIR@/src/trivia/module.h
2+
INPUT = @PROJECT_BINARY_DIR@/src/module.h
33
OUTPUT_DIRECTORY = @PROJECT_BINARY_DIR@/doc/api/
44
ENABLED_SECTIONS = public
55
DISABLE_INDEX = YES

src/CMakeLists.txt

+20-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
#
44
enable_tnt_compile_flags()
55

6-
add_subdirectory(trivia)
7-
86
include_directories(${LIBEV_INCLUDE_DIR})
97
include_directories(${LIBEIO_INCLUDE_DIR})
108
include_directories(${LIBCORO_INCLUDE_DIR})
@@ -117,6 +115,26 @@ set (server_sources
117115
${lua_sources}
118116
)
119117

118+
set(api_headers
119+
${CMAKE_BINARY_DIR}/src/trivia/config.h
120+
${CMAKE_SOURCE_DIR}/src/say.h
121+
${CMAKE_SOURCE_DIR}/src/fiber.h
122+
${CMAKE_SOURCE_DIR}/src/coio.h
123+
${CMAKE_SOURCE_DIR}/src/coeio.h
124+
${CMAKE_SOURCE_DIR}/src/lua/utils.h
125+
${CMAKE_SOURCE_DIR}/src/box/txn.h
126+
${CMAKE_SOURCE_DIR}/src/box/tuple.h
127+
${CMAKE_SOURCE_DIR}/src/box/schema.h
128+
${CMAKE_SOURCE_DIR}/src/box/box.h
129+
${CMAKE_SOURCE_DIR}/src/box/index.h
130+
${CMAKE_SOURCE_DIR}/src/box/func.h
131+
${CMAKE_SOURCE_DIR}/src/box/error.h
132+
${CMAKE_SOURCE_DIR}/src/box/lua/call.h
133+
${CMAKE_SOURCE_DIR}/src/latch.h
134+
${CMAKE_SOURCE_DIR}/src/fiber.h
135+
)
136+
rebuild_module_api(${api_headers})
137+
120138
if (NOT TARGET_OS_DEBIAN_FREEBSD)
121139
if (TARGET_OS_FREEBSD)
122140
set_source_files_properties(
File renamed without changes.
File renamed without changes.

src/trivia/CMakeLists.txt

-19
This file was deleted.

0 commit comments

Comments
 (0)