Skip to content

Commit ad80460

Browse files
silverweedsilverweed
committed
[main] Replace rootcp.py with rootcp.cxx
1 parent cf19375 commit ad80460

File tree

4 files changed

+22
-134
lines changed

4 files changed

+22
-134
lines changed

‎main/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ add_dependencies(rootcint rootcint)
136136
if (TARGET Gui)
137137
ROOT_EXECUTABLE(rootbrowse src/rootbrowse.cxx LIBRARIES RIO Core Rint Gui)
138138
endif()
139-
ROOT_EXECUTABLE(rootcp_cxx src/rootcp.cxx LIBRARIES RIO Tree Core Rint)
139+
ROOT_EXECUTABLE(rootcp src/rootcp.cxx LIBRARIES RIO Tree Core Rint)
140140
ROOT_EXECUTABLE(rootls src/rootls.cxx LIBRARIES RIO Tree Core Rint ROOTNTuple)
141141

142142
ROOT_ADD_TEST_SUBDIRECTORY(test)

‎main/python/cmdLineUtils.py‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -783,52 +783,6 @@ def deleteRootObject(rootFile, pathSplit, interactive, recursive):
783783
# End of help strings
784784
##########
785785

786-
##########
787-
# ROOTCP
788-
789-
790-
def _copyObjects(fileName, pathSplitList, destFile, destPathSplit, oneFile, recursive, replace):
791-
retcode = 0
792-
destFileName = destFile.GetName()
793-
rootFile = openROOTFile(fileName) if fileName != destFileName else destFile
794-
if not rootFile:
795-
return 1
796-
ROOT.gROOT.GetListOfFiles().Remove(rootFile) # Fast copy necessity
797-
for pathSplit in pathSplitList:
798-
oneSource = oneFile and len(pathSplitList) == 1
799-
retcode += copyRootObject(rootFile, pathSplit, destFile, destPathSplit, oneSource, recursive, replace)
800-
if fileName != destFileName:
801-
rootFile.Close()
802-
return retcode
803-
804-
805-
def rootCp(sourceList, destFileName, destPathSplit, compress=None, recreate=False, recursive=False, replace=False):
806-
# Check arguments
807-
if sourceList == [] or destFileName == "":
808-
return 1
809-
if recreate and destFileName in [n[0] for n in sourceList]:
810-
logging.error("cannot recreate destination file if this is also a source file")
811-
return 1
812-
813-
# Open destination file
814-
destFile = openROOTFileCompress(destFileName, compress, recreate)
815-
if not destFile:
816-
return 1
817-
ROOT.gROOT.GetListOfFiles().Remove(destFile) # Fast copy necessity
818-
819-
# Loop on the root files
820-
retcode = 0
821-
for fileName, pathSplitList in sourceList:
822-
retcode += _copyObjects(
823-
fileName, pathSplitList, destFile, destPathSplit, len(sourceList) == 1, recursive, replace
824-
)
825-
destFile.Close()
826-
return retcode
827-
828-
829-
# End of ROOTCP
830-
##########
831-
832786
##########
833787
# ROOTEVENTSELECTOR
834788

‎main/python/rootcp.py‎

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

‎roottest/main/CMakeLists.txt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ ROOTTEST_ADD_TEST(SimplePattern3
136136

137137
############################## ROORM TESTS ##############################
138138
ROOTTEST_ADD_TEST(SimpleRootrm1PrepareInput
139-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root victim1.root
139+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root victim1.root
140140
FIXTURES_SETUP main-SimpleRootrm1PrepareInput-fixture)
141141

142142
ROOTTEST_ADD_TEST(SimpleRootrm1
@@ -158,7 +158,7 @@ ROOTTEST_ADD_TEST(SimpleRootrm1Clean
158158

159159

160160
ROOTTEST_ADD_TEST(SimpleRootrm2PrepareInput
161-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root victim2.root
161+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root victim2.root
162162
FIXTURES_SETUP main-SimpleRootrm2PrepareInput-fixture)
163163

164164
ROOTTEST_ADD_TEST(SimpleRootrm2
@@ -180,7 +180,7 @@ ROOTTEST_ADD_TEST(SimpleRootrm2Clean
180180

181181

182182
ROOTTEST_ADD_TEST(SimpleRootrm3PrepareInput
183-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root victim3.root
183+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root victim3.root
184184
FIXTURES_SETUP main-SimpleRootrm3PrepareInput-fixture)
185185

186186
ROOTTEST_ADD_TEST(SimpleRootrm3
@@ -202,7 +202,7 @@ ROOTTEST_ADD_TEST(SimpleRootrm3Clean
202202

203203
############################# ROOMKDIR TESTS ############################
204204
ROOTTEST_ADD_TEST(SimpleRootmkdir1PrepareInput
205-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root target1.root
205+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root target1.root
206206
FIXTURES_SETUP main-SimpleRootmkdir1PrepareInput-fixture)
207207

208208
ROOTTEST_ADD_TEST(SimpleRootmkdir1
@@ -224,7 +224,7 @@ ROOTTEST_ADD_TEST(SimpleRootmkdir1Clean
224224

225225

226226
ROOTTEST_ADD_TEST(SimpleRootmkdir2PrepareInput
227-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root target2.root
227+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root target2.root
228228
FIXTURES_SETUP main-SimpleRootmkdir2PrepareInput-fixture)
229229

230230
ROOTTEST_ADD_TEST(SimpleRootmkdir2
@@ -246,7 +246,7 @@ ROOTTEST_ADD_TEST(SimpleRootmkdir2Clean
246246

247247

248248
ROOTTEST_ADD_TEST(SimpleRootmkdir3PrepareInput
249-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root target3.root
249+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root target3.root
250250
FIXTURES_SETUP main-SimpleRootmkdir3PrepareInput-fixture)
251251

252252
ROOTTEST_ADD_TEST(SimpleRootmkdir3
@@ -268,11 +268,11 @@ ROOTTEST_ADD_TEST(SimpleRootmkdir3Clean
268268

269269
############################# ROOTCP TESTS ############################
270270
ROOTTEST_ADD_TEST(SimpleRootcp1PrepareInput
271-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root copy1.root
271+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root copy1.root
272272
FIXTURES_SETUP main-SimpleRootcp1PrepareInput-fixture)
273273

274274
ROOTTEST_ADD_TEST(SimpleRootcp1
275-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} copy1.root:hpx copy1.root:histo
275+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} copy1.root:hpx copy1.root:histo
276276
FIXTURES_REQUIRED main-SimpleRootcp1PrepareInput-fixture
277277
FIXTURES_SETUP main-SimpleRootcp1-fixture)
278278

@@ -290,11 +290,11 @@ ROOTTEST_ADD_TEST(SimpleRootcp1Clean
290290

291291

292292
ROOTTEST_ADD_TEST(SimpleRootcp2PrepareInput
293-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root copy2.root
293+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root copy2.root
294294
FIXTURES_SETUP main-SimpleRootcp2PrepareInput-fixture)
295295

296296
ROOTTEST_ADD_TEST(SimpleRootcp2
297-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} -r copy2.root:tof copy2.root:fot
297+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} -r copy2.root:tof copy2.root:fot
298298
FIXTURES_REQUIRED main-SimpleRootcp2PrepareInput-fixture
299299
FIXTURES_SETUP main-SimpleRootcp2-fixture)
300300

@@ -312,11 +312,11 @@ ROOTTEST_ADD_TEST(SimpleRootcp2Clean
312312

313313

314314
ROOTTEST_ADD_TEST(SimpleRootcp3PrepareInput
315-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root copy3.root
315+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root copy3.root
316316
FIXTURES_SETUP main-SimpleRootcp3PrepareInput-fixture)
317317

318318
ROOTTEST_ADD_TEST(SimpleRootcp3
319-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --replace copy3.root:hpx copy3.root:hpxpy
319+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --replace copy3.root:hpx copy3.root:hpxpy
320320
FIXTURES_REQUIRED main-SimpleRootcp3PrepareInput-fixture
321321
FIXTURES_SETUP main-SimpleRootcp3-fixture)
322322

@@ -333,11 +333,11 @@ ROOTTEST_ADD_TEST(SimpleRootcp3Clean
333333

334334

335335
ROOTTEST_ADD_TEST(SimpleRootcp4PrepareInput
336-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root copy4.root
336+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root copy4.root
337337
FIXTURES_SETUP main-SimpleRootcp4PrepareInput-fixture)
338338

339339
ROOTTEST_ADD_TEST(SimpleRootcp4
340-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} copy4.root:hpx copy4.root:dir
340+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} copy4.root:hpx copy4.root:dir
341341
FIXTURES_REQUIRED main-SimpleRootcp4PrepareInput-fixture
342342
FIXTURES_SETUP main-SimpleRootcp4-fixture)
343343

@@ -355,11 +355,11 @@ ROOTTEST_ADD_TEST(SimpleRootcp4Clean
355355

356356

357357
ROOTTEST_ADD_TEST(SimpleRootcp5PrepareInput
358-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root copy5.root
358+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root copy5.root
359359
FIXTURES_SETUP main-SimpleRootcp5PrepareInput-fixture)
360360

361361
ROOTTEST_ADD_TEST(SimpleRootcp5
362-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} -r copy5.root:tof copy5.root:dir
362+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} -r copy5.root:tof copy5.root:dir
363363
FIXTURES_REQUIRED main-SimpleRootcp5PrepareInput-fixture
364364
FIXTURES_SETUP main-SimpleRootcp5-fixture)
365365

@@ -377,7 +377,7 @@ ROOTTEST_ADD_TEST(SimpleRootcp5Clean
377377

378378
############################# ROOMV TESTS ############################
379379
ROOTTEST_ADD_TEST(SimpleRootmv1PrepareInput
380-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root move1.root
380+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root move1.root
381381
FIXTURES_SETUP main-SimpleRootmv1PrepareInput-fixture)
382382

383383
ROOTTEST_ADD_TEST(SimpleRootmv1
@@ -399,7 +399,7 @@ ROOTTEST_ADD_TEST(SimpleRootmv1Clean
399399

400400

401401
ROOTTEST_ADD_TEST(SimpleRootmv2PrepareInput
402-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root move2.root
402+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root move2.root
403403
FIXTURES_SETUP main-SimpleRootmv2PrepareInput-fixture)
404404

405405
ROOTTEST_ADD_TEST(SimpleRootmv2
@@ -421,7 +421,7 @@ ROOTTEST_ADD_TEST(SimpleRootmv2Clean
421421

422422

423423
ROOTTEST_ADD_TEST(SimpleRootmv3PrepareInput
424-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root move3.root
424+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root move3.root
425425
FIXTURES_SETUP main-SimpleRootmv3PrepareInput-fixture)
426426

427427
ROOTTEST_ADD_TEST(SimpleRootmv3
@@ -442,7 +442,7 @@ ROOTTEST_ADD_TEST(SimpleRootmv3Clean
442442

443443

444444
ROOTTEST_ADD_TEST(SimpleRootmv4PrepareInput
445-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root move4.root
445+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root move4.root
446446
FIXTURES_SETUP main-SimpleRootmv4PrepareInput-fixture)
447447

448448
ROOTTEST_ADD_TEST(SimpleRootmv4
@@ -463,7 +463,7 @@ ROOTTEST_ADD_TEST(SimpleRootmv4Clean
463463

464464

465465
ROOTTEST_ADD_TEST(SimpleRootmv5PrepareInput
466-
COMMAND ${PY_TOOLS_PREFIX}/rootcp${pyext} --recreate -r test.root move5.root
466+
COMMAND ${PY_TOOLS_PREFIX}/rootcp${exeext} --recreate -r test.root move5.root
467467
FIXTURES_SETUP main-SimpleRootmv5PrepareInput-fixture)
468468

469469
ROOTTEST_ADD_TEST(SimpleRootmv5

0 commit comments

Comments
 (0)