Fixes for #90303: Fix PROOF-INF/SETUP.C to create PAR files for AliRoot trunk

diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile
index 6b774da5a4483f13c52cf1ddfd31f506b0c06df5..e98f20f7ee03e63c9f73e0fcd02e80e3db2ff1b4 100644 (file)
--- a/ANALYSIS/Makefile
+++ b/ANALYSIS/Makefile
@@ -39,6 +39,16 @@ endif
   endif
 #endif
 
+ifeq ($(PLATFORM),macosx)
+ROOTLIBDIR     := $(shell $(RC) --libdir)
+ifeq ($(PACKAGE),ANALYSIS)
+   PACKLDFLAGS = $(STEERBase_LIBS) $(ESD_LIBS) $(AOD_LIBS) -L$(ROOTLIBDIR)
+endif
+ifeq ($(PACKAGE),ANALYSISalice) 
+   PACKLDFLAGS = $(STEERBase_LIBS) $(ESD_LIBS) $(AOD_LIBS) $(ANALYSIS_LIBS) $(OADB_LIBS) -L$(ROOTLIBDIR) -lXMLIO -lEG -lTreePlayer
+endif
+endif
+
 CHECKXML      := $(shell root-config --has-xml)
 
 ifeq ($(CHECKXML),yes)
@@ -63,7 +73,11 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_ANALYSIS)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
+ifeq ($(PLATFORM),macosx)
+       $(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+else
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+endif
        @chmod a+x $@
        @echo "done"
 

diff --git a/ANALYSIS/PROOF-INF.ANALYSIS/BUILD.sh b/ANALYSIS/PROOF-INF.ANALYSIS/BUILD.sh
index fc9490a6c2debfe17f4f858f82939d600bd6fcce..cd822e43f911192ff1fe0d971addac2ec5500f29 100755 (executable)
--- a/ANALYSIS/PROOF-INF.ANALYSIS/BUILD.sh
+++ b/ANALYSIS/PROOF-INF.ANALYSIS/BUILD.sh
@@ -1,3 +1,14 @@
 #! /bin/sh
 
-make 
+if [ "" = "clean" ]; then
+   make clean
+   exit 0
+fi
+
+make
+rc=$?
+echo "rc=$?"
+if [ $? != "0" ] ; then
+   exit 1
+fi
+exit 0

diff --git a/ANALYSIS/PROOF-INF.ANALYSIS/SETUP.C b/ANALYSIS/PROOF-INF.ANALYSIS/SETUP.C
index ba68165c8969baf3d20567f196379945f1583c58..4627f32e9007514710c8262013787287d902595f 100644 (file)
--- a/ANALYSIS/PROOF-INF.ANALYSIS/SETUP.C
+++ b/ANALYSIS/PROOF-INF.ANALYSIS/SETUP.C
@@ -9,5 +9,7 @@ void SETUP()
    // Set our location, so that other packages can find us
    gSystem->Setenv("ANALYSIS_INCLUDE", "ANALYSIS");
 
-
+   // Set our lib coordinates, so that other packages can link to us
+   TString lib = TString::Format("-L%s -lANALYSIS", gSystem->WorkingDirectory());
+   gSystem->Setenv("ANALYSIS_LIBS", lib.Data());
 }

diff --git a/ANALYSIS/PROOF-INF.ANALYSISalice/BUILD.sh b/ANALYSIS/PROOF-INF.ANALYSISalice/BUILD.sh
index fc9490a6c2debfe17f4f858f82939d600bd6fcce..cd822e43f911192ff1fe0d971addac2ec5500f29 100755 (executable)
--- a/ANALYSIS/PROOF-INF.ANALYSISalice/BUILD.sh
+++ b/ANALYSIS/PROOF-INF.ANALYSISalice/BUILD.sh
@@ -1,3 +1,14 @@
 #! /bin/sh
 
-make 
+if [ "" = "clean" ]; then
+   make clean
+   exit 0
+fi
+
+make
+rc=$?
+echo "rc=$?"
+if [ $? != "0" ] ; then
+   exit 1
+fi
+exit 0

diff --git a/ANALYSIS/PROOF-INF.ANALYSISalice/SETUP.C b/ANALYSIS/PROOF-INF.ANALYSISalice/SETUP.C
index cb51c674ceab5786bec9a28fdc85f99b33672c4a..d1621f60d0c0ecfd1198077ff3257ff9cd31970b 100644 (file)
--- a/ANALYSIS/PROOF-INF.ANALYSISalice/SETUP.C
+++ b/ANALYSIS/PROOF-INF.ANALYSISalice/SETUP.C
@@ -8,4 +8,8 @@ void SETUP()
 
    // Set our location, so that other packages can find us
    gSystem->Setenv("ANALYSISalice_INCLUDE", "ANALYSISalice");
+
+   // Set our lib coordinates, so that other packages can link to us
+   TString lib = TString::Format("-L%s -lANALYSISalice", gSystem->WorkingDirectory());
+   gSystem->Setenv("ANALYSISalice_LIBS", lib.Data());
 }

diff --git a/OADB/Makefile b/OADB/Makefile
index cd1c4e1b3c3fb6256ebf5c9213598548c1aaaa77..66ad06bab5d84926915f83532ce51b54a3323afa 100644 (file)
--- a/OADB/Makefile
+++ b/OADB/Makefile
@@ -34,6 +34,13 @@ endif
 
 
 
+ifeq ($(PLATFORM),macosx)
+ROOTLIBDIR     := $(shell $(RC) --libdir)
+ifeq ($(PACKAGE),OADB)
+   PACKLDFLAGS = $(STEERBase_LIBS) $(ESD_LIBS) $(AOD_LIBS) $(ANALYSIS_LIBS) -L$(ROOTLIBDIR)  -lVMC -lMinuit -lEG -lGeom
+endif
+endif
+
 
 CXXFLAGS += $(ALICEINC) -g
 
@@ -43,7 +50,11 @@ OBJS          = $(SRCS:.cxx=.o)
 lib$(PACKAGE).so: $(OBJS)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
