modified Jamroot file for SL6 migration

Examples/Tutorial/FitIF/Jamfile

@@ -8,9 +8,11 @@ lib FitIF :
         MinimizerInterface//MinimizerInterface  
         $(TOP)/qft++//qft++ 
         $(TOP)/ErrLogger//ErrLogger
-	: <use>$(TOP)//Geneva 
+	: <use>$(TOP)//Geneva
+ 	  <use>$(TOP)//Minuit2 
 	: 
-	: <library>$(TOP)//Geneva ;
+	: <library>$(TOP)//Geneva
+ 	  <library>$(TOP)//Minuit2 ;
 
 exe ToyFitApp : ToyFitApp.cc FitIF : ;
 

Examples/Tutorial/MinuitFit/Jamfile

@@ -5,9 +5,11 @@ lib MinuitFit :
         [ glob *.cc : *App.cc ]  
         $(TOP)/qft++//qft++ 
         $(TOP)/ErrLogger//ErrLogger
-	: <use>$(TOP)//Geneva 
+	: <use>$(TOP)//Geneva
+ 	  <use>$(TOP)//Minuit2 
 	: 
-	: <library>$(TOP)//Geneva ;
+	: <library>$(TOP)//Geneva
+ 	  <library>$(TOP)//Minuit2 ;
 
 exe MinuitFitApp : MinuitFitApp.cc MinuitFit : ;
 

Jamroot

-import os ;
-local MinuitVariant = [ os.environ MinuitVariant ] ; 
+#import os ;
+#local MinuitVariant = [ os.environ MINUITVARIANT ] ; 
 path-constant TOP : . ;
 local rlibs = [ SHELL "$(ROOTSYS)/bin/root-config --libs" ] ;
 ROOTLIBS = [ MATCH "(.*)[\n]" : $(rlibs) ] ;
 BOOSTLIBS =  -lboost_date_time -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system -lboost_thread -lboost_test_exec_monitor ;
-if $(MinuitVariant) = Minuit
-{
- OPEN_MP_FLAG = "" ;
-}
-else if $(MinuitVariant) = Minuit2noMP
-{
- OPEN_MP_FLAG = openmp ;
-}
+#if $(MinuitVariant) = Minuit2
+#{
+# OPEN_MP_FLAG = "" ;
+#}
+#else if $(MinuitVariant) = Minuit2noMP
+#{
+# OPEN_MP_FLAG = "-fopenmp" ;
+#}
 project :
 	requirements <include>./  
 	<include>$(extern)/include
@@ -19,13 +19,13 @@ project :
 	<include>$(GENEVA)/include
 	<link>static
 	<cxxflags>-pthread
-	<cxxflags>-f$(OPEN_MP_FLAG)
+	<cxxflags>-fopenmp
 	<linkflags>$(ROOTLIBS)
 	<linkflags>$(BOOSTLIBS)
-	<linkflags>-l$(MinuitVariant)
+#	<linkflags>$(extern)/lib/Linux26SL6_x86_64_gcc444/libMinuit2.a
 	<linkflags>-lgomp
 	<linkflags>-pthread
-	<linkflags>-f$(OPEN_MP_FLAG)
+	<linkflags>-fopenmp
 	;
 
 actions rootlibs
@@ -41,6 +41,7 @@ lib Geneva : :  <file>$(GENEVA)/lib/libgemfony-common.so
 		<file>$(GENEVA)/lib/libgemfony-geneva-individuals.so
  : : ;
 lib HepMc : : <file>$(extern)/lib/libHepMC.so : : ;
+lib Minuit2 : : <file>$(extern)/lib/Linux26SL6_x86_64_gcc444/libMinuit2.so : : ;
  
 build-project qft++ ;
 build-project Utils ;

PwaUtils/Jamfile

@@ -6,4 +6,6 @@ lib PwaUtils :
 	$(TOP)/Utils//Utils 
 	$(TOP)/qft++//qft++
 	$(TOP)/ErrLogger//ErrLogger 
-	: : : ;
+	: <use>$(TOP)//Minuit2
+	: 
+	: <library>$(TOP)//Minuit2 ;

SetEnv_rub

@@ -5,7 +5,8 @@ setenv CMAKE_SOURCE_DIR `pwd | sed -e 's/\/nfs//'`
 setenv LD_LIBRARY_PATH ${ROOTSYS}/lib
 setenv PATH ${PATH}:${ROOTSYS}/bin:/data/pegasus1/PANDA/bin/
 setenv BOOST_BUILD_PATH /data/pegasus1/PANDA/PWA/boost-build/
-setenv MinuitVariant Minuit2
+#setenv MINUITVARIANT Minuit2
+#setenv MINUITVARIANT Minuit2noMP
 
 echo "\n ROOTSYS: " $ROOTSYS 
 echo "\n CMAKE_SOURCE_DIR: " $CMAKE_SOURCE_DIR