Move box configuration file to cfg/ and simplify config file generation.

cfg/CMakeLists.txt

@@ -38,15 +38,12 @@ add_custom_command(
     COMMAND ${ECHO} '\#include \"cfg/tarantool_${mod}_cfg.h\"' >> ${mod}_tmp.cfg
     COMMAND ${ECHO} '%}' >> ${mod}_tmp.cfg
     COMMAND ${CAT} ${CMAKE_SOURCE_DIR}/cfg/core_cfg.cfg_tmpl >> ${mod}_tmp.cfg
-    COMMAND ${CAT} ${CMAKE_SOURCE_DIR}/src/${mod}/${mod}_cfg.cfg_tmpl >>
-            ${mod}_tmp.cfg
     COMMAND ${CONFETTI} -i ${mod}_tmp.cfg -n tarantool_cfg
             -c ${CMAKE_SOURCE_DIR}/cfg/tarantool_${mod}_cfg.c
             -h ${CMAKE_SOURCE_DIR}/cfg/tarantool_${mod}_cfg.h
     COMMAND ${CMAKE_COMMAND} -E remove ${mod}_tmp.cfg
     DEPENDS ${CMAKE_SOURCE_DIR}/cfg/core_cfg.cfg_tmpl
             ${CMAKE_SOURCE_DIR}/cfg/warning.h
-            ${CMAKE_SOURCE_DIR}/src/${mod}/${mod}_cfg.cfg_tmpl
     )
 endmacro()
 

cfg/core_cfg.cfg_tmpl

@@ -93,3 +93,24 @@ wal_dir_rescan_delay=0.1, ro
 # when reading WALs.
 panic_on_snap_error=true, ro
 panic_on_wal_error=false, ro
+## BOX
+
+# Primary port (where updates are accepted)
+primary_port=0, ro, required
+
+# Secondary port (where only selects are accepted)
+secondary_port=0, ro
+
+# Warn about requests which take longer to process, in seconds.
+too_long_threshold=0.5
+
+# A custom process list (ps) title string, appended after the standard
+# program title.
+custom_proc_title=NULL, ro
+
+# Replication mode (if enabled, the server, once
+# bound to the primary port, will connect to
+# replication_source (ipaddr:port) and run continously
+# fetching records from it.. In replication mode the server
+# only accepts reads.
+replication_source=NULL

src/CMakeLists.txt

@@ -171,8 +171,6 @@ function(tarantool_module mod)
         ${recompiled_sources} ${module_sources})
 
     add_library(lt${mod} STATIC ${recompiled_sources})
-    set_target_properties(lt${mod} PROPERTIES COMPILE_FLAGS
-        "-DTARANTOOL_CONFIG='<cfg/tarantool_${mod}_cfg.h>'")
     add_dependencies(lt${mod} generate_headers generate_admin_cc build_bundled_libs)
 
     target_link_libraries(tarantool_${mod} lt${mod} ${common_libraries})

src/box/box_cfg.cfg_tmpl

-## BOX
-
-# Primary port (where updates are accepted)
-primary_port=0, ro, required
-
-# Secondary port (where only selects are accepted)
-secondary_port=0, ro
-
-# Warn about requests which take longer to process, in seconds.
-too_long_threshold=0.5
-
-# A custom process list (ps) title string, appended after the standard
-# program title.
-custom_proc_title=NULL, ro
-
-# Replication mode (if enabled, the server, once
-# bound to the primary port, will connect to
-# replication_source (ipaddr:port) and run continously
-# fetching records from it.. In replication mode the server
-# only accepts reads.
-replication_source=NULL