Changeset af9008e in git for doc

Timestamp:

Jul 4, 2013, 1:04:19 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

0d60c9d

Parents:

eced822

Message:

add DelphesCMSFWLite, DelphesProMC and DelphesPythia8 to Makefile

File:

• doc/genMakefile.tcl (modified) (9 diffs)

doc/genMakefile.tcl

@@ -36 +36 @@
     foreach file $list {puts -nonewline $suffix$file}
     if {$command != {}} {
-      puts ""
+      puts {}
       puts $command
     }
-    puts ""
+    puts {}
   } elseif {$force} {
     puts -nonewline $firstLine
     if {$command != {}} {
-      puts ""
+      puts {}
       puts $command
     }
-    puts ""
+    puts {}
   }
 
@@ -73 +73 @@
   puts -nonewline "${dictVar} = $suffix"
   puts [join $dictSrcFiles $suffix]
-  puts ""
+  puts {}
 
   puts -nonewline "${dictVar}_OBJ = $suffix"
   puts [join $dictObjFiles $suffix]
-  puts ""
+  puts {}
 
 }
@@ -103 +103 @@
   }
 
-  puts -nonewline "${srcPrefix}_OBJ = $suffix"
+  puts -nonewline "${srcPrefix}_OBJ += $suffix"
   puts [join $srcObjFiles $suffix]
-  puts ""
+  puts {}
 
   puts {ifeq ($(HAS_PYTHIA8),true)}
@@ -111 +111 @@
   puts [join $srcObjFilesPythia8 $suffix]
   puts {endif}
-  puts ""
+  puts {}
 }
 
@@ -135 +135 @@
   puts -nonewline "TCL_OBJ = $suffix"
   puts [join $srcObjFiles $suffix]
-  puts ""
-}
-
-proc executableDeps {} {
+  puts {}
+}
+
+proc executableDeps {args} {
 
   global prefix suffix objSuf exeSuf
 
-  set executable [glob -nocomplain {readers/*.cpp} {converters/*.cpp} {examples/*.cpp}]
+  set executable [eval glob -nocomplain $args]
 
   set exeFiles {}
 
   foreach fileName $executable {
-    if {$fileName == "examples/DelphesCMSFWLite.cpp" || $fileName == "examples/DelphesProMC.cpp"} continue
+    if {$fileName == "examples/DelphesProMC.cpp"} continue
 
     regsub {\.cpp} $fileName {} exeObjName
@@ -157 +157 @@
 
     puts "$exeName$exeSuf:$suffix$exeObjName$objSuf"
-    puts ""
+    puts {}
 
     dependencies $fileName "$exeObjName$objSuf:$suffix$fileName"
@@ -163 +163 @@
 
   if [info exists exeFiles] {
-    puts -nonewline "EXECUTABLE = $suffix"
+    puts -nonewline "EXECUTABLE += $suffix"
     puts [join $exeFiles $suffix]
-    puts ""
+    puts {}
   }
   if [info exists exeObjFiles] {
-    puts -nonewline "EXECUTABLE_OBJ = $suffix"
+    puts -nonewline "EXECUTABLE_OBJ += $suffix"
     puts [join $exeObjFiles $suffix]
-    puts ""
+    puts {}
   }
 }
@@ -203 +203 @@
 DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
 
+ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
+HAS_CMSSW = true
+CXXFLAGS += $(subst :, -I,$(CMSSW_FWLITE_INCLUDE_PATH))
+DELPHES_LIBS += $(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH))
+ifneq ($(CMSSW_RELEASE_BASE),)
+CXXFLAGS += -I$(CMSSW_RELEASE_BASE)/src
+endif
+ifneq ($(LD_LIBRARY_PATH),)
+DELPHES_LIBS += $(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH))
+endif
+DELPHES_LIBS += -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lCommonToolsUtils
+endif
+
+ifneq ($(PROMC),)
+HAS_PROMC = true
+CXXFLAGS += -I$(PROMC)/include
+DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
+endif
+
 ifneq ($(PYTHIA8),)
 HAS_PYTHIA8 = true
@@ -231 +250 @@
 }
 
-executableDeps
+executableDeps {converters/*.cpp} {examples/*.cpp}
+
+executableDeps {readers/DelphesHepMC.cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp}
+
+puts {ifeq ($(HAS_CMSSW),true)}
+executableDeps {readers/DelphesCMSFWLite.cpp}
+puts {endif}
+puts {}
+
+puts {ifeq ($(HAS_PROMC),true)}
+executableDeps {readers/DelphesProMC.cpp}
+sourceDeps {DELPHES} {external/ProMC/*.cc}
+puts {endif}
+puts {}
+
+puts {ifeq ($(HAS_PYTHIA8),true)}
+executableDeps {readers/DelphesPythia8.cpp}
+puts {endif}
+puts {}
 
 dictDeps {DELPHES_DICT} {classes/*LinkDef.h} {modules/*LinkDef.h} {external/ExRootAnalysis/*LinkDef.h}