Skip to content

Commit 3a93c8a

Browse files
authored
[etc, config] Mark makefiles as deprecated and remove leftover files
1 parent 9916067 commit 3a93c8a

7 files changed

Lines changed: 9 additions & 43 deletions

File tree

README/ReleaseNotes/v642/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ The following people have contributed to this new version:
4747
* The `TSSLSocket` class is now removed following deprecation in ROOT 6.40.
4848
* The bindings to the R programming language that are enabled with the `r=ON` or `tmva-rmva=ON` build options (`TRInterface`, RMVA, and friends) are removed, following deprecation in ROOT 6.40. Their maintenance is no longer justified, given the broader adoption of the scientific Python ecosystem. Users who still rely on R from C++ are encouraged to call R directly via https://cran.r-project.org/package=RInside, which is what the ROOT bindings were using internally.
4949
* Several enums that are redundant with `ROOT::ESTLType` are deprecated and will be removed in ROOT 6.44: `TClassEdit::ESTLType`, `TDictionary::ESTLType`, `TStreamerElement::ESTLType`. Please use `ROOT::ESTLType` instead.
50+
* The inclusion by external projects of Makefile templates contained within ROOT is deprecated in 6.42, a warning will be raised if you use them. These files will be removed in ROOT 7.
5051

5152
## Python Interface
5253

cmake/modules/RootConfiguration.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ configure_file(${CMAKE_SOURCE_DIR}/config/rootrc.in ${CMAKE_BINARY_DIR}/etc/syst
573573
# file used in TROOT.cxx, not need in include/ dir and not need to install
574574
configure_file(${CMAKE_SOURCE_DIR}/config/RConfigOptions.in ginclude/RConfigOptions.h NEWLINE_STYLE UNIX)
575575

576-
configure_file(${CMAKE_SOURCE_DIR}/config/Makefile-comp.in config/Makefile.comp NEWLINE_STYLE UNIX)
577-
configure_file(${CMAKE_SOURCE_DIR}/config/Makefile.in config/Makefile.config NEWLINE_STYLE UNIX)
576+
configure_file(${CMAKE_SOURCE_DIR}/config/Makefile-comp.in config/Makefile.comp NEWLINE_STYLE UNIX) # Will be removed in future release
577+
configure_file(${CMAKE_SOURCE_DIR}/config/Makefile.in config/Makefile.config NEWLINE_STYLE UNIX) # Will be removed in future release
578578
configure_file(${CMAKE_SOURCE_DIR}/config/mimes.unix.in ${CMAKE_BINARY_DIR}/etc/root.mimes NEWLINE_STYLE UNIX)
579579
# We need to have class.rules during configuration time to avoid silent error during generation of dictionary:
580580
# Error in <TClass::ReadRules()>: Cannot find rules

config/Makefile-comp.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ CXX = @altcxx@
99
F77 = @altf77@
1010
LD = @altld@
1111
GCCTOOLCHAIN = @gcctoolchain@
12+
13+
$(warning The use of Makefiles is deprecated since ROOT 6.42 and will be removed in ROOT 7.)

config/Makefile.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,3 +293,5 @@ RLIBS := @rlibs@
293293
RFLAGS := @rflags@
294294

295295
ROOTDRPMREL := 1
296+
297+
$(warning The use of Makefiles is deprecated since ROOT 6.42 and will be removed in ROOT 7.)

core/textinput/src/textinput/Makefile

Lines changed: 0 additions & 21 deletions
This file was deleted.

etc/Makefile.arch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,3 +432,5 @@ ifneq ($(findstring g++, $(CXX)),)
432432
GCC_MAJOR := $(shell $(CXX) -dumpversion 2>&1 | cut -d'.' -f1)
433433
GCC_MINOR := $(shell $(CXX) -dumpversion 2>&1 | cut -d'.' -f2)
434434
endif
435+
436+
$(warning The use of Makefiles is deprecated since ROOT 6.42 and will be removed in ROOT 7.)

roottest/scripts/Rules.mk

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -323,14 +323,6 @@ ifeq ($(HAS_PYTHON),yes)
323323
export PYTHONPATH := $(ROOTSYS)/lib:$(PYTHONPATH)
324324
endif
325325
endif
326-
ifeq ($(PLATFORM),macosx)
327-
PYTHONLIB:=$(shell grep ^PYTHONLIB $(ROOTSYS)/config/Makefile.config | sed -e 's,^.*\:=,,' -e 's,^ *-L,,' | grep -v -e '^ -l' -e '^ *$$' )
328-
PYTHONFWK:=$(dir $(PYTHONLIB))
329-
ifneq ($(PYTHONFWK),)
330-
export PATH:=$(PYTHONFWK)/bin:$(PATH)
331-
export DYLD_LIBRARY_PATH:=$(PYTHONFWK):$(DYLD_LIBRARY_PATH)
332-
endif
333-
endif
334326
endif
335327

336328
ifeq ($(PLATFORM),win32)
@@ -345,18 +337,6 @@ endif
345337
# Avoid common typo
346338
ROOTLOC=$(ROOT_LOC)
347339

348-
include $(ROOT_LOC)/config/Makefile.comp
349-
350-
ifeq ($(ROOT_SRCDIR),)
351-
export ROOT_SRCDIR := $(shell grep "ROOT_SRCDIR :=" $(ROOT_LOC)/config/Makefile.config | sed 's/^ROOT_SRCDIR := \$$(call realpath, \([^)]*\).*$$/\1/')
352-
ifeq ($(PLATFORM),win32)
353-
export ROOT_SRCDIR := $(shell cygpath -m -- $(ROOT_SRCDIR))
354-
export ROOT_SRCDIRDEP := $(shell cygpath -u -- $(ROOT_SRCDIR))
355-
else
356-
export ROOT_SRCDIRDEP := $(ROOT_SRCDIR)
357-
endif
358-
endif
359-
360340
ifeq ($(PLATFORM),win32)
361341

362342
# Windows with the VC++ compiler

0 commit comments

Comments
 (0)