Updated sighandler patch

.gitignore

@@ -77,7 +77,7 @@ core/base/src/RGitCommit.h
 /core/metautils/src/stlLoader_complex.cc
 
 # /core/pcre/src/
-/core/pcre/src/pcre-7.8
+/core/pcre/src/pcre-8.37
 
 # /core/utils/src/
 /core/utils/src/rootcint_tmp
@@ -158,7 +158,7 @@ core/base/src/RGitCommit.h
 /graf2d/asimage/src/libAfterImage/libAfterImage.a
 
 # /graf2d/freetype/src/
-/graf2d/freetype/src/freetype-2.3.12
+/graf2d/freetype/src/freetype-2.6.1
 
 # /graf2d/qt/src/
 /graf2d/qt/src/moc_*.cxx

CMakeLists.txt

@@ -193,6 +193,11 @@ get_property(__clingetcpch GLOBAL PROPERTY CLINGETCPCH)
 
 
 string(REGEX REPLACE "[ ]-" ";-" CMAKE_CXX_FLAGS_SEPARATE ${CMAKE_CXX_FLAGS})
+if(cxxmodules)
+  # rootcling doesn't know what to do with these flags.
+  # FIXME: Disable until until somebody teaches it.
+  string(REPLACE "${ROOT_CXXMODULES_FLAGS}" "" CMAKE_CXX_FLAGS_SEPARATE ${CMAKE_CXX_FLAGS_SEPARATE})
+endif(cxxmodules)
 add_custom_command(OUTPUT etc/dictpch/allLinkDefs.h
                           etc/dictpch/allHeaders.h
                           etc/dictpch/allCppflags.txt
@@ -212,20 +217,28 @@ add_dependencies(onepcm ${__allTargets})
 install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
 install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
 
+#---CXX MODULES-----------------------------------------------------------------------------------
+if(cxxmodules)
+  add_custom_target(copymodulemap ALL DEPENDS build/unix/module.modulemap)
+  add_custom_command(TARGET copymodulemap PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/unix/module.modulemap ${CMAKE_BINARY_DIR}/include/module.modulemap
+  )
+endif(cxxmodules)
+
 #---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
 if(NOT gnuinstall)   # TODO hsimple.root for gnuinstall
   add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
   add_dependencies(hsimple onepcm)
-  ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree Hist)
   if(WIN32)
     add_custom_command(OUTPUT tutorials/hsimple.root
-                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && $<TARGET_FILE:hsimple.exe>
-                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+                       COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && 
+                               $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+                       WORKING_DIRECTORY tutorials DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter)
   else()
     add_custom_command(OUTPUT tutorials/hsimple.root
-                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
-                               $<TARGET_FILE:hsimple.exe>
-                       WORKING_DIRECTORY tutorials DEPENDS Cling)
+                       COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} 
+                               $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+                       WORKING_DIRECTORY tutorials DEPENDS root.exe Cling Hist Tree Gpad Graf HistPainter)
   endif()
   install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
 endif()

Makefile

@@ -115,8 +115,11 @@ SYSTEMDICTH   = -DSYSTEM_TYPE_unix $(SYSTEMDH)
 SYSTEML       = $(UNIXL)
 SYSTEMO       = $(UNIXO)
 SYSTEMDO      = $(UNIXDO)
-endif
-endif
+ifeq ($(PLATFORM),macosx)
+CORELIBEXTRA += -F /System/Library/PrivateFrameworks -framework CoreSymbolication
+endif # macos
+endif # not win32gcc
+endif # not win32
 
 ifeq ($(BUILDCOCOA),yes)
 MODULES += core/macosx
@@ -224,6 +227,7 @@ MODULES      += graf2d/gviz
 endif
 ifeq ($(BUILDPYTHON),yes)
 MODULES      += bindings/pyroot
+MODULES      += main/python
 endif
 ifeq ($(BUILDRUBY),yes)
 MODULES      += bindings/ruby
@@ -328,14 +332,15 @@ MODULES      += core/unix core/winnt graf2d/x11 graf2d/x11ttf \
                 graf2d/qt gui/qtroot gui/qtgsi net/netx net/netxng net/alien \
                 proof/proofd proof/proofx proof/pq2 graf3d/x3d net/davix \
                 sql/oracle io/xmlparser math/mathmore \
