fixing bug in par file creation when package name was equally to a directory name...

added par file support for EventMixing library

diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile
index df7f64f5802b3fcabfd5daced50a50211fd7acfe..4355e041482f0ee552c2ab68f288a1f1fd8c9d37 100644 (file)
--- a/ANALYSIS/Makefile
+++ b/ANALYSIS/Makefile
@@ -24,6 +24,10 @@ ifneq ($(ANALYSIS_INCLUDE),)
    ALICEINC += -I../$(ANALYSIS_INCLUDE)
 endif
 
+ifneq ($(ANALYSISalice_INCLUDE),)
+   ALICEINC += -I../$(ANALYSISalice_INCLUDE)
+endif
+
 # only if no par file was loaded before
 ifeq ($(ALICEINC),-I.)
   ifneq ($(ALICE_ROOT),)

diff --git a/ANALYSIS/PROOF-INF.EventMixing/BUILD.sh b/ANALYSIS/PROOF-INF.EventMixing/BUILD.sh
new file mode 100755 (executable)
index 0000000..fc9490a
--- /dev/null
+++ b/ANALYSIS/PROOF-INF.EventMixing/BUILD.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+make 

diff --git a/ANALYSIS/PROOF-INF.EventMixing/SETUP.C b/ANALYSIS/PROOF-INF.EventMixing/SETUP.C
new file mode 100644 (file)
index 0000000..7c75e71
--- /dev/null
+++ b/ANALYSIS/PROOF-INF.EventMixing/SETUP.C
@@ -0,0 +1,12 @@
+void SETUP()
+{
+  // Load the ANALYSIS library
+   gSystem->Load("libEventMixing");
+
+   // Set the include paths
+   gROOT->ProcessLine(".include EventMixing");
+   gROOT->ProcessLine(".include EventMixing/EventMixing");
+
+   // Set our location, so that other packages can find us
+   gSystem->Setenv("EventMixing_INCLUDE", "EventMixing");
+}

diff --git a/build/module.tpl b/build/module.tpl
index 9d2548def7db38a57b0a5af7fa1438c972847dc3..61784292a58c2e8e3e2ff13325a3d0fcd94b8c22 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -362,27 +362,27 @@ $(@PACKAGE@SML) : $(MODDIRZ)/%.smell : $(MODDIRZ)/%_cxx.ml $(MODDIRZ)/%_h.ml
 .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) $(FSRCS) Makefile Makefile.arch lib@PACKAGE@.pkg PROOF-INF))
+@PACKAGE@.par: $(patsubst %,par-build/@MODULE@/@PACKAGE@/%,$(filter-out dict.%, $(HDRS) $(SRCS) $(DHDR) $(PKGFILE) $(FSRCS) Makefile Makefile.arch lib@PACKAGE@.pkg PROOF-INF))
        @echo "Creating archive" $@ ...
-       @cd @MODULE@; (tar --exclude=.svn -czhf ../$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in" $(PWD)/$@) || (tar --exclude=.svn -czhf /tmp/$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in /tmp/"$@)
-       @rm -rf @MODULE@/@PACKAGE@
+       @cd par-build/@MODULE@; (tar --exclude=.svn -czhf ../../$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in" $(PWD)/$@) || (tar --exclude=.svn -czhf /tmp/$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in /tmp/"$@)
+       @rm -rf par-build/@MODULE@/@PACKAGE@
 
-@MODULE@/@PACKAGE@/Makefile: @MODULE@/Makefile
+par-build/@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@/' < $^ > $@
 
-@MODULE@/@PACKAGE@/Makefile.arch: $(ROOTSYS)/test/Makefile.arch
+par-build/@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@
+par-build/@MODULE@/@PACKAGE@/PROOF-INF: @MODULE@/PROOF-INF.@PACKAGE@
        @echo Copying $< to $@
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
        @cp -pR $^ $@
 
-@MODULE@/@PACKAGE@/%: @MODULE@/%
+par-build/@MODULE@/@PACKAGE@/%: @MODULE@/%
        @echo Copying $< to $@
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
        @cp -pR $< $@