X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=build%2Fmodule.tpl;h=61e030f3ac7bee66a507e6a110c2d663e0617cf2;hb=cc5faabc22455ac82a15d545f3b97a33647ff27f;hp=abe3fa00ec90bcbf74b0e0fd0eb2f24241ee645e;hpb=bdfb95938cbd27406564842ae68d0e31f12e59f4;p=u%2Fmrichter%2FAliRoot.git

diff --git a/build/module.tpl b/build/module.tpl
index abe3fa00ec9..61e030f3ac7 100644
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -33,17 +33,31 @@ else
 endif
 endif
 
+ifndef PACKLDFLAGS
+@PACKAGE@LDFLAGS:=$(LDFLAGS)
+else
+@PACKAGE@LDFLAGS:=$(PACKLDFLAGS)
+endif
+
 ifndef PACKDCXXFLAGS
 @PACKAGE@DCXXFLAGS:=$(CXXFLAGSNO)
 else
 @PACKAGE@DCXXFLAGS:=$(PACKDCXXFLAGS)
 endif
 
+ifndef PACKBLIBS
+@PACKAGE@BLIBS:=$(LIBS)
+else
+@PACKAGE@BLIBS:=$(PACKBLIBS)
+endif
 
-ifdef DHDR
+WITHDICT=
+ifneq ($(DHDR),)
 WITHDICT=YES
 else
-WITHDICT=
+ifneq ($(CINTAUTOLINK),)
+WITHDICT=YES
+endif
 endif
 
 # Headerfiles exported to common place:
@@ -53,7 +67,7 @@ endif
 
 #Extra include,libs, defines etc.
 
-@PACKAGE@DEFINE:=$(EDEFINE)
+@PACKAGE@DEFINE:=$(EDEFINE) -D_MODULE_=\"@MODULE@\"
 
 @PACKAGE@INC:=$(patsubst %,-I%,$(EINCLUDE)) -I@MODULE@
 
@@ -73,32 +87,40 @@ endif
 @PACKAGE@S:=$(patsubst %,$(MODDIR)/%,$(SRCS))
 @PACKAGE@H:=$(patsubst %,$(MODDIR)/%,$(HDRS)) $(EHDRS)
 
-#c++ source subdirectories
-@PACKAGE@SDIR:=$(SUBDIR)
-
 #############################################################################
 #
 #            If special rootcint headerfiles is specified use them
 #                         else use all headers
 
 ifndef CINTHDRS
-@PACKAGE@CINTHDRS:=$(@PACKAGE@H) 
+@PACKAGE@CINTHDRS:=$(@PACKAGE@H)
 else
-@PACKAGE@CINTHDRS:=$(CINTHDRS)
+@PACKAGE@CINTHDRS:=$(CINTHDRS:%=@MODULE@/%)
+#@PACKAGE@CINTHDRS:=$(pathsubst %,@MODULE@/%,$(CINTHDRS))
 endif
+@PACKAGE@CINTCLASSES:=$(patsubst %.h,%,$(notdir $(@PACKAGE@CINTHDRS)))
 #############################################################################
 
 # Package Dictionary 
-
+ifneq ($(DHDR),)
 @PACKAGE@DH:=$(MODDIR)/$(DHDR)
-
+else
+@PACKAGE@DH:=
+endif
+ifneq ($(CINTAUTOLINK),)
+@PACKAGE@DAL:=$(MODDIRO)/G__@PACKAGE@AutoLinkDef.h
+@PACKAGE@DH+=$(@PACKAGE@DAL)
+endif
 
 #All objects
+@PACKAGE@CXXO:=$(patsubst %,$(MODDIRO)/%, $(SRCS:.cxx=.o))
 @PACKAGE@CO:=$(patsubst %,$(MODDIRO)/%, $(CSRCS:.c=.o))
-TEMP:=$(FSRCS:.F=.o)
-@PACKAGE@FO:=$(patsubst %,$(MODDIRO)/%, $(TEMP:.f=.o))
-@PACKAGE@O:= $(patsubst %,$(MODDIRO)/%, $(SRCS:.cxx=.o)) $(@PACKAGE@FO) $(@PACKAGE@CO)
-
+@PACKAGE@SMALLFO:=$(patsubst %.f,$(MODDIRO)/%.o, $(filter %.f, $(FSRCS)))
+@PACKAGE@CAPITFO:=$(patsubst %.F,$(MODDIRO)/%.o, $(filter %.F, $(FSRCS)))
+@PACKAGE@FO:=$(@PACKAGE@SMALLFO) $(@PACKAGE@CAPITFO)
+@PACKAGE@O:= $(@PACKAGE@CXXO) $(@PACKAGE@FO) $(@PACKAGE@CO)
+@PACKAGE@CHV:=$(patsubst %,$(MODDIRC)/%, $(SRCS:.cxx=.viol))
+@PACKAGE@SML:=$(sort $(patsubst %,$(MODDIRZ)/%, $(filter $(SRCS:.cxx=.smell),$(HDRS:.h=.smell))))
 
 
 ifdef WITHDICT
@@ -179,6 +201,13 @@ endif
 
 #------------------------------------------------------------------------
 
+ifneq (,$(findstring macosx,$(ALICE_TARGET)))
+$(@PACKAGE@LIB): $(@PACKAGE@DLIB) $(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
+ifndef ALIQUIET
+	  @echo "***** Linking library $@ *****"
+endif
+	  $(MUTE)rm -f $@; cd $(dir $@); ln -s $(notdir $(@PACKAGE@DLIB)) $(notdir $@)
+else
 $(@PACKAGE@LIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
 	  @echo "***** Linking library $@ *****"
@@ -191,6 +220,7 @@ endif
 	  $(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
+endif
 
 ifneq ($(DYEXT),)
 $(@PACKAGE@DLIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
@@ -222,66 +252,91 @@ endif
 	  $(MUTE)chmod a-w $@
 
 
-$(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk $(@PACKAGE@ELIBSDEP)
+$(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
 	  @echo "***** Making executable $@ *****"
 endif
 ifeq ($(ALIPROFILE),YES)
-	$(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(ARLIBS) $(SHLIBS) $(LIBS) $(EXEFLAGS) -o $@
+	$(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(ARLIBS) $(SHLIBS) $(@PACKAGE@BLIBS) $(EXEFLAGS) -o $@
 else
-	  $(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(LIBS) $(EXEFLAGS) -o $@
+	  $(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(@PACKAGE@BLIBS) $(EXEFLAGS) -o $@
 endif
 
-$(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk
+$(@PACKAGE@DAL): $(@PACKAGE@CINTHDRS) @MODULE@/module.mk @MODULE@/tgt_$(ALICE_TARGET)/@PACKAGE@_srcslist
+ifndef ALIQUIET
+	 @echo "***** Creating $@ *****";
+endif
+	$(MUTE)echo '//automatically generated ROOT DICT definition' > $@
+	$(MUTE)echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@
+	$(MUTE)echo '#ifdef __CINT__' >> $@
+	$(MUTE)echo '#pragma link off all globals;' >> $@
+	$(MUTE)echo '#pragma link off all classes;' >> $@
+	$(MUTE)echo '#pragma link off all functions;' >> $@
+	$(MUTE)$(foreach i, $(@PACKAGE@CINTCLASSES), \
+	   echo "#pragma link C++ class $(i)+;" >> $@ ;)
+	$(MUTE)echo '#endif' >> $@
+
+$(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk @MODULE@/tgt_$(ALICE_TARGET)/@PACKAGE@_srcslist
 ifndef ALIQUIET
-	 @echo "***** Creating $@ *****";	
+	 @echo "***** Creating $@ *****";
 endif
 	 @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
 	 @\rm -f $(patsubst %.cxx,%.d, $@)
-	 $(MUTE)rootcint -f $@ -c $(@PACKAGE@DEFINE) $(CINTFLAGS) $(@PACKAGE@INC) $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) 
+	 $(MUTE)rootcint -f $@ -c $(@PACKAGE@DEFINE) $(CINTFLAGS) $(@PACKAGE@INC) $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH)
 
-$(@PACKAGE@DO): $(@PACKAGE@DS)
+$(@PACKAGE@DO): $(@PACKAGE@DS) 
 ifndef ALIQUIET
 		@echo "***** Compiling $< *****";
 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
-$(MODDIRO)/%.o: $(MODDIR)/%.cxx $(MODDIRO)/%.d 
+$(@PACKAGE@CXXO): $(MODDIRO)/%.o: $(MODDIR)/%.cxx $(MODDIRO)/%.d 
 ifndef ALIQUIET
 	@echo "***** Compiling $< *****";
 endif
 	@(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
 	$(MUTE)$(CXX) $(@PACKAGE@DEFINE) -c $(@PACKAGE@INC)   $< -o $@ $(@PACKAGE@CXXFLAGS)
 
-$(MODDIRO)/%.o: $(MODDIR)/%.F $(MODDIRO)/%.d 
+$(@PACKAGE@CAPITFO): $(MODDIRO)/%.o: $(MODDIR)/%.F $(MODDIRO)/%.d 
 ifndef ALIQUIET
 	@echo "***** Compiling $< *****";
 endif
 	@(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
 	$(MUTE)$(F77) -c $(@PACKAGE@INC)  $< -o $@ $(@PACKAGE@FFLAGS)
 
-$(MODDIRO)/%.o: $(MODDIR)/%.f $(MODDIRO)/%.d 
+$(@PACKAGE@SMALLFO): $(MODDIRO)/%.o: $(MODDIR)/%.f $(MODDIRO)/%.d 
 ifndef ALIQUIET
 	@echo "***** Compiling $< *****";
 endif
 	@(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
 	$(MUTE)$(F77) -c $(@PACKAGE@INC)  $< -o $@ $(@PACKAGE@FFLAGS)
 
-$(MODDIRO)/%.o: $(MODDIR)/%.c $(MODDIRO)/%.d 
+$(@PACKAGE@CO): $(MODDIRO)/%.o: $(MODDIR)/%.c $(MODDIRO)/%.d 
 ifndef ALIQUIET
 	@echo "***** Compiling $< *****";
 endif
@@ -295,25 +350,28 @@ endif
 		@(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
 		@share/alibtool depend "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
 
-$(MODDIRO)/%.d: $(MODDIRS)/%.cxx
+$(@PACKAGE@CXXO:.o=.d): $(MODDIRO)/%.d: $(MODDIRS)/%.cxx
 ifndef ALIQUIET
 		@echo "***** Making dependences for $< *****";
 endif
 		@(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
 		@share/alibtool depend "$(@PACKAGE@DEFINE) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
-$(MODDIRO)/%.d: $(MODDIRS)/%.f
+
+$(@PACKAGE@SMALLFO:.o=.d): $(MODDIRO)/%.d: $(MODDIRS)/%.f
 ifndef ALIQUIET
 		@echo "***** Making dependences for $< *****";
 endif
 		@(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
 		@share/alibtool dependF "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
-$(MODDIRO)/%.d: $(MODDIRS)/%.F
+
+$(@PACKAGE@CAPITFO:.o=.d): $(MODDIRO)/%.d: $(MODDIRS)/%.F
 ifndef ALIQUIET
 		@echo "***** Making dependences for $< *****";
 endif
 		@(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
 		$(MUTE)share/alibtool dependF "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
-$(MODDIRO)/%.d: $(MODDIRS)/%.c
+
+$(@PACKAGE@CO:.o=.d): $(MODDIRO)/%.d: $(MODDIRS)/%.c
 ifndef ALIQUIET
 		@echo "***** Making dependences for $< *****";
 endif
@@ -324,41 +382,72 @@ endif
 .PRECIOUS: $(patsubst %.c,$(MODDIRO)/%.d,$(CSRCS))
 .PRECIOUS: $(patsubst %.F,$(MODDIRO)/%.d,$(patsubst %.f,$(MODDIRO)/%.d,$(FSRCS)))
 
-@PACKAGE@CHECKS := $(patsubst %.cxx,@MODULE@/check/%.viol,$(SRCS))
-
-check-@MODULE@: $(@PACKAGE@CHECKS)
+check-@MODULE@: $(@PACKAGE@CHV)
 
 # IRST coding rule check 
-@MODULE@/check/%.i : @MODULE@/%.cxx
+$(@PACKAGE@CHV:.viol=.i): $(MODDIRC)/%.i: $(MODDIR)/%.cxx $(MODDIRO)/%.d
 	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(MUTE)$(CXX) -E $(@PACKAGE@DEFINE) $(@PACKAGE@INC) $< > $@ $(@PACKAGE@CXXFLAGS)
+	$(MUTE)$(CXX) -E $(@PACKAGE@DEFINE) $(@PACKAGE@INC) -I. $< > $@ $(@PACKAGE@CXXFLAGS)
 	@cd $(dir $@) ; $(IRST_INSTALLDIR)/patch/patch4alice.prl $(notdir $@)
 
 # IRST coding rule check
-@MODULE@/check/$(SUBDIR)/%.viol : @MODULE@/check/$(SUBDIR)/%.i
-	@cd @MODULE@ ; [ -r @MODULE@ ] || ln -s ../@MODULE@ @MODULE@
-	$(MUTE)echo $@ ; $(CODE_CHECK) $< ./@MODULE@/$(@PACKAGE@SDIR) > $@
+$(@PACKAGE@CHV): $(MODDIRC)/%.viol: $(MODDIRC)/%.i
+	$(MUTE)echo $@ ; $(CODE_CHECK) $< $(shell echo $(dir $<) | sed -e 's:/check::') > $@
 
-# IRST coding rule check
-@MODULE@/check/%.viol : @MODULE@/check/%.i
-	@cd @MODULE@ ; [ -r @MODULE@ ] || ln -s ../@MODULE@ @MODULE@
-	$(MUTE)echo $@ ; $(CODE_CHECK) $< ./@MODULE@ > $@
+.SECONDARY: $(@PACKAGE@CHV:.viol=.i) $(@PACKAGE@CHI:.viol=.ii)
+
+PACKREVENG += $(@PACKAGE@CHV:.viol=.ii)
 
-@PACKAGE@PREPROC       = $(patsubst %.viol,%.i,$(@PACKAGE@CHECKS))
+# IRST code smell checker
 
-@PACKAGE@REVENGS       = $(patsubst %.viol,%.ii,$(@PACKAGE@CHECKS))
+smell-@MODULE@: $(@PACKAGE@SML)
 
-.SECONDARY: $(@PACKAGE@REVENGS) $(@PACKAGE@PREPROC)
+$(@PACKAGE@SML:.smell=_cxx.ml) : $(MODDIRZ)/%_cxx.ml : $(MODDIR)/%.cxx
+	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
+	$(MUTE)src2srcml $< $@
+
+$(@PACKAGE@SML:.smell=_h.ml) : $(MODDIRZ)/%_h.ml : $(MODDIR)/%.h
+	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
+	$(MUTE)src2srcml $< $@
+
+$(@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)[ -s $@ ] || touch $@
+
+.SECONDARY: $(@PACKAGE@SML:.smell=_cxx.ml) $(@PACKAGE@SML:.smell=_h.ml)
 
-reveng-@PACKAGE@:		@PACKAGE@/check/classDiagram.dot
+# 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))
+	@echo "Creating archive" $@ ...
+	@cd @MODULE@; tar cfzh /tmp/$@ @PACKAGE@
+	@rm -rf @MODULE@/@PACKAGE@
+	@echo "package" $@ "in /tmp/"$@
+	@echo $@ "done"
 
-@PACKAGE@/check/classDiagram.dot:	$(@PACKAGE@PREPROC)
-	@$(REV_ENG) $^
-	@-mv classDiagram.dot $@
+@MODULE@/@PACKAGE@/Makefile: @MODULE@/Makefile
+	@echo Copying $< to $@ with transformations
+	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
+	@sed 's/include \$$(ROOTSYS)\/test\/Makefile.arch/include Makefile.arch/; s/PACKAGE = .*/PACKAGE = @PACKAGE@/' < $^ > $@
 
-revdisp-@PACKAGE@:	reveng-@PACKAGE@
-	@echo revdisp for @PACKAGE@
-	@cd @PACKAGE@/check ; \
-      $(IRST_INSTALLDIR)/webreveng/create-class-diagram-pages.sh
-	@sed -e "s/\@PACKAGE\@/@PACKAGE@/g" < $(ALICE_ROOT)/build/HomePage.html > @PACKAGE@/check/HomePage.html
+@MODULE@/@PACKAGE@/Makefile.arch: $(ROOTSYS)/test/Makefile.arch
+	@echo Copying $< to $@
+	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
+	@cp -pR $^ $@
 
+@MODULE@/@PACKAGE@/PROOF-INF: @MODULE@/PROOF-INF.@PACKAGE@
+	@echo Copying $< to $@
+	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
+	@cp -pR $^ $@
+
+@MODULE@/@PACKAGE@/%: @MODULE@/%
+	@echo Copying $< to $@
+	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
+	@cp -pR $< $@
+
+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
+	@rm -rf par-tmp/@PACKAGE@
+	@echo "INFO: Testing succeeded (already cleaned up)"