Generate config headers from configs.specification

Author: mszabo-wikia

CMake/HHVMRenderConfigSpecification.cmake

@@ -0,0 +1,26 @@
+function (HHVM_RENDER_CONFIG_SPECIFICATION TARGET)
+    cmake_parse_arguments("HHVM_RENDER_CONFIG_SPEC" "" "TYPE;OUTPUT_PATH" "CONFIG_SECTIONS" ${ARGN})
+
+    get_target_property(CARGO_EXE cargo LOCATION)
+    get_target_property(RUSTC_EXE rustc LOCATION)
+
+    foreach(SECTION ${HHVM_RENDER_CONFIG_SPEC_CONFIG_SECTIONS})
+        list(APPEND HHVM_RENDER_CONFIG_SPEC_CONFIG_SOURCES ${HHVM_RENDER_CONFIG_SPEC_OUTPUT_PATH}/${SECTION}.cpp)
+        list(APPEND HHVM_RENDER_CONFIG_SPEC_CONFIG_HEADERS ${HHVM_RENDER_CONFIG_SPEC_OUTPUT_PATH}/${SECTION}.h)
+    endforeach()
+
+    add_custom_command(
+        OUTPUT ${HHVM_RENDER_CONFIG_SPEC_CONFIG_SOURCES} ${HHVM_RENDER_CONFIG_SPEC_CONFIG_HEADERS}
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${HHVM_RENDER_CONFIG_SPEC_OUTPUT_PATH} &&
+        ${CMAKE_COMMAND} -E env RUSTC=${RUSTC_EXE} ${CARGO_EXE} run --quiet -- ${HHVM_RENDER_CONFIG_SPEC_TYPE} ${HHVM_RENDER_CONFIG_SPEC_OUTPUT_PATH} ${CMAKE_SOURCE_DIR}/hphp/doc/configs.specification
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/hphp/tools/configs
+        DEPENDS ${CMAKE_SOURCE_DIR}/hphp/doc/configs.specification rustc cargo
+        VERBATIM
+    )
+
+    add_custom_target(hhvm_render_config_section_${HHVM_RENDER_CONFIG_SPEC_TYPE}
+        DEPENDS ${HHVM_RENDER_CONFIG_SPEC_CONFIG_SOURCES} ${HHVM_RENDER_CONFIG_SPEC_CONFIG_HEADERS})
+
+    add_dependencies(${TARGET} hhvm_render_config_section_${HHVM_RENDER_CONFIG_SPEC_TYPE})
+    target_sources(${TARGET} PRIVATE ${HHVM_RENDER_CONFIG_SPEC_CONFIG_SOURCES})
+endfunction(HHVMRenderConfigSpecification)

hphp/CMakeLists.txt

@@ -132,6 +132,7 @@ if (NOT PCRE_LIBRARY)
   link_libraries(pcre)
 endif()
 
+add_subdirectory(tools/configs)
 add_subdirectory(tools/hfsort)
 add_subdirectory(tools/version)
 add_subdirectory(tools/tc-print)

hphp/hack/src/Cargo.lock

@@ -45,11 +45,53 @@ add_object_library(hphp_runtime_static
             "${CMAKE_CURRENT_BINARY_DIR}/ir-opcode-generated.h")
 auto_source_group("hphp_runtime_static" "${CMAKE_CURRENT_SOURCE_DIR}"
   ${ASM_SOURCES} ${C_SOURCES} ${CXX_SOURCES} ${HEADER_SOURCES})
+
+
+set(LOADER_CONFIG_SECTIONS
+    adminserver-loader
+    autoload-loader
+    codecache-loader
+    configs-generated
+    debugger-loader
+    debug-loader
+    errorhandling-loader
+    eval-loader
+    gc-loader
+    hacklang-loader
+    hhir-loader
+    http-loader
+    jit-loader
+    log-loader
+    mail-loader
+    pageletserver-loader
+    pcre-loader
+    php7-loader
+    proxy-loader
+    repo-loader
+    sandbox-loader
+    server-loader
+    setprofile-loader
+    simplexml-loader
+    stats-loader
+    strobelight-loader
+    watchman-loader
+    xbox-loader
+    xenon-loader
+)
+
+include(HHVMRenderConfigSpecification)
+HHVM_RENDER_CONFIG_SPECIFICATION(
+  hphp_runtime_static
+  CONFIG_SECTIONS ${LOADER_CONFIG_SECTIONS}
+  TYPE loader
+  OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/base/configs
+)
+
 SET_TARGET_PROPERTIES(hphp_runtime_static PROPERTIES OUTPUT_NAME "hphp_runtime")
 SET_TARGET_PROPERTIES(hphp_runtime_static PROPERTIES PREFIX "lib")
 SET_TARGET_PROPERTIES(hphp_runtime_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 object_library_hphp_link(hphp_runtime_static)
-object_library_ld_link_libraries(hphp_runtime_static hphp_util proxygen vixl hphp_zend hphp_system jit_sort hphp_system)
+object_library_ld_link_libraries(hphp_runtime_static hphp_util proxygen mvfst vixl hphp_zend hphp_system jit_sort hphp_system)
 HHVM_CONFIGURE_TARGET_FOR_EXTENSION_DEPENDENCIES(hphp_runtime_static)
 
 HHVM_PUBLIC_HEADERS(runtime ${HEADER_SOURCES})

hphp/runtime/CMakeLists.txt

@@ -0,0 +1,13 @@
+get_target_property(CARGO_EXE cargo LOCATION)
+get_target_property(RUSTC_EXE rustc LOCATION)
+
+add_custom_command(
+    OUTPUT ${CMAKE_BINARY_DIR}/hphp/hack/src/hackc/compile/options_gen.h
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/hphp/hack/src/hackc/compile &&
+    ${CMAKE_COMMAND} -E env RUSTC=${RUSTC_EXE} ${CARGO_EXE} run --quiet -- hackc ${CMAKE_BINARY_DIR}/hphp/hack/src/hackc/compile ${CMAKE_SOURCE_DIR}/hphp/doc/configs.specification
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS ${CMAKE_SOURCE_DIR}/hphp/doc/configs.specification rustc cargo
+    VERBATIM
+)
+
+add_custom_target(hackc_options DEPENDS ${CMAKE_BINARY_DIR}/hphp/hack/src/hackc/compile/options_gen.h)