+ifeq ($(PLATFORM),macosx)
+       $(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+else
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+endif
        @chmod a+x $@
        @echo "done"
 

diff --git a/OADB/PROOF-INF.OADB/BUILD.sh b/OADB/PROOF-INF.OADB/BUILD.sh
index 8b5aaa7d1762bc3f8c0d0632a22e1067beef3a82..be46a2dca139d7fb066fa0f13a490e2c9fedb651 100755 (executable)
--- a/OADB/PROOF-INF.OADB/BUILD.sh
+++ b/OADB/PROOF-INF.OADB/BUILD.sh
@@ -1,2 +1,15 @@
 #! /bin/sh
+
+if [ "" = "clean" ]; then
+   make clean
+   exit 0
+fi
+
 make
+rc=$?
+echo "rc=$?"
+if [ $? != "0" ] ; then
+   exit 1
+fi
+exit 0
+

diff --git a/OADB/PROOF-INF.OADB/SETUP.C b/OADB/PROOF-INF.OADB/SETUP.C
index 694338400e457f276b1bd6985c568ba282d68ad7..5deb7900b0854aff71f2661d5349d13ff46c6778 100644 (file)
--- a/OADB/PROOF-INF.OADB/SETUP.C
+++ b/OADB/PROOF-INF.OADB/SETUP.C
@@ -14,6 +14,10 @@ Int_t SETUP()
   if (!oadbPath || oadbPath[0] == '\0')
     gSystem->Setenv("OADB_PATH", "OADB");
 
+  // Set our lib coordinates, so that other packages can link to us
+  TString lib = TString::Format("-L%s -lOADB", gSystem->WorkingDirectory());
+  gSystem->Setenv("OADB_LIBS", lib.Data());
+
   // We're happy
   return 0;
 

diff --git a/PWGUD/Makefile b/PWGUD/Makefile
index fb3dd357411109449550d3f4d9c90725c4eb239d..e3a9d4caceee8d74b3160f30f8a46fbf6cd050f0 100644 (file)
--- a/PWGUD/Makefile
+++ b/PWGUD/Makefile
@@ -14,10 +14,24 @@ endif
 ALICEINC = -I.
 ALICEINC += -I./$(PACKAGE)/
 
+ifneq ($(STEERBase_INCLUDE),)
+   ALICEINC += -I../$(STEERBase_INCLUDE) 
+endif
+ifneq ($(ESD_INCLUDE),)
+   ALICEINC += -I../$(ESD_INCLUDE) 
+endif
+ifneq ($(AOD_INCLUDE),)
+   ALICEINC += -I../$(AOD_INCLUDE) 
+endif
+ifneq ($(ANALYSIS_INCLUDE),)
+   ALICEINC += -I../$(ANALYSIS_INCLUDE) 
+endif
+ifneq ($(ANALYSISalice_INCLUDE),)
+   ALICEINC += -I../$(ANALYSISalice_INCLUDE) 
+endif
 ifneq ($(PWGUDbase_INCLUDE),)
    ALICEINC += -I../$(PWGUDbase_INCLUDE) 
 endif
-
 ifneq ($(PWGUDdep_INCLUDE),)
    ALICEINC += -I../$(PWGUDdep_INCLUDE) 
 endif
@@ -29,8 +43,12 @@ endif
   endif
 #endif
 
-
-
+ifeq ($(PLATFORM),macosx)
+ROOTLIBDIR     := $(shell $(RC) --libdir)
+ifeq ($(PACKAGE),PWGUDbase) 
+   PACKLDFLAGS = $(STEERBase_LIBS) $(ESD_LIBS) $(AOD_LIBS) $(ANALYSIS_LIBS) $(OADB_LIBS) $(ANALYSISalice_LIBS) -L$(ROOTLIBDIR) -lEG
+endif
+endif
 
 CXXFLAGS += $(ALICEINC) -g
 
@@ -40,7 +58,11 @@ OBJS          = $(SRCS:.cxx=.o)
 lib$(PACKAGE).so: $(OBJS)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
+ifeq ($(PLATFORM),macosx)
+       $(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+else
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+endif
        @chmod a+x $@
        @echo "done"
 

diff --git a/PWGUD/PROOF-INF.PWGUDbase/BUILD.sh b/PWGUD/PROOF-INF.PWGUDbase/BUILD.sh
index c2c787027d4cf86a5d6baed69b724e96377ca2aa..31fcaf2520e81788789d3fab4d503fe7a13d94bb 100755 (executable)
--- a/PWGUD/PROOF-INF.PWGUDbase/BUILD.sh
+++ b/PWGUD/PROOF-INF.PWGUDbase/BUILD.sh
@@ -4,4 +4,15 @@
 # touch libPWGUDselectors.pkg
 # touch libPWGUDdep.pkg
 
+if [ "" = "clean" ]; then
+   make clean
+   exit 0
+fi
+
 make libPWGUDbase.so
+rc=$?
+echo "rc=$?"
+if [ $? != "0" ] ; then
+   exit 1
+fi
+exit 0

diff --git a/PWGUD/PROOF-INF.PWGUDbase/SETUP.C b/PWGUD/PROOF-INF.PWGUDbase/SETUP.C
index 44d1926dee4040af76fccd606db2d3a29cb63683..0a0bacc3c51a93235c5472db7212f97c3e331f17 100644 (file)
--- a/PWGUD/PROOF-INF.PWGUDbase/SETUP.C
+++ b/PWGUD/PROOF-INF.PWGUDbase/SETUP.C
@@ -15,6 +15,9 @@ void SETUP()
 
    // Set our location, so that other packages can find us
    gSystem->Setenv("PWGUDbase_INCLUDE", "PWGUDbase/base");
+
+   TString lib = TString::Format("-L%s -lPWGUDbase", gSystem->WorkingDirectory());
+   gSystem->Setenv("PWGUDbase_LIBS", lib.Data());
 }
 
 Int_t CheckLoadLibrary(const char* library)

diff --git a/STEER/Makefile b/STEER/Makefile
index 0739bca09480b4023c7756f8448cb145d89c3545..932d746508400b316555647ca5912139d275c9b0 100644 (file)
--- a/STEER/Makefile
+++ b/STEER/Makefile
@@ -33,7 +33,21 @@ endif
   endif
 #endif
 
-
+ifeq ($(PLATFORM),macosx)
+ROOTLIBDIR     := $(shell $(RC) --libdir)
+ifeq ($(PACKAGE),STEERBase)
+   PACKLDFLAGS = -L$(ROOTLIBDIR)  -lVMC -lMinuit -lEG -lGeom
+endif
+ifeq ($(PACKAGE),ESD)
+   PACKLDFLAGS = $(STEERBase_LIBS) -L$(ROOTLIBDIR) -lVMC -lEG -lGeom
+endif
+ifeq ($(PACKAGE),AOD)
+   PACKLDFLAGS = $(STEERBase_LIBS) -L$(ROOTLIBDIR) -lEG -lGeom
+endif
+ifeq ($(PACKAGE),CDB)
+   PACKLDFLAGS = $(STEERBase_LIBS) -L$(ROOTLIBDIR) -lMinuit -lTree -lXMLParser
+endif
+endif
 
 
 CXXFLAGS += $(ALICEINC) -g
@@ -44,7 +58,11 @@ OBJS          = $(SRCS:.cxx=.o)
 lib$(PACKAGE).so: $(OBJS)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
+ifeq ($(PLATFORM),macosx)
+       $(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+else
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
+endif
        @chmod a+x $@
        @echo "done"
 

diff --git a/STEER/PROOF-INF.AOD/BUILD.sh b/STEER/PROOF-INF.AOD/BUILD.sh
index fc9490a6c2debfe17f4f858f82939d600bd6fcce..cd822e43f911192ff1fe0d971addac2ec5500f29 100755 (executable)
--- a/STEER/PROOF-INF.AOD/BUILD.sh
+++ b/STEER/PROOF-INF.AOD/BUILD.sh
@@ -1,3 +1,14 @@
 #! /bin/sh
 
-make 
+if [ "" = "clean" ]; then
+   make clean
+   exit 0
+fi
+
+make
+rc=$?
+echo "rc=$?"
+if [ $? != "0" ] ; then
+   exit 1
+fi
+exit 0

diff --git a/STEER/PROOF-INF.AOD/SETUP.C b/STEER/PROOF-INF.AOD/SETUP.C
index ba16206ea86357cf74110b4bf9b70a96befb19dd..00f69223b0b273b0accd9cd27ecc92f75ec382ff 100644 (file)
--- a/STEER/PROOF-INF.AOD/SETUP.C
+++ b/STEER/PROOF-INF.AOD/SETUP.C
@@ -10,6 +10,8 @@ void SETUP()
    gSystem->Load("libSTEERBase");
 
    // Load the AOD library
+   TString dypath = TString::Format("%s:%s", gSystem->WorkingDirectory(), gSystem->GetDynamicPath());
+   gSystem->SetDynamicPath(dypath);
    gSystem->Load("libAOD");
 
    // Set the include paths
@@ -17,4 +19,9 @@ void SETUP()
 
    // Set our location, so that other packages can find us
    gSystem->Setenv("AOD_INCLUDE", "AOD/AOD");
+
+   // Set our lib coordinates, so that other packages can link to us
+   TString lib = TString::Format("-L%s -lAOD", gSystem->WorkingDirectory());
+   gSystem->Setenv("AOD_LIBS", lib.Data());
 }
+

diff --git a/STEER/PROOF-INF.CDB/BUILD.sh b/STEER/PROOF-INF.CDB/BUILD.sh
index fc9490a6c2debfe17f4f858f82939d600bd6fcce..cd822e43f911192ff1fe0d971addac2ec5500f29 100755 (executable)
--- a/STEER/PROOF-INF.CDB/BUILD.sh
+++ b/STEER/PROOF-INF.CDB/BUILD.sh
@@ -1,3 +1,14 @@
 #! /bin/sh
 
-make 
+if [ "" = "clean" ]; then
+   make clean
+   exit 0
+fi
+
+make
+rc=$?
+echo "rc=$?"
+if [ $? != "0" ] ; then
+   exit 1
+fi
+exit 0

diff --git a/STEER/PROOF-INF.CDB/SETUP.C b/STEER/PROOF-INF.CDB/SETUP.C
index e05583648962605d81aa65e2391d643774a02d61..d334ca9f6442cdd8dea490ba848443cbaac3e910 100644 (file)
--- a/STEER/PROOF-INF.CDB/SETUP.C
+++ b/STEER/PROOF-INF.CDB/SETUP.C
@@ -10,6 +10,8 @@ void SETUP()
    gSystem->Load("libSTEERBase");
 
    // Load the CDB library
+   TString dypath = TString::Format("%s:%s", gSystem->WorkingDirectory(), gSystem->GetDynamicPath());
+   gSystem->SetDynamicPath(dypath);
    gSystem->Load("libCDB");
 
    // Set the include paths
@@ -17,4 +19,8 @@ void SETUP()
 
    // Set our location, so that other packages can find us
    gSystem->Setenv("CDB_INCLUDE", "CDB/CDB");
+
+   // Set our lib coordinates, so that other packages can link to us
+   TString lib = TString::Format("-L%s -lCDB", gSystem->WorkingDirectory());
+   gSystem->Setenv("CDB_LIBS", lib.Data());
 }

diff --git a/STEER/PROOF-INF.ESD/BUILD.sh b/STEER/PROOF-INF.ESD/BUILD.sh
index fc9490a6c2debfe17f4f858f82939d600bd6fcce..cd822e43f911192ff1fe0d971addac2ec5500f29 100755 (executable)
--- a/STEER/PROOF-INF.ESD/BUILD.sh
+++ b/STEER/PROOF-INF.ESD/BUILD.sh
@@ -1,3 +1,14 @@
 #! /bin/sh
 
-make 
+if [ "" = "clean" ]; then
+   make clean
+   exit 0
+fi
+
+make
+rc=$?
+echo "rc=$?"
+if [ $? != "0" ] ; then
+   exit 1
+fi
+exit 0

diff --git a/STEER/PROOF-INF.ESD/SETUP.C b/STEER/PROOF-INF.ESD/SETUP.C
index c16101bdc3e348461ad4ced52163a2c4deca0b77..8ebe6b36a26a5dff72de45fa6612c554ae9bba2e 100644 (file)
--- a/STEER/PROOF-INF.ESD/SETUP.C
+++ b/STEER/PROOF-INF.ESD/SETUP.C
@@ -10,6 +10,8 @@ void SETUP()
    gSystem->Load("libSTEERBase");
 
    // Load the ESD library
+   TString dypath = TString::Format("%s:%s", gSystem->WorkingDirectory(), gSystem->GetDynamicPath());
+   gSystem->SetDynamicPath(dypath);
    gSystem->Load("libESD");
 
    // Set the include paths
@@ -17,4 +19,9 @@ void SETUP()
 
    // Set our location, so that other packages can find us
    gSystem->Setenv("ESD_INCLUDE", "ESD/ESD");
+
+   // Set our lib coordinates, so that other packages can link to us
+   TString lib = TString::Format("-L%s -lESD", gSystem->WorkingDirectory());
+   gSystem->Setenv("ESD_LIBS", lib.Data());
 }
+

diff --git a/STEER/PROOF-INF.STEERBase/BUILD.sh b/STEER/PROOF-INF.STEERBase/BUILD.sh
index fc9490a6c2debfe17f4f858f82939d600bd6fcce..cd822e43f911192ff1fe0d971addac2ec5500f29 100755 (executable)
--- a/STEER/PROOF-INF.STEERBase/BUILD.sh
+++ b/STEER/PROOF-INF.STEERBase/BUILD.sh
@@ -1,3 +1,14 @@
 #! /bin/sh
 
-make 
+if [ "" = "clean" ]; then
+   make clean
+   exit 0
+fi
+
+make
+rc=$?
+echo "rc=$?"
+if [ $? != "0" ] ; then
+   exit 1
+fi
+exit 0

diff --git a/STEER/PROOF-INF.STEERBase/SETUP.C b/STEER/PROOF-INF.STEERBase/SETUP.C
index dfffb03ce0eee4b3d854959582b05ffea3fd1098..5554b01ebf72f436519e9d8be1e2e29684ff779e 100644 (file)
--- a/STEER/PROOF-INF.STEERBase/SETUP.C
+++ b/STEER/PROOF-INF.STEERBase/SETUP.C
@@ -8,8 +8,7 @@ void SETUP()
    gSystem->Load("libMinuit");
 
    // Load the STEERBase library
-   TString dypath = gSystem->GetDynamicPath();
-   dypath.Prepend(".:");
+   TString dypath = TString::Format("%s:%s", gSystem->WorkingDirectory(), gSystem->GetDynamicPath());
    gSystem->SetDynamicPath(dypath);
    gSystem->Load("libSTEERBase");
 
@@ -18,4 +17,8 @@ void SETUP()
 
    // Set our location, so that other packages can find us
    gSystem->Setenv("STEERBase_INCLUDE", "STEERBase/STEERBase");
+
+   // Set our lib coordinates, so that other packages can link to us
+   TString lib = TString::Format("-L%s -lSTEERBase", gSystem->WorkingDirectory());
+   gSystem->Setenv("STEERBase_LIBS", lib.Data());
 }