Skip to content
Snippets Groups Projects
Commit 9e082f91 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

make sure directories to store ProofBench par files exist (ROOT-5126).

parent e629635a
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ MODNAME := proofbench ...@@ -7,7 +7,7 @@ MODNAME := proofbench
MODDIR := $(ROOT_SRCDIR)/proof/$(MODNAME) MODDIR := $(ROOT_SRCDIR)/proof/$(MODNAME)
MODDIRS := $(MODDIR)/src MODDIRS := $(MODDIR)/src
MODDIRI := $(MODDIR)/inc MODDIRI := $(MODDIR)/inc
PBPARDIR := $(ROOT_OBJDIR)/etc/proof/proofbench PBPARDIR := etc/proof/proofbench
PROOFBENCHDIR := $(MODDIR) PROOFBENCHDIR := $(MODDIR)
PROOFBENCHDIRS := $(PROOFBENCHDIR)/src PROOFBENCHDIRS := $(PROOFBENCHDIR)/src
...@@ -40,7 +40,7 @@ PBDPARS += $(wildcard $(MODDIRS)/TSel*.cxx) ...@@ -40,7 +40,7 @@ PBDPARS += $(wildcard $(MODDIRS)/TSel*.cxx)
PBDPARH := $(filter-out $(MODDIRI)/TSelHist%, $(PBDPARH)) PBDPARH := $(filter-out $(MODDIRI)/TSelHist%, $(PBDPARH))
PBDPARS := $(filter-out $(MODDIRS)/TSelHist%, $(PBDPARS)) PBDPARS := $(filter-out $(MODDIRS)/TSelHist%, $(PBDPARS))
PBDPAR := $(call stripsrc,$(PBPARDIR)/ProofBenchDataSel.par) PBDPAR := $(PBPARDIR)/ProofBenchDataSel.par
##### ProofBenchCPUSel PAR file ##### ##### ProofBenchCPUSel PAR file #####
PBCPARDIR := $(call stripsrc,$(PROOFBENCHDIRS)/ProofBenchCPUSel) PBCPARDIR := $(call stripsrc,$(PROOFBENCHDIRS)/ProofBenchCPUSel)
...@@ -48,7 +48,7 @@ PBCPARINF := $(PBCPARDIR)/PROOF-INF ...@@ -48,7 +48,7 @@ PBCPARINF := $(PBCPARDIR)/PROOF-INF
PBCPARH := $(MODDIRI)/TProofBenchTypes.h $(MODDIRI)/TSelHist.h PBCPARH := $(MODDIRI)/TProofBenchTypes.h $(MODDIRI)/TSelHist.h
PBCPARS := $(MODDIRS)/TSelHist.cxx PBCPARS := $(MODDIRS)/TSelHist.cxx
PBCPAR := $(call stripsrc,$(PBPARDIR)/ProofBenchCPUSel.par) PBCPAR := $(PBPARDIR)/ProofBenchCPUSel.par
# used in the main Makefile # used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFBENCHH)) ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFBENCHH))
...@@ -81,6 +81,7 @@ $(PROOFBENCHMAP): $(RLIBMAP) $(MAKEFILEDEP) $(PROOFBENCHL) ...@@ -81,6 +81,7 @@ $(PROOFBENCHMAP): $(RLIBMAP) $(MAKEFILEDEP) $(PROOFBENCHL)
-d $(PROOFBENCHLIBDEPM) -c $(PROOFBENCHL) -d $(PROOFBENCHLIBDEPM) -c $(PROOFBENCHL)
$(PBDPAR): $(PBDPARH) $(PBDPARS) $(PBDPAR): $(PBDPARH) $(PBDPARS)
$(MAKEDIR)
@echo "Generating PAR file $@..." @echo "Generating PAR file $@..."
@(if test -d $(PBDPARDIR); then \ @(if test -d $(PBDPARDIR); then \
rm -fr $(PBDPARDIR); \ rm -fr $(PBDPARDIR); \
...@@ -111,6 +112,7 @@ $(PBDPAR): $(PBDPARH) $(PBDPARS) ...@@ -111,6 +112,7 @@ $(PBDPAR): $(PBDPARH) $(PBDPARS)
rm -fr $(PBDPARDIR)) rm -fr $(PBDPARDIR))
$(PBCPAR): $(PBCPARH) $(PBCPARS) $(PBCPAR): $(PBCPARH) $(PBCPARS)
$(MAKEDIR)
@echo "Generating PAR file $@..." @echo "Generating PAR file $@..."
@(if test -d $(PBCPARDIR); then \ @(if test -d $(PBCPARDIR); then \
rm -fr $(PBCPARDIR); \ rm -fr $(PBCPARDIR); \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment