X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=3a6233288a32b6387e4e2ec7a1c0e0285ebfb28a;hb=70d9362090177e47de17d2065e7d8c27762c21d6;hp=fd17b33491cee5e8e0744b3d5bae5e84e044c65b;hpb=5acba24808912d51cb8200a30fbbb23f53161e35;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index fd17b33491c..3a6233288a3 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       ACORDE HMPID T0 BCM STRUCT EVGEN RALICE VZERO \
       THijing MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
       THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
-      JETAN HLT LHC ESDCheck STAT
+      JETAN HLT LHC ESDCheck STAT TTherminator CORRFW
 
 ifneq ($(wildcard $(ROOTSYS)/include/TGLIncludes.h),)
 ALIROOTMODULES += EVE
@@ -160,7 +160,8 @@ DEPINC     += $(GENINC)
 # Libraries will be linked against SHLIB
 # ROOT libraries 
 
-ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lProof -lProofPlayer -lMLP
+ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lProof -lProofPlayer -lMLP \
+		-lSpectrum
 
 ROOTPLIBS     := -lEGPythia6
 
@@ -170,14 +171,29 @@ ALILIBS	      := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
 
 LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
+ARVERSIONFILE := $(EXPORTDIR)/ARVersion.h
+SVNREV := $(strip $(shell svn info | grep "Last Changed Rev:" | cut -d: -f2 ))
+SVNBRANCH := $(subst //alisoft.cern.ch/AliRoot/,,$(shell svn info | grep "URL:" | cut -d: -f3 ))
+
 #-------------------------------------------------------------------------------
 # default target
 
-default:
+default: $(ARVERSIONFILE)
 	$(MUTE)$(MAKE) aliroot
 
 FORCE:
 
+#-------------------------------------------------------------------------------
+# Write header file with aliroot svn version and url
+
+$(ARVERSIONFILE): FORCE $(EXPORTDIR)
+	$(MUTE)rm -f $(ARVERSIONFILE)
+	@echo "***** Making $(ARVERSIONFILE) *****"
+	@echo "#ifndef ALIROOT_ARVersion" >> $@
+	@echo "#define ALIROOT_ARVersion" >> $@
+	@echo "#define ALIROOT_SVN_REVISION $(SVNREV)" >> $@
+	@echo "#define ALIROOT_SVN_BRANCH \"$(SVNBRANCH)\"" >> $@
+	@echo "#endif" >> $@ 
 #-------------------------------------------------------------------------------
 # Each module will add to these macros
 
@@ -258,10 +274,80 @@ aliroot: alilibs $(BINPATH) $(ALLEXECS)
 
 ROOTALIBDIR=$(shell root-config --libdir)
 
-alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(alimdcCXXO)
+ALIMDCSPECFILE=$(RAWDIRO)/alimdc.spec
+ALIMDCVERSION=$(subst -,.,$(notdir $(subst /RAW/mdc.h,,$(shell svn info RAW/mdc.h | grep "URL:" | cut -d: -f3 ))))
+ALIMDCRELEASE=$(firstword $(shell svn info RAW/mdc.h | grep "Revision:" | cut -d: -f2 ))
+
+alimdc-rpm: alimdc-static alimdc-specfile
+	$(MUTE)rm -rf alimdc-root
+	$(MUTE)mkdir -p alimdc-root/opt/alimdc/lib
+	$(MUTE)mkdir -p alimdc-root/opt/alimdc/include
+	$(MUTE)cp RAW/mdc.h alimdc-root/opt/alimdc/include
+	$(MUTE)cp $(LIBPATH)/libAliMDC.a \
+	$(ROOTALIBDIR)/libRoot.a \
+	$(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
+	alimdc-root/opt/alimdc/lib
+	$(MUTE)rm -rf RPMS
+	$(MUTE)mkdir -p RPMS/i386
+	$(MUTE)rpmbuild --verbose --define "_topdir $(ALICE_ROOT)" --define "_tmppath $(ALICE_ROOT)" -bb $(ALIMDCSPECFILE)
+	$(MUTE)cp -p RPMS/i386/alimdc-*.rpm .
+	$(MUTE)rm -rf alimdc-root
+	$(MUTE)rm -rf RPMS
+	@echo "***** alimdc RPM created and put $(ALICE_ROOT) folder *****"
+
+alimdc-specfile: $(RAWDIRO)
+	$(MUTE)rm -rf $(ALIMDCSPECFILE)
+	@echo "***** Making alimdc RPM spec-file $(ALIMDCSPECFILE) *****"
+	@echo "# RPM specfile for alimdc static libs" >> $(ALIMDCSPECFILE)
+	@echo "# Package contains both ROOT and AliRoot" >> $(ALIMDCSPECFILE)
+	@echo "# static libs needed by mStreamRecorder" >> $(ALIMDCSPECFILE)
+	@echo "# in order to ROOT-ify the incoming raw" >> $(ALIMDCSPECFILE)
+	@echo "# data" >> $(ALIMDCSPECFILE)
+	@echo "# Example how-to build alimdc RPM:" >> $(ALIMDCSPECFILE)
+	@echo "# cd $ALICE_ROOT" >> $(ALIMDCSPECFILE)
+	@echo "# make alimdc-rpm" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "Summary: AliMDC static libraries" >> $(ALIMDCSPECFILE)
+	@echo "Name: alimdc" >> $(ALIMDCSPECFILE)
+	@echo "Version:  $(ALIMDCVERSION)" >> $(ALIMDCSPECFILE)
+	@echo "Release: $(ALIMDCRELEASE)" >> $(ALIMDCSPECFILE)
+	@echo "# Copyright: CERN Alice Off-line" >> $(ALIMDCSPECFILE)
+	@echo "License: CERN Alice Off-line" >> $(ALIMDCSPECFILE)
+	@echo "Vendor: ALICE Core Off-line Group" >> $(ALIMDCSPECFILE)
+	@echo "URL: http://aliceinfo.cern.ch" >> $(ALIMDCSPECFILE)
+	@echo "Group: Applications/Alice" >> $(ALIMDCSPECFILE)
+	@echo "Prefix: /opt/%{name}" >> $(ALIMDCSPECFILE)
+	@echo "BuildRoot: %{_tmppath}/%{name}-root" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# automatic dependencies" >> $(ALIMDCSPECFILE)
+	@echo "AutoReqProv: yes" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# list here required RPM packages for runtime" >> $(ALIMDCSPECFILE)
+	@echo "Requires: glibc" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "Provides: alimdc" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# description of the package" >> $(ALIMDCSPECFILE)
+	@echo "%description" >> $(ALIMDCSPECFILE)
+	@echo "Package contains both ROOT and AliRoot" >> $(ALIMDCSPECFILE)
+	@echo "static libs needed by mStreamRecorder" >> $(ALIMDCSPECFILE)
+	@echo "in order to ROOT-ify the incoming raw" >> $(ALIMDCSPECFILE)
+	@echo "data. The package version correspond to" >> $(ALIMDCSPECFILE)
+	@echo "the AliRoot one." >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# list of files to be installed" >> $(ALIMDCSPECFILE)
+	@echo "%files" >> $(ALIMDCSPECFILE)
+	@echo "%defattr (-,root,root)" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libAliMDC.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libRoot.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libpcre.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libfreetype.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/include/mdc.h" >> $(ALIMDCSPECFILE)
+
+alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(STEERBaseALIB) $(alimdcCXXO)
 	 $(MUTE)rm -rf $(LIBPATH)/libAliMDC.a
 	 $(MUTE)rm -rf junk
-	 mkdir junk && cd junk && ar x ../$(RAWDatabaseALIB) && ar x ../$(MDCALIB) && ar x ../$(ESDALIB) && ar r ../$(LIBPATH)/libAliMDC.a *.o && cd .. && rm -rf junk
+	 mkdir junk && cd junk && ar x ../$(RAWDatabaseALIB) && ar x ../$(MDCALIB) && ar x ../$(ESDALIB) && ar x ../$(STEERBaseALIB) && ar r ../$(LIBPATH)/libAliMDC.a *.o && cd .. && rm -rf junk
 	 $(LD) $(LDFLAGS) -o $(BINPATH)/alimdca $(alimdcCXXO) \
 	 $(LIBPATH)/libAliMDC.a \
 	 $(ROOTALIBDIR)/libRoot.a \