-                tmva/tmva tmva/tmvagui math/genetic io/hdfs graf2d/fitsio roofit/roofitcore \
+                tmva/tmva tmva/tmvagui math/genetic io/hdfs graf2d/fitsio \
+                roofit/roofitcore \
                 roofit/roofit roofit/roostats roofit/histfactory \
                 math/minuit2 net/monalisa math/fftw sql/odbc math/unuran \
                 geom/geocad geom/gdml graf3d/eve net/glite misc/memstat \
                 math/genvector net/bonjour graf3d/gviz3d graf2d/gviz \
                 proof/proofbench proof/afdsmgrd graf2d/ios \
                 graf2d/quartz graf2d/cocoa core/macosx math/vc math/vdt \
-                net/http  bindings/r
+                net/http bindings/r main/python
 MODULES      := $(sort $(MODULES))   # removes duplicates
 endif
 
@@ -546,6 +551,9 @@ endif
 ifeq ($(BUILDCOCOA),yes)
 STATICEXTRALIBS += -framework Cocoa -framework OpenGL
 endif
+ifeq ($(PLATFORM),macosx)
+STATICEXTRALIBS += -F /System/Library/PrivateFrameworks -framework CoreSymbolication
+endif
 
 ##### libCore #####
 
@@ -589,9 +597,16 @@ MAINLIBS      =
 endif
 
 ##### all #####
+ALLHDRS :=
+ifeq ($(CXXMODULES),yes)
+# Copy the modulemap in $ROOTSYS/include first.
+ALLHDRS  := include/module.modulemap
+ROOT_CXXMODULES_FLAGS = -fmodules -fmodule-map-file=$(ROOT_OBJDIR)/include/module.modulemap -fmodules-cache-path=$(ROOT_OBJDIR)/include/pcms/
+CXXFLAGS += $(ROOT_CXXMODULES_FLAGS)
+CFLAGS   += $(ROOT_CXXMODULES_FLAGS)
+endif
+
 
-# Copy the modulemap in the right place first.
-ALLHDRS      := include/module.modulemap
 ALLLIBS      := $(CORELIB)
 ALLMAPS      := $(COREMAP)
 ALLEXECS     :=
@@ -803,13 +818,15 @@ endif
 $(COMPILEDATA): $(ROOT_SRCDIR)/config/Makefile.$(ARCH) config/Makefile.comp Makefile \
                 $(MAKECOMPDATA) $(wildcard MyRules.mk) $(wildcard MyConfig.mk) $(wildcard MyModules.mk)
 	@$(MAKECOMPDATA) $(COMPILEDATA) "$(CXX)" "$(OPTFLAGS)" "$(DEBUGFLAGS)" \
-	   "$(filter-out -fmodules,$(CXXFLAGS))" "$(SOFLAGS)" "$(LDFLAGS)" "$(SOEXT)" "$(SYSLIBS)" \
+	   "$(CXXFLAGS)" "$(SOFLAGS)" "$(LDFLAGS)" "$(SOEXT)" "$(SYSLIBS)" \
 	   "$(LIBDIR)" "$(BOOTLIBS)" "$(RINTLIBS)" "$(INCDIR)" \
 	   "$(MAKESHAREDLIB)" "$(MAKEEXE)" "$(ARCH)" "$(ROOTBUILD)" \
 	   "$(EXPLICITLINK)"
 
+ifeq ($(CXXMODULES),yes)
 include/module.modulemap:    $(ROOT_SRCDIR)/build/unix/module.modulemap
 	cp $< $@
+endif
 
 # We rebuild GITCOMMITH only when we would re-link libCore anyway.
 # Thus it depends on all dependencies of libCore (minus TROOT.o
@@ -1081,7 +1098,7 @@ maintainer-clean:: distclean
 	@rm -rf bin lib include htmldoc system.rootrc config/Makefile.config \
 	   config/Makefile.comp $(ROOTRC) etc/system.rootauthrc \
 	   etc/system.rootdaemonrc etc/root.mimes etc/daemons/rootd.rc.d \
-	   etc/daemons/rootd.xinetd etc/daemons/proofd.rc.d \
+	   etc/daemons/rootd.xinetd etc/daemons/proofd.rc.d etc/cling \
 	   etc/daemons/proofd.xinetd main/src/proofserv.sh main/src/roots.sh \
 	   macros/html.C \
 	   build/misc/root-help.el build-arch-stamp build-indep-stamp \
@@ -1114,9 +1131,15 @@ changelog:
 
 releasenotes:
 	@$(MAKERELNOTES)
+ROOTCLING_CXXFLAGS := $(CXXFLAGS)
+# rootcling doesn't know what to do with these flags.
+# FIXME: Disable until until somebody teaches it.
+ifeq ($(CXXMODULES),yes)
+ROOTCLING_CXXFLAGS := $(filter-out $(ROOT_CXXMODULES_FLAGS),$(CXXFLAGS))
+endif
 
 $(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
-	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(CXXFLAGS)
+	@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(ROOTCLING_CXXFLAGS)
 	@$(MAKEPCH) $@
 
 $(MAKEPCH): $(ROOT_SRCDIR)/$(MAKEPCH)
@@ -1223,7 +1246,7 @@ install: all
 	   echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \
 	   $(INSTALLDATA) $(ROOT_SRCDIR)/geom/gdml/*.py $(DESTDIR)$(LIBDIR); \
 	   (cd $(DESTDIR)$(TUTDIR); \
-	      LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH && ! $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
+	      ! LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
 	fi
 
 uninstall:
@@ -1439,6 +1462,7 @@ showbuild:
 	@echo "PYTHONLIBDIR       = $(PYTHONLIBDIR)"
 	@echo "PYTHONLIB          = $(PYTHONLIB)"
 	@echo "PYTHONINCDIR       = $(PYTHONINCDIR)"
+	@echo "PYTHONEXE          = $(PYTHONEXE)"
 	@echo "RUBYLIBDIR         = $(RUBYLIBDIR)"
 	@echo "RUBYLIB            = $(RUBYLIB)"
 	@echo "RUBYINCDIR         = $(RUBYINCDIR)"

README/CREDITS

@@ -335,6 +335,10 @@ N: Mary-Louise Gill
 E: [email protected]
 D: editline terminal interface
 
+N: Enrico Guiraud
+E: [email protected]
+D: author of the multiproc module
+
 N: Thorsten Glebe
 E: [email protected]
 D: Original author of the Smatrix package
@@ -423,6 +427,10 @@ D: contributions to the build system (configure, Makefile.in, config.in)
 D: implementation of the principal component analysis class TPrincipal
 D: debian and redhat packaging scripts, port to GNU/Hurd (Debian)
 
+N: Burt Holzman
+E: [email protected]
+D: Contribution to TWebFile,rpdutils and sockets.
+
 N: Marian Ivanov
 E: [email protected]
 D: memory leak checker
@@ -612,7 +620,7 @@ D: libRDAVIX, the davix client code
 
 N: Lorenzo Moneta
 E: [email protected]
-D: Math libraries
+D: Math libraries, ROOT-R, TMVA
 
 N: Miroslav Morhac
 E: [email protected] (died on August 11 2011)
@@ -685,6 +693,7 @@ D: author of Carrot (http://carrot.cern.ch)
 N: Katerina Opocenska
 E: [email protected]
 D: author of the Event Recorder
+D: author of the sub-merging technology in PROOF
 
 N: Juan Palacios
 E: [email protected]
@@ -762,6 +771,10 @@ N: Sven Ravndal
 E: [email protected]
 D: initial event generator interface
 
+N: Benjamin Ragan-Kelley
+E: [email protected]
+D: cling / Jupyter integration
+
 N: Reiner Rohlfs
 E: [email protected]
 D: various contributions to GUI classes
@@ -922,3 +935,15 @@ D: contributed to Reflex
 N: Andreas Zoglauer
 E: [email protected]
 D: contributed to TStyle::CreateGradientColorTable()
+
+N: Omar Andres Zapata Mesa
+E: [email protected]
+D: ROOT-R, JupyROOT, TMVA
+
+N: Sergei Gleyzer
+E: [email protected]
+D: TMVA
+
+N: Jeromy Tompkins
+E: [email protected]
+D: COL2 drawing option