[textinput] mv to builtins dir as hard-coded builtin

CMakeLists.txt

@@ -387,6 +387,7 @@ install(FILES ${CMAKE_BINARY_DIR}/etc/gitinfo.txt DESTINATION ${CMAKE_INSTALL_SY
 
 #---Recurse into the given subdirectories.  This does not actually cause another cmake executable
 #  to run. The same process will walk through the project's entire directory structure.
+add_subdirectory (builtins/libtextinput) # hard coded builtin for core
 add_subdirectory (core)
 add_subdirectory (math)
 add_subdirectory (hist)

builtins/libtextinput/CMakeLists.txt

@@ -0,0 +1,35 @@
+# Copyright (C) 1995-2019, Rene Brun and Fons Rademakers.
+# All rights reserved.
+#
+# For the licensing terms see $ROOTSYS/LICENSE.
+# For the list of contributors see $ROOTSYS/README/CREDITS.
+
+############################################################################
+# CMakeLists.txt file for building textinput package for ROOT
+############################################################################
+
+add_library(textinput STATIC)
+
+target_sources(textinput PRIVATE
+  Editor.cpp
+  History.cpp
+  KeyBinding.cpp
+  Range.cpp
+  SignalHandler.cpp
+  StreamReader.cpp
+  StreamReaderUnix.cpp
+  StreamReaderWin.cpp
+  TerminalConfigUnix.cpp
+  TerminalDisplay.cpp
+  TerminalDisplayUnix.cpp
+  TerminalDisplayWin.cpp
+  TextInputContext.cpp
+  TextInput.cpp
+  UTF8.cpp
+)
+
+target_include_directories(textinput
+  PUBLIC
+    ./ # to be able to call #include "textinput/header.h" from ROOT core files
+)
+set_property(TARGET textinput PROPERTY POSITION_INDEPENDENT_CODE ON)

cmake/modules/RootMacros.cmake

@@ -621,21 +621,24 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
   endif()
 
   #---Get the library and module dependencies-----------------
-  if(ARG_DEPENDENCIES)
-    foreach(dep ${ARG_DEPENDENCIES})
-      # Whether <dep> provides a dictionary/pcm is decided at generation time
-      # via $<TARGET_EXISTS:G__<dep>>, so the '-m' flag and the module-file
-      # dependency below are independent of configuration order and expand to
-      # nothing for a dictionary-less library.
-      set(dep_has_dict "$<TARGET_EXISTS:G__${dep}>")
-      set(dependent_pcm ${libprefix}${dep}_rdict.pcm)
-      if (runtime_cxxmodules AND NOT dep IN_LIST local_no_cxxmodules)
-        set(dependent_pcm ${dep}.pcm)
-        list(APPEND pcm_dependencies "$<${dep_has_dict}:$<TARGET_PROPERTY:${dep},ROOT_PCM_FILENAME>>")
-      endif()
-      set(newargs ${newargs} "$<${dep_has_dict}:-m>" "$<${dep_has_dict}:${dependent_pcm}>")
-    endforeach()
-  endif()
+  # Every dictionary implicitly depends on Core's pcm, except the one for Core itself.
+  if(ARG_MODULE AND NOT ARG_MODULE STREQUAL "Core")
+    list(INSERT ARG_DEPENDENCIES 0 Core)
+    list(REMOVE_DUPLICATES ARG_DEPENDENCIES)
+  endif()
+  foreach(dep ${ARG_DEPENDENCIES})
+    # Whether <dep> provides a dictionary/pcm is decided at generation time
+    # via $<TARGET_EXISTS:G__<dep>>, so the '-m' flag and the module-file
+    # dependency below are independent of configuration order and expand to
+    # nothing for a dictionary-less library.
+    set(dep_has_dict "$<TARGET_EXISTS:G__${dep}>")
+    set(dependent_pcm ${libprefix}${dep}_rdict.pcm)
+    if (runtime_cxxmodules AND NOT dep IN_LIST local_no_cxxmodules)
+      set(dependent_pcm ${dep}.pcm)
+      list(APPEND pcm_dependencies "$<${dep_has_dict}:$<TARGET_PROPERTY:${dep},ROOT_PCM_FILENAME>>")
+    endif()
+    set(newargs ${newargs} "$<${dep_has_dict}:-m>" "$<${dep_has_dict}:${dependent_pcm}>")
+  endforeach()
 
   if(cpp_module_file)
     set(newargs -cxxmodule ${newargs})

core/textinput/CMakeLists.txt

@@ -13,21 +13,6 @@ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS Getline.h)
 target_sources(Core PRIVATE
   src/Getline_color.cxx
   src/Getline.cxx
-  src/textinput/Editor.cpp
-  src/textinput/History.cpp
-  src/textinput/KeyBinding.cpp
-  src/textinput/Range.cpp
-  src/textinput/SignalHandler.cpp
-  src/textinput/StreamReader.cpp
-  src/textinput/StreamReaderUnix.cpp
-  src/textinput/StreamReaderWin.cpp
-  src/textinput/TerminalConfigUnix.cpp
-  src/textinput/TerminalDisplay.cpp
-  src/textinput/TerminalDisplayUnix.cpp
-  src/textinput/TerminalDisplayWin.cpp
-  src/textinput/TextInputContext.cpp
-  src/textinput/TextInput.cpp
-  src/textinput/UTF8.cpp
 )
 
 target_include_directories(Core
@@ -37,4 +22,6 @@ target_include_directories(Core
     src
 )
 
+target_link_libraries(Core PRIVATE textinput)
+
 ROOT_INSTALL_HEADERS()

documentation/doxygen/Doxyfile

@@ -1085,7 +1085,6 @@ EXCLUDE                = ../../interpreter/ \
     ../../core/lzma/ \
     ../../core/lz4/ \
     ../../core/newdelete/ \
-    ../../core/textinput/ \
     ../../builtins/ \
     ../../documentation/doxygen/html
 

documentation/doxygen/makeinput.sh

@@ -77,6 +77,5 @@ echo "        ../../bindings/pyroot/pythonizations/python/ROOT/_pythonization/
 # echo "        ../../core/clib/                 \\" >> Doxyfile_INPUT
 # echo "        ../../core/lzma/                 \\" >> Doxyfile_INPUT
 # echo "        ../../core/newdelete/            \\" >> Doxyfile_INPUT
-# echo "        ../../core/textinput/            \\" >> Doxyfile_INPUT
 # echo "        ../../graf3d/x3d/                \\" >> Doxyfile_INPUT