data transport between the tracker and the merger is optimized

[u/mrichter/AliRoot.git] / build / module.tpl

diff --git a/build/module.tpl b/build/module.tpl
index f519e37058b21c638b1c929d34c5c89303cfec6e..0d58a2dbdd95cb89b1273983583e08f95a3f7013 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -120,8 +120,7 @@ endif
 @PACKAGE@FO:=$(@PACKAGE@SMALLFO) $(@PACKAGE@CAPITFO)
 @PACKAGE@O:= $(@PACKAGE@CXXO) $(@PACKAGE@FO) $(@PACKAGE@CO)
 @PACKAGE@CHV:=$(patsubst %,$(MODDIRC)/%, $(SRCS:.cxx=.viol))
-@PACKAGE@SML:=$(patsubst %,$(MODDIRZ)/%, $(SRCS:.cxx=.smell))
-
+@PACKAGE@SML:=$(sort $(patsubst %,$(MODDIRZ)/%, $(filter $(SRCS:.cxx=.smell),$(HDRS:.h=.smell))))
 
 
 ifdef WITHDICT
@@ -148,11 +147,13 @@ endif
 @PACKAGE@ALIB:=$(LIBPATH)/lib@PACKAGE@.$(AEXT)
 
 #Add this to the modules libs
+ifeq ($(TYPE),lib)
 @MODULE@LIBS += $(@PACKAGE@LIB)
 @MODULE@ALIBS += $(@PACKAGE@ALIB)
 ifneq ($(DYEXT),)
 @MODULE@DLIBS += $(@PACKAGE@DLIB)
 endif
+endif
 
 #The actual binary file
 
@@ -213,14 +214,11 @@ $(@PACKAGE@LIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
          @echo "***** Linking library $@ *****"
 endif
-         $(MUTE)TMPDIR=/tmp/@MODULE@$$$$.`date +%M%S` ; \
-         export TMPDIR; mkdir -p $$TMPDIR ; cd $$TMPDIR ; \
-         find $(CURDIR)/@MODULE@/tgt_$(ALICE_TARGET) -name '*.o' -exec ln -s {} . \; ;\
-         \rm -f $(CURDIR)/$@ ;\
-         TMPLIB=$(notdir $(@PACKAGE@LIB)); export TMPLIB;\
-         $(SHLD) $(@PACKAGE@SOFLAGS) -o $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(SHLIB);\
-         chmod a-w $(CURDIR)/$@ ;\
-         cd $(ALICE_ROOT) ; \rm -rf $$TMPDIR
+         \rm -f "$(CURDIR)"/$@ ;\
+         cd $(@MODULE@DIRO) ;\
+         $(SHLD) $(@PACKAGE@SOFLAGS) -o "$(CURDIR)"/$@ $(patsubst $(@MODULE@DIRO)/%,%,$(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(SHLIB);\
+         chmod a-w "$(CURDIR)"/$@ ;\
+         cd $(ALICE_ROOT)
 endif
 
 ifneq ($(DYEXT),)
@@ -228,13 +226,11 @@ $(@PACKAGE@DLIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
          @echo "***** Linking library $@ *****"
 endif
-         $(MUTE)TMPDIR=/tmp/@MODULE@$$$$.`date +%M%S` ; \
-         export TMPDIR; mkdir -p $$TMPDIR ; cd $$TMPDIR ; \
-         find $(CURDIR)/@MODULE@/tgt_$(ALICE_TARGET) -name '*.o' -exec ln -s {} . \; ;\
-         \rm -f $(CURDIR)/$@ ;\
-         $(DYLD) $(@PACKAGE@DYFLAGS) -o $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(DYLIB);\
-         chmod a-w $(CURDIR)/$@ ;\
-         cd $(ALICE_ROOT) ; \rm -rf $$TMPDIR
+         \rm -f "$(CURDIR)"/$@ ;\
+         cd $(@MODULE@DIRO) ;\
+         $(DYLD) $(@PACKAGE@DYFLAGS) -o "$(CURDIR)"/$@ $(patsubst $(@MODULE@DIRO)/%,%,$(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(DYLIB);\
+         chmod a-w "$(CURDIR)"/$@ ;\
+         cd $(ALICE_ROOT) 
 endif
 
 #------------------------------------------------------------------------
@@ -243,14 +239,10 @@ $(@PACKAGE@ALIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
          @echo "***** Linking static library $@ *****"
 endif
-         $(MUTE)TMPDIR=/tmp/@MODULE@$$$$.`date +%M%S` ; \
-         export TMPDIR; mkdir -p $$TMPDIR ; cd $$TMPDIR ; \
-         find $(CURDIR)/@MODULE@/tgt_$(ALICE_TARGET) -name '*.o' -exec ln -s {} . \; ;\
-         \rm -f $(CURDIR)/$@ ;\
-         TMPLIB=$(notdir $(@PACKAGE@LIB)); export TMPLIB;\
-         $(ALLD) $(ALFLAGS) $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(ALLIB);\
-      cd $(CURDIR) ; \rm -rf $$TMPDIR
-         $(MUTE)chmod a-w $@
+         \rm -f "$(CURDIR)"/$@ ;\
+         cd $(@MODULE@DIRO) ;\
+         $(ALLD) $(ALFLAGS) "$(CURDIR)"/$@ $(patsubst $(@MODULE@DIRO)/%,%,$(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(ALLIB);\
+          cd $(ALICE_ROOT)
 
 
 $(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
@@ -263,7 +255,7 @@ else
          $(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(@PACKAGE@BLIBS) $(EXEFLAGS) -o $@
 endif
 
-$(@PACKAGE@DAL): $(@PACKAGE@CINTHDRS) @MODULE@/module.mk @MODULE@/tgt_$(ALICE_TARGET)/@PACKAGE@_srcslist
+$(@PACKAGE@DAL): $(@PACKAGE@CINTHDRS) @MODULE@/module.mk
 ifndef ALIQUIET
         @echo "***** Creating $@ *****";
 endif
@@ -277,7 +269,12 @@ endif
           echo "#pragma link C++ class $(i)+;" >> $@ ;)
        $(MUTE)echo '#endif' >> $@
 
-$(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk @MODULE@/tgt_$(ALICE_TARGET)/@PACKAGE@_srcslist
+ifneq ($(findstring solaris,$(ALICE_TARGET)),)
+# shameful hack....
+CINTFLAGS := $(filter-out -library=stlport4,$(CINTFLAGS))
+endif
+
+$(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk
 ifndef ALIQUIET
         @echo "***** Creating $@ *****";
 endif
@@ -291,27 +288,19 @@ ifndef ALIQUIET
 endif
                $(MUTE)$(CXX) $(@PACKAGE@DEFINE) -c $(@PACKAGE@INC)  -I$(ALICE_ROOT) $< -o $@ $(@PACKAGE@DCXXFLAGS)
 
-$(MODDIRO)/@PACKAGE@_srcslist: @MODULE@/@TYPE@@PACKAGE@.pkg
-       $(MUTE)if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi
-       $(MUTE)for i in $(@PACKAGE@CS) $(@PACKAGE@S) xyz; do echo $$i; done | sort > $@.new
-       $(MUTE)for j in `diff -w $@ $@.new 2>/dev/null | awk '/^\</{sub(".c.*",".",$$2); print $$2}' | $(XARGS) basename` ;\
-       do grep -l $$j `find */tgt_$(ALICE_TARGET) -name "*.d"` | $(XARGS) echo \rm -f ;\
-       (find @MODULE@/tgt_$(ALICE_TARGET) -name "$${j}d" ; find @MODULE@/tgt_$(ALICE_TARGET) -name "$${j}o") | $(XARGS) echo \rm -f ;\
-       done
-       $(MUTE)diff -q -w >/dev/null 2>&1 $@ $@.new ;\
-       if [ $$? -ne 0 ]; then \mv $@.new $@; else \rm $@.new; fi
 
 #Different targets for the module
 
 ifeq ($(TYPE),lib)
-all-@PACKAGE@: $(@PACKAGE@LIB)
+all-@MODULE@: $(@PACKAGE@LIB)
 ifneq ($(DYEXT),)
-all-@PACKAGE@: $(@PACKAGE@DLIB)
+all-@MODULE@: $(@PACKAGE@DLIB)
 endif
 else
-all-@PACKAGE@: $(@PACKAGE@BIN)
+all-@MODULE@: $(@PACKAGE@BIN)
 endif
 
+
 depend-@PACKAGE@: $(@PACKAGE@DEP)
 
 # determination of object files
@@ -412,17 +401,16 @@ $(@PACKAGE@SML:.smell=_h.ml) : $(MODDIRZ)/%_h.ml : $(MODDIR)/%.h
 
 $(@PACKAGE@SML) : $(MODDIRZ)/%.smell : $(MODDIRZ)/%_cxx.ml $(MODDIRZ)/%_h.ml
        $(MUTE)echo smelling $@
-       $(MUTE)java -classpath $(SMELL_DETECTOR_DIR):$(SMELL_DETECTOR_DIR)/xom-1.1.jar -Xmx500m SmellDetector $? > $@
+       $(MUTE)java -classpath $(SMELL_DETECTOR_DIR):$(SMELL_DETECTOR_DIR)/xom-1.1.jar -Xmx500m SmellDetector $^ > $@
+       $(MUTE)[ -s $@ ] || touch $@
 
 .SECONDARY: $(@PACKAGE@SML:.smell=_cxx.ml) $(@PACKAGE@SML:.smell=_h.ml)
 
 # targets to create .par archives (jgrosseo)
-@PACKAGE@.par: $(patsubst %,@MODULE@/@PACKAGE@/%,$(filter-out dict.%, $(HDRS) $(SRCS) $(DHDR) $(PKGFILE) Makefile Makefile.arch lib@PACKAGE@.pkg PROOF-INF))
+@PACKAGE@.par: $(patsubst %,@MODULE@/@PACKAGE@/%,$(filter-out dict.%, $(HDRS) $(SRCS) $(DHDR) $(PKGFILE) $(FSRCS) Makefile Makefile.arch lib@PACKAGE@.pkg PROOF-INF))
        @echo "Creating archive" $@ ...
-       @cd @MODULE@; tar cfzh /tmp/$@ @PACKAGE@
+       @cd @MODULE@; (tar cfzh ../$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in" $(PWD)/$@) || (tar cfzh /tmp/$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in /tmp/"$@)
        @rm -rf @MODULE@/@PACKAGE@
-       @echo "package" $@ "in /tmp/"$@
-       @echo $@ "done"
 
 @MODULE@/@PACKAGE@/Makefile: @MODULE@/Makefile
        @echo Copying $< to $@ with transformations
@@ -447,6 +435,6 @@ $(@PACKAGE@SML) : $(MODDIRZ)/%.smell : $(MODDIRZ)/%_cxx.ml $(MODDIRZ)/%_h.ml
 test-@PACKAGE@.par: @PACKAGE@.par
        @echo "INFO: The file $< is now tested, in case of an error check in par-tmp/@PACKAGE@."
        @mkdir -p par-tmp
-       @cd par-tmp; tar xfz /tmp/$<;   cd $(subst .par,,$<); PROOF-INF/BUILD.sh
+       @cd par-tmp; tar xfz ../$<;     cd $(subst .par,,$<); PROOF-INF/BUILD.sh
        @rm -rf par-tmp/@PACKAGE@
        @echo "INFO: Testing succeeded (already cleaned up)"