[cmake,config,etc,misc] rename CINT to Cling

Author: ferdymercury

cmake/modules/CTestCustom.cmake

@@ -22,9 +22,9 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION}
         "note: variable tracking size limit exceeded"            # vc/tests/sse_blend.cpp
         "warning is a GCC extension"
         "bug in GCC 4.8.1"
-        "warning: please use fgets or getline instead"           # deprecated use of std functions cint/ROOT
-        "is dangerous, better use"                               # deprecated use of std functions cint/ROOT
-        "function is dangerous and should not be used"           # deprecated use of std functions cint/ROOT
+        "warning: please use fgets or getline instead"           # deprecated use of std functions Cling/ROOT
+        "is dangerous, better use"                               # deprecated use of std functions Cling/ROOT
+        "function is dangerous and should not be used"           # deprecated use of std functions Cling/ROOT
     )
 set(CTEST_CUSTOM_ERROR_EXCEPTION ${CTEST_CUSTOM_ERROR_EXCEPTION}
         "fatal error: cannot open file"

cmake/modules/RootConfiguration.cmake

@@ -17,7 +17,6 @@ foreach(v 0 OFF NO FALSE N IGNORE off no false n ignore)
   set(value${v} no)
 endforeach()
 
-set(ROOT_DICTTYPE cint)
 #set(ROOT_CONFIGARGS "")
 set(top_srcdir ${CMAKE_SOURCE_DIR})
 set(top_builddir ${CMAKE_BINARY_DIR})
@@ -105,11 +104,6 @@ if(IS_ABSOLUTE ${CMAKE_INSTALL_ICONDIR})
 else()
   set(iconpath ${prefix}/${CMAKE_INSTALL_ICONDIR})
 endif()
-if(IS_ABSOLUTE ${CMAKE_INSTALL_CINTINCDIR})
-  set(cintincdir ${CMAKE_INSTALL_CINTINCDIR})
-else()
-  set(cintincdir ${prefix}/${CMAKE_INSTALL_CINTINCDIR})
-endif()
 if(IS_ABSOLUTE ${CMAKE_INSTALL_DOCDIR})
   set(docdir ${CMAKE_INSTALL_DOCDIR})
 else()
@@ -280,7 +274,6 @@ set(curseslib ${CURSES_LIBRARIES})
 set(curseshdr ${CURSES_HEADER_FILE})
 set(buildeditline ${value${editline}})
 set(cppunit)
-set(dicttype ${ROOT_DICTTYPE})
 
 
 find_program(PERL_EXECUTABLE perl)

cmake/modules/RootInstallDirs.cmake

@@ -14,7 +14,6 @@
 #  DATADIR          - read-only architecture-independent data (DATAROOTDIR/root)
 #  MANDIR           - man documentation (DATAROOTDIR/man)
 #  MACRODIR         - ROOT macros (DATAROOTDIR/macros)
-#  CINTINCDIR       - CINT include files (LIBDIR/cint)
 #  ICONDIR          - icons (DATAROOTDIR/icons)
 #  SRCDIR           - sources (DATAROOTDIR/src)
 #  FONTDIR          - fonts (DATAROOTDIR/fonts)
@@ -93,15 +92,6 @@ endif()
 # the cache and store the defaults in local variables if the cache values are
 # not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
 
-if(NOT CMAKE_INSTALL_CINTINCDIR)
-  if(gnuinstall)
-    set(CMAKE_INSTALL_CINTINCDIR "" CACHE PATH "cint includes and libraries libraries  (LIBDIR/cint)")
-    set(CMAKE_INSTALL_CINTINCDIR "${CMAKE_INSTALL_LIBDIR}/cint")
-  else()
-    set(CMAKE_INSTALL_CINTINCDIR "cint" CACHE PATH "cint includes and libraries libraries (cint)")
-  endif()
-endif()
-
 if(NOT CMAKE_INSTALL_DATADIR)
   set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)/root")
   if(gnuinstall)
@@ -213,7 +203,6 @@ mark_as_advanced(
   CMAKE_INSTALL_DATAROOTDIR
   CMAKE_INSTALL_DATADIR
   CMAKE_INSTALL_MACRODIR
-  CMAKE_INSTALL_CINTINCDIR
   CMAKE_INSTALL_ICONDIR
   CMAKE_INSTALL_FONTDIR
   CMAKE_INSTALL_SRCDIR
@@ -233,7 +222,6 @@ foreach(dir BINDIR
             DATAROOTDIR
             DATADIR
             MACRODIR
-            CINTINCDIR
             ICONDIR
             FONTDIR
             SRCDIR

cmake/modules/RootMacros.cmake

@@ -627,7 +627,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
   #---what rootcling command to use--------------------------
   if(ARG_STAGE1)
     set(command $<TARGET_FILE:rootcling_stage1>)
-    set(ROOTCINTDEP rconfigure)
+    set(ROOTCLINGDEP rconfigure)
     set(pcm_name)
   else()
     if(CMAKE_PROJECT_NAME STREQUAL ROOT)
@@ -636,7 +636,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
       else()
         set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" $<TARGET_FILE:rootcling> -rootbuild)
         # Modules need RConfigure.h copied into include/.
-        set(ROOTCINTDEP rootcling rconfigure)
+        set(ROOTCLINGDEP rootcling rconfigure)
       endif()
     elseif(TARGET ROOT::rootcling)
       set(command $<TARGET_FILE:ROOT::rootcling>)
@@ -694,7 +694,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
       ROOT_PCM_FILENAME "${cpp_module_file}")
   endif()
 
-  #---call rootcint------------------------------------------
+  #---call rootcling------------------------------------------
   add_custom_command(
     OUTPUT ${dictionary}.cxx ${pcm_name} ${rootmap_name} ${cpp_module_file}
     COMMAND ${command} -v2 -f  ${dictionary}.cxx ${newargs} ${excludepathsargs} ${rootmapargs}
@@ -709,7 +709,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
                        # dictionaries will be rebuilt if the C++ standard is changed in an incremental build.
                        -DR__DUMMY_CXX_STANDARD_${CMAKE_CXX_STANDARD}
     IMPLICIT_DEPENDS ${_implicitdeps}
-    DEPENDS ${_list_of_header_dependencies} ${_linkdef} ${ROOTCINTDEP}
+    DEPENDS ${_list_of_header_dependencies} ${_linkdef} ${ROOTCLINGDEP}
             ${pcm_dependencies}
             ${MODULE_LIB_DEPENDENCY} ${ARG_EXTRA_DEPENDENCIES}
             ${runtime_cxxmodule_dependencies}

config/rootrc.in

@@ -352,7 +352,7 @@ Rint.History:            $(HOME)/.root_hist
 # Rint.WelcomeLite:      no
 # When the interactive ROOT starts, it can automatically load some frequently
 # used includes. However, this introduces several overheads
-#  - A long list of CINT and system files will be kept open during the session
+#  - A long list of Cling and system files will be kept open during the session
 #  - The initialisation takes more time (noticeable when using gdb or valgrind)
 #  - Memory overhead of about 5 Mbytes (1/3 of the base ROOT executable) when
 #    including <vector>

etc/gdb-backtrace.sh

@@ -108,11 +108,11 @@ fi
 # The recommendations are based on the following assumptions:
 #   * More often than not, the crash is caused by user code.
 #   * The crash can be caused by the user's interpreted code,
-#     in which case sighandler() is called from CINT (G__...)
+#     in which case sighandler() is called from Cling (G__...)
 #   * The crash can be called by the user's library code,
-#     in which case sighandler() is called from non-CINT and
+#     in which case sighandler() is called from non-Cling and
 #     it's worth dumping the stack frames.
-#   * The user doesn't call CINT directly, so whenever we reach
+#   * The user doesn't call Cling directly, so whenever we reach
 #     a stack frame with "G__" we can stop.
 #   * The crash is caused by only one thread, the one which
 #     invokes sighandler()

misc/win/makelib.sh

@@ -73,9 +73,6 @@ if [ "$R__PLATFORM" = "win32" ]; then
          cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o $dlldir/${name}.dll $R__OBJS \
               $libdir/${name}.exp $R__EXTRA $syslibs"
       else
-         if [ "$(bin/root-config --dicttype)" != "cint" ]; then
-             needReflex="lib/libCintex.lib lib/libReflex.lib"
-         fi
          cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o $dlldir/${name}.dll $R__OBJS \
               $libdir/${name}.exp $R__EXTRA \
               $needReflex lib/libCore.lib lib/libCint.lib \