Rename module.h to tarantool.h

.gitignore

@@ -46,7 +46,7 @@ src/box/bootstrap.h
 src/lua/*.lua.c
 src/box/lua/*.lua.c
 src/tarantool
-src/module.h
+src/module/tarantool.h
 tarantool-*.tar.gz
 test/lib/*.pyc
 test/lib/*/*.pyc

cmake/utils.cmake

@@ -82,7 +82,7 @@ endfunction()
 
 # A helper function to extract public API
 function(apigen)
-    set (dstfile "${CMAKE_BINARY_DIR}/src/module.h")
+    set (dstfile "${CMAKE_CURRENT_BINARY_DIR}/tarantool.h")
     set (tmpfile "${dstfile}.new")
     set (headers)
     # Get absolute path for header files (required of out-of-source build)
@@ -91,14 +91,14 @@ function(apigen)
     endforeach()
 
     add_custom_command(OUTPUT ${dstfile}
-        COMMAND cat ${CMAKE_SOURCE_DIR}/src/module_header.h > ${tmpfile}
+        COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/tarantool_header.h > ${tmpfile}
         COMMAND cat ${headers} | ${CMAKE_SOURCE_DIR}/extra/apigen >> ${tmpfile}
-        COMMAND cat ${CMAKE_SOURCE_DIR}/src/module_footer.h >> ${tmpfile}
+        COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/tarantool_footer.h >> ${tmpfile}
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${tmpfile} ${dstfile}
         COMMAND ${CMAKE_COMMAND} -E remove ${tmpfile}
         DEPENDS ${srcfiles}
-                ${CMAKE_SOURCE_DIR}/src/module_header.h
-                ${CMAKE_SOURCE_DIR}/src/module_footer.h
+                ${CMAKE_CURRENT_SOURCE_DIR}/tarantool_header.h
+                ${CMAKE_CURRENT_SOURCE_DIR}/tarantool_footer.h
         )
 
     add_custom_target(generate_module_api ALL DEPENDS ${dstfile})

extra/rpm/tarantool.rpm.spec.in

@@ -300,7 +300,7 @@ chkconfig --del tarantool
 "%{_includedir}/tarantool/lua.hpp"
 "%{_includedir}/tarantool/luajit.h"
 "%{_includedir}/tarantool/lualib.h"
-"%{_includedir}/tarantool/module.h"
+"%{_includedir}/tarantool/tarantool.h"
 
 %files common
 %defattr(-,root,root,-)

src/CMakeLists.txt

@@ -143,13 +143,9 @@ endif()
 set (common_libraries ${common_libraries} ${LIBUUID_LIBRARIES})
 set (common_libraries ${common_libraries} PARENT_SCOPE)
 
-set(api_headers say.h coeio.h lua/utils.h)
-
 add_subdirectory(lib)
 add_subdirectory(box)
 
-apigen(${api_headers})
-
 # Save CMAKE_XXX_FLAGS from this directory for config.h (used in --version)
 set(TARANTOOL_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE)
 set(TARANTOOL_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE)

src/module/CMakeLists.txt

+set(api_headers ../say.h ../coeio.h ../lua/utils.h)
+apigen(${api_headers})
+
 add_subdirectory(sql)
 add_subdirectory(pg)
 add_subdirectory(mysql)

src/module/mysql/mysql.cc

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "module.h"
+#include "module/tarantool.h"
 
 #include <stddef.h>
 

src/module/pg/pg.cc

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "module.h"
+#include "module/tarantool.h"
 
 extern "C" {
 	#include <libpq-fe.h>

test/app/module_api.c

-#include "module.h"
+#include "module/tarantool.h"
 
 #include <errno.h>
 #include <sys/types.h>