Skip to content

Commit 3ab1d5c

Browse files
committed
Remove -l argument for when using root with input files or commands
The logo is now now printed anymore anyway if we use `root` with inputs, so we can drop some redundant `-l` flags to set the right precedent for your users and don't confuse them with ineffective flags.
1 parent 13d3e2e commit 3ab1d5c

File tree

57 files changed

+155
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+155
-155
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ add_custom_command(OUTPUT tutorials/hsimple.root
590590
ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH}
591591
ROOTIGNOREPREFIX=1
592592
ROOT_HIST=0
593-
$<TARGET_FILE:root.exe> -l -q -b -n
593+
$<TARGET_FILE:root.exe> -q -b -n
594594
-e ".L ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C"
595595
-e "hsimple();"
596596
-e return

bindings/jupyroot/python/JupyROOT/helpers/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def _invokeAclicMac(fileName):
253253
to exclude these libraries, so we launch a second root session to compile
254254
the library, which we then load.
255255
"""
256-
command = 'root -l -q -b -e gSystem->CompileMacro("%s","k")*0' % fileName
256+
command = 'root -q -b -e gSystem->CompileMacro("%s","k")*0' % fileName
257257
out = _checkOutput(command, "Error ivoking ACLiC") # noqa: F841
258258
libNameBase = fileName.replace(".C", "_C")
259259
ROOT.gSystem.Load(libNameBase)

bindings/pyroot/cppyy/cppyy/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if(NOT MSVC)
1010
list(APPEND common_args ENVIRONMENT ${ld_library_path}=${CMAKE_CURRENT_BINARY_DIR})
1111
endif()
1212

13-
set(root_cmd $<TARGET_FILE:root.exe> -b -q -l)
13+
set(root_cmd $<TARGET_FILE:root.exe> -b -q)
1414

1515
function(ADD_PYUNITTEST_ACLIC TESTNAME)
1616
set(options)

cmake/modules/RootMacros.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,7 +2502,7 @@ macro(ROOTTEST_COMPILE_MACRO filename)
25022502
${ROOT_root_CMD}
25032503
-e "gSystem->SetBuildDir(\"${CMAKE_CURRENT_BINARY_DIR}\", true)"
25042504
${RootMacroDirDefines}
2505-
-q -l -b
2505+
-q -b
25062506
)
25072507

25082508
get_filename_component(realfp ${filename} ABSOLUTE)
@@ -2916,9 +2916,9 @@ macro(ROOTTEST_SETUP_MACROTEST)
29162916
-e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")"
29172917
-e "gSystem->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")"
29182918
${ARG_ROOTEXE_OPTS}
2919-
-q -l -b)
2919+
-q -b)
29202920

2921-
set(root_buildcmd ${ROOT_root_CMD} ${RootExeDefines} -q -l -b)
2921+
set(root_buildcmd ${ROOT_root_CMD} ${RootExeDefines} -q -b)
29222922

29232923
# Compile macro, then add to CTest.
29242924
if(ARG_MACRO MATCHES "[.]C\\+" OR ARG_MACRO MATCHES "[.]cxx\\+" OR ARG_MACRO MATCHES "[.]cpp\\+" OR ARG_MACRO MATCHES "[.]cc\\+")

documentation/doxygen/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export PYSPARK_PYTHON := $(Python3_EXECUTABLE)
1717
DOXYGEN_OUTPUT_DIRECTORY ?= $(HOME)/rootdoc
1818
export DOXYGEN_OUTPUT_DIRECTORY
1919
export DOXYGEN_SOURCE_DIRECTORY := ../..
20-
export DOXYGEN_ROOT_VERSION := $(shell root -l -b -q -e 'printf("%s\n",gROOT->GetGitBranch());')
20+
export DOXYGEN_ROOT_VERSION := $(shell root -b -q -e 'printf("%s\n",gROOT->GetGitBranch());')
2121
export DOXYGEN_ROOT_VERSION := $(subst -00-patches,,$(DOXYGEN_ROOT_VERSION))
2222
export DOXYGEN_ROOT_VERSION := $(subst heads/,,$(DOXYGEN_ROOT_VERSION))
2323
export DOXYGEN_EXAMPLE_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/macros

documentation/doxygen/filter.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ void FilterClass()
242242
fclose(m);
243243
m = 0;
244244
ExecuteCommand(
245-
StringFormat("root -l -b -q \"makeimage.C+O(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",true,false)\"",
245+
StringFormat("root -b -q \"makeimage.C+O(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",true,false)\"",
246246
StringFormat("%s_%3.3d.C", gClassName.c_str(), gMacroID).c_str(),
247247
StringFormat("%s_%3.3d.%s", gClassName.c_str(), gImageID, gImageType.c_str()).c_str(),
248248
gOutDir.c_str()));
@@ -360,11 +360,11 @@ void CreateTutorialImage(bool nobatch) {
360360
} else {
361361
if (nobatch) {
362362
ExecuteCommand(
363-
StringFormat("root -l -q \"makeimage.C+O(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",false,false)\"",
363+
StringFormat("root -q \"makeimage.C+O(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",false,false)\"",
364364
gFileName.c_str(), gImageName.c_str(), gOutDir.c_str()));
365365
} else {
366366
ExecuteCommand(
367-
StringFormat("root -l -b -q \"makeimage.C+O(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",false,false)\"",
367+
StringFormat("root -b -q \"makeimage.C+O(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",false,false)\"",
368368
gFileName.c_str(), gImageName.c_str(), gOutDir.c_str()));
369369
}
370370
}
@@ -449,7 +449,7 @@ void FilterTutorial()
449449
if (gPython) {
450450
ExecuteCommand(StringFormat("%s %s", gPythonExec.c_str(), gFileName.c_str()));
451451
} else {
452-
ExecuteCommand(StringFormat("root -l -b -q %s", gFileName.c_str()));
452+
ExecuteCommand(StringFormat("root -b -q %s", gFileName.c_str()));
453453
}
454454
ExecuteCommand(StringFormat("mv %s %s/html", image_name.c_str(), gOutDir.c_str()));
455455
ReplaceAll(gLineString, "macro_image (", "image html ");
@@ -459,7 +459,7 @@ void FilterTutorial()
459459
IN = gImageName;
460460
int i = IN.find(".");
461461
IN.erase(i,IN.length());
462-
ExecuteCommand(StringFormat("root -l -b -q \"MakeTCanvasJS.C(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",false,%d,%d)\"",
462+
ExecuteCommand(StringFormat("root -b -q \"MakeTCanvasJS.C(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",false,%d,%d)\"",
463463
gFileName.c_str(), IN.c_str(), gOutDir.c_str(), gPython, tcanvas_aclic));
464464
ReplaceAll(gLineString, "macro_image", StringFormat("htmlinclude %s.html",IN.c_str()));
465465
} else if (rcanvas_js) {
@@ -468,7 +468,7 @@ void FilterTutorial()
468468
int i = IN.find(".");
469469
IN.erase(i,IN.length());
470470
ExecuteCommand(StringFormat(
471-
"root -l -b -q --web=batch \"MakeRCanvasJS.C+O(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",false,%d)\"",
471+
"root -b -q --web=batch \"MakeRCanvasJS.C+O(\\\"%s\\\",\\\"%s\\\",\\\"%s\\\",false,%d)\"",
472472
gFileName.c_str(), IN.c_str(), gOutDir.c_str(), gPython));
473473
ReplaceAll(gLineString, "macro_image", StringFormat("htmlinclude %s.html",IN.c_str()));
474474
} else {
@@ -512,7 +512,7 @@ void FilterTutorial()
512512
// \macro_output found
513513
if (gLineString.find("\\macro_output") != string::npos) {
514514
remove(gOutputName.c_str());
515-
if (!gPython) ExecuteCommand(StringFormat("root -l -b -q %s", gFileName.c_str()).c_str());
515+
if (!gPython) ExecuteCommand(StringFormat("root -b -q %s", gFileName.c_str()).c_str());
516516
else ExecuteCommand(StringFormat("%s %s", gPythonExec.c_str(), gFileName.c_str()).c_str());
517517
ExecuteCommand(StringFormat("sed -i '/Processing/d' %s", gOutputName.c_str()).c_str());
518518
rename(gOutputName.c_str(), StringFormat("%s/macros/%s",gOutDir.c_str(), gOutputName.c_str()).c_str());
@@ -588,7 +588,7 @@ void ExecuteMacro()
588588
gMacroName = gLineString.substr(i1,i2-i1+1);
589589

590590
// Build the ROOT command to be executed.
591-
gLineString.insert(0, StringFormat("root -l -b -q \"makeimage.C+O(\\\""));
591+
gLineString.insert(0, StringFormat("root -b -q \"makeimage.C+O(\\\""));
592592
size_t l = gLineString.length();
593593
gLineString.replace(l-1,1,StringFormat("\\\",\\\"%s\\\",\\\"%s\\\",true,false)\"", gImageName.c_str(), gOutDir.c_str()));
594594

documentation/doxygen/modifyClassWebpage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [ ! -d "$HTMLPATH" -o ! -f "$WORKFILE" ]; then
1111
fi
1212

1313
# Find the libraries for the class $1
14-
libname=$(root -l -b -q "libs.C+g(\"$1\")" | grep 'mainlib=')
14+
libname=$(root -b -q "libs.C+g(\"$1\")" | grep 'mainlib=')
1515

1616
# The class was not found. Remove the collaboration graph
1717
if [ -z "${libname}" ]; then

documentation/doxygen/modifyClassWebpages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ if [ ! -s "${listOfClasses}" ]; then
2525
exit 0
2626
fi
2727

28-
root -l -b -q -e ".L libs.C++g"
28+
root -b -q -e ".L libs.C++g"
2929
xargs -L 1 -P ${NJOB:-1} ./modifyClassWebpage.sh < ${listOfClasses}

documentation/primer/macros/read_ntuple_with_chain.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// you can easily create some files with the following statement:
55
//
66
// for i in 0 1 2 3 4 5; \\
7-
// do root -l -x -b -q \\
7+
// do root -x -b -q \\
88
// "write_ntuple_to_file.cxx \\
99
// (\"conductivity_experiment_${i}.root\", 100)"; \\
1010
// done

documentation/primer/macros/runall.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import sys
3333

3434
for mName in macros:
35-
command = "root -b -l -q %s" %mName
35+
command = "root -b -q %s" %mName
3636
if mName == "slits.C": command = 'echo "2 4" | %s' %command
3737
print "\n ******* Running %s" %mName
3838
if 0 !=os.system(command):

0 commit comments

Comments
 (0)