Changeset 5b5a56b in git

Timestamp:

Aug 28, 2014, 2:41:46 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

35cdc46, 640d6d3, d2f86fe, e2a76ae

Parents:

be6c1c8

Message:

add make rules for _rdict.pcm files

Files:

• Makefile (modified) (12 diffs)
• doc/genMakefile.tcl (modified) (10 diffs)

Makefile

@@ -10 +10 @@
 include doc/Makefile.arch
 
-ifeq ($(ARCH),macosx64)
-UNDEFOPT = dynamic_lookup
-endif
+ROOT_MAJOR := $(shell $(RC) --version | cut -d'.' -f1)
 
 SrcSuf = cc
+PcmSuf = _rdict.pcm
 
 CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
@@ -292 +291 @@
         modules/Pythia8LinkDef.h \
         modules/PileUpMergerPythia8.h
+Pythia8Dict$(PcmSuf): \
+        tmp/modules/Pythia8Dict$(PcmSuf) \
+        tmp/modules/Pythia8Dict.$(SrcSuf)
 DELPHES_DICT +=  \
         tmp/modules/Pythia8Dict.$(SrcSuf)
@@ -297 +299 @@
 DELPHES_DICT_OBJ +=  \
         tmp/modules/Pythia8Dict.$(ObjSuf)
+
+DELPHES_DICT_PCM +=  \
+        Pythia8Dict$(PcmSuf)
 
 endif
@@ -306 +311 @@
         classes/SortableObject.h \
         classes/DelphesClasses.h
+ClassesDict$(PcmSuf): \
+        tmp/classes/ClassesDict$(PcmSuf) \
+        tmp/classes/ClassesDict.$(SrcSuf)
 tmp/modules/ModulesDict.$(SrcSuf): \
         modules/ModulesLinkDef.h \
@@ -337 +345 @@
         modules/Hector.h \
         modules/ExampleModule.h
+ModulesDict$(PcmSuf): \
+        tmp/modules/ModulesDict$(PcmSuf) \
+        tmp/modules/ModulesDict.$(SrcSuf)
 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
         external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
@@ -349 +360 @@
         external/ExRootAnalysis/ExRootConfReader.h \
         external/ExRootAnalysis/ExRootTask.h
+ExRootAnalysisDict$(PcmSuf): \
+        tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf) \
+        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
 DELPHES_DICT +=  \
         tmp/classes/ClassesDict.$(SrcSuf) \
@@ -359 +373 @@
         tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(ObjSuf)
 
+DELPHES_DICT_PCM +=  \
+        ClassesDict$(PcmSuf) \
+        ModulesDict$(PcmSuf) \
+        ExRootAnalysisDict$(PcmSuf)
+
 tmp/display/DisplayDict.$(SrcSuf): \
         display/DisplayLinkDef.h \
         display/DelphesDisplay.h \
         display/DelphesCaloData.h
+DisplayDict$(PcmSuf): \
+        tmp/display/DisplayDict$(PcmSuf) \
+        tmp/display/DisplayDict.$(SrcSuf)
 DISPLAY_DICT +=  \
         tmp/display/DisplayDict.$(SrcSuf)
@@ -368 +390 @@
 DISPLAY_DICT_OBJ +=  \
         tmp/display/DisplayDict.$(ObjSuf)
+
+DISPLAY_DICT_PCM +=  \
+        DisplayDict$(PcmSuf)
 
 tmp/classes/DelphesHepMCReader.$(ObjSuf): \
@@ -1644 +1669 @@
 ###
 
+ifeq ($(ROOT_MAJOR),6)
+all: $(DELPHES) $(DELPHES_DICT_PCM) $(EXECUTABLE)
+display: $(DISPLAY) $(DISPLAY_DICT_PCM)
+else
 all: $(DELPHES) $(EXECUTABLE)
-
 display: $(DISPLAY)
+endif
 
 $(DELPHES): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
@@ -1707 +1736 @@
 
 distclean: clean
-        @rm -f $(DELPHES) $(DELPHESLIB) $(DISPLAY) $(DISPLAYLIB) $(EXECUTABLE)
+        @rm -f $(DELPHES) $(DELPHESLIB) $(DELPHES_DICT_PCM) $(DISPLAY) $(DISPLAYLIB) $(DISPLAY_DICT_PCM) $(EXECUTABLE)
 
 dist:
@@ -1719 +1748 @@
 ###
 
-.SUFFIXES: .$(SrcSuf) .$(ObjSuf) .$(DllSuf)
+.SUFFIXES: .$(SrcSuf) .$(ObjSuf) .$(DllSuf) $(PcmSuf)
 
 %Dict.$(SrcSuf):
@@ -1731 +1760 @@
         @rm $@.arch $@.base
 
+%Dict$(PcmSuf):
+        @echo ">> Copying $@"
+        @cp $< $@
+
 $(DELPHES_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
         @mkdir -p $(@D)

doc/genMakefile.tcl

@@ -6 +6 @@
 set srcSuf {.$(SrcSuf)}
 set objSuf {.$(ObjSuf)}
+set pcmSuf {$(PcmSuf)}
 set exeSuf {$(ExeSuf)}
 
@@ -28 +29 @@
         lappend list external/$file
         set headerFiles(external/$file) 1
-          }
+      }
     }
   }
@@ -54 +55 @@
 proc dictDeps {dictVar args} {
 
-  global prefix suffix srcSuf objSuf
+  global prefix suffix srcSuf objSuf pcmSuf
 
   set dict [eval glob -nocomplain $args]
@@ -67 +68 @@
     lappend dictSrcFiles $dictName$srcSuf
     lappend dictObjFiles $dictName$objSuf
+    lappend dictPcmFiles [file tail $dictName$pcmSuf]
 
     dependencies $fileName "$dictName$srcSuf:$suffix$fileName"
+
+    puts -nonewline [file tail $dictName$pcmSuf]:$suffix
+    puts -nonewline $dictName$pcmSuf$suffix
+    puts -nonewline $dictName$srcSuf
+    puts {}
   }
 
@@ -79 +86 @@
   puts {}
 
+  puts -nonewline "${dictVar}_PCM += $suffix"
+  puts [join $dictPcmFiles $suffix]
+  puts {}
 }
 
@@ -191 +201 @@
 include doc/Makefile.arch
 
-ifeq ($(ARCH),macosx64)
-UNDEFOPT = dynamic_lookup
-endif
+ROOT_MAJOR := $(shell $(RC) --version | cut -d'.' -f1)
 
 SrcSuf = cc
+PcmSuf = _rdict.pcm
 
 CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
@@ -285 +294 @@
 ###
 
+ifeq ($(ROOT_MAJOR),6)
+all: $(DELPHES) $(DELPHES_DICT_PCM) $(EXECUTABLE)
+display: $(DISPLAY) $(DISPLAY_DICT_PCM)
+else
 all: $(DELPHES) $(EXECUTABLE)
-
 display: $(DISPLAY)
+endif
 
 $(DELPHES): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
@@ -348 +361 @@
 
 distclean: clean
-        @rm -f $(DELPHES) $(DELPHESLIB) $(DISPLAY) $(DISPLAYLIB) $(EXECUTABLE)
+        @rm -f $(DELPHES) $(DELPHESLIB) $(DELPHES_DICT_PCM) $(DISPLAY) $(DISPLAYLIB) $(DISPLAY_DICT_PCM) $(EXECUTABLE)
 
 dist:
@@ -360 +373 @@
 ###
 
-.SUFFIXES: .$(SrcSuf) .$(ObjSuf) .$(DllSuf)
+.SUFFIXES: .$(SrcSuf) .$(ObjSuf) .$(DllSuf) $(PcmSuf)
 
 %Dict.$(SrcSuf):
@@ -372 +385 @@
         @rm $@.arch $@.base
 
+%Dict$(PcmSuf):
+        @echo ">> Copying $@"
+        @cp $< $@
+
 $(DELPHES_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
         @mkdir -p $(@D)