now also adapt the setup.csh

git-svn-id: http://root.cern.ch/svn/root/trunk@48353 27541ba8-7e3a-0410-8455-c3a389f83636

tmva/test/setup.csh

-#! /bin/csh
+#!/bin/csh -f
 
-cd ..
-mkdir -p include; 
-cd include;
-if ( ! -l TMVA ) then
-    ln -s ../src TMVA
+setenv HERE $PWD
+
+
+if ( $#argv != 1 )  then
+  cd .. ; setenv TMVASYS $PWD; cd $HERE 
+  set TMVATESTDIR=1
+  echo $TMVASYS
+  echo $PWD
+  if (( "$TMVASYS/test" != "$PWD" )) then
+      echo
+      echo "  please give the directory of your TMVA installation you want to use as argument to  "
+      echo "  source setup.csh <the TMVA installation directory>"
+      echo
+      exit
+  endif
+else
+  setenv TMVASYS $argv[1]
+  set TMVATESTDIR=0
+  echo 
+  echo "  you have specified to use TMVA installed in:" $argv[1]
+endif
+
+# check if the TMVA directory specified REALLY contains the TMVA libraries, otherwise it
+# might default to the ROOT version causing unnecessary surprises
+
+if (( ! -f $TMVASYS/lib/libTMVA.so )) then
+    echo 
+    echo "  please give a PROPER directory of your TMVA installation as argument to  "
+    echo "  source setup.csh <the TMVA installation directory> "
+    echo 
+    echo "  currently I look at $TMVASYS/lib/libTMVA.so  which doesn't exist "
+    echo
+    exit
 endif
-cd -
+
+
+echo "use TMVA version installed in " $TMVASYS
+
 
 # set symbolic links to data file and to rootmaps
-cd test
-if ( ! -l tmva_example.root ) then
+#cd test;
+if (( (!  -l tmva_example.root)  && ($TMVATESTDIR == 1 ) )) then 
     ln -s data/toy_sigbkg.root tmva_example.root
-endif
-if ( ! -l tmva_reg_example.root ) then
+ endif
+if (( (! -l tmva_reg_example.root) && ($TMVATESTDIR == 1) )) then 
     ln -s data/regression_parabola_noweights.root tmva_reg_example.root
+ endif
+if (( ! -l libTMVA.rootmap )) then 
+    ln -s $TMVASYS/lib/libTMVA.rootmap
+endif
+if (( ! -l .rootmap )) then 
+    ln -s $TMVASYS/lib/libTMVA.rootmap .rootmap
+endif
+if (( ! -f TMVAlogon.C )) then 
+    cp $TMVASYS/test/TMVAlogon.C . 
 endif
-if ( ! -l libTMVA.rootmap ) then
-    ln -s ../lib/libTMVA.rootmap
-    ln -s ../lib/libTMVA.rootmap .rootmap
+if (( ! -f TMVAGui.C )) then 
+    cp $TMVASYS/test/TMVAGui.C . 
 endif
-cd -
+if (( ! -f TMVARegGui.C )) then 
+    cp $TMVASYS/test/TMVARegGui.C . 
+endif
+if (( ! -f tmvaglob.C )) then 
+    cp $TMVASYS/test/tmvaglob.C . 
+endif
+if (( ! -f .rootrc )) then 
+    cp $TMVASYS/test/.rootrc . 
+endif
+
 
 # Check Root environment setup
 # It's checked in such a fancy way, because if you install ROOT using
@@ -37,17 +85,17 @@ endif
 if ( `root-config --platform` == "macosx" ) then
 
     if ($?DYLD_LIBRARY_PATH) then
-        setenv DYLD_LIBRARY_PATH $PWD/lib:${DYLD_LIBRARY_PATH}
+        setenv DYLD_LIBRARY_PATH $TMVASYS/lib:${DYLD_LIBRARY_PATH}
     else 
-        setenv DYLD_LIBRARY_PATH $PWD/lib:`root-config --libdir`
+        setenv DYLD_LIBRARY_PATH $TMVASYS/lib:`root-config --libdir`
     endif
 
 else if ( `root-config --platform` == "solaris" ) then
 
     if ($?LD_LIBRARY_PATH) then
-        setenv LD_LIBRARY_PATH $PWD/lib:${LD_LIBRARY_PATH}
+        setenv LD_LIBRARY_PATH $TMVASYS/lib:${LD_LIBRARY_PATH}
     else 
-        setenv LD_LIBRARY_PATH $PWD/lib:`root-config --libdir`
+        setenv LD_LIBRARY_PATH $TMVASYS/lib:`root-config --libdir`
     endif
 
 else
@@ -55,14 +103,14 @@ else
     # The ROOTSYS/lib may be set in a LD_LIBRARY_PATH or using ld.so
 
     grep -q `echo $ROOTSYS/lib /etc/ld.so.cache`
-    set root_in_ld = $status
+    set root_in_ld=$status
     if ($?LD_LIBRARY_PATH) then
-        setenv LD_LIBRARY_PATH $PWD/lib:${LD_LIBRARY_PATH}
+        setenv LD_LIBRARY_PATH $TMVASYS/lib:${LD_LIBRARY_PATH}
     else 
         if ( ${root_in_ld} == 1 ) then
-            setenv LD_LIBRARY_PATH $PWD/lib:`root-config --libdir`
+            setenv LD_LIBRARY_PATH $TMVASYS/lib:`root-config --libdir`
         else
-            setenv LD_LIBRARY_PATH $PWD/lib
+            setenv LD_LIBRARY_PATH $TMVASYS/lib
         endif
     endif
 
@@ -71,10 +119,10 @@ endif
 # prepare for PyROOT
 
 if ($?PYTHONPATH) then
-    setenv PYTHONPATH ${PWD}/lib:`root-config --libdir`:${PYTHONPATH}
+    setenv PYTHONPATH ${TMVASYS}/lib:`root-config --libdir`:${PYTHONPATH}
 else
-    setenv PYTHONPATH ${PWD}/lib:`root-config --libdir`/lib
+    setenv PYTHONPATH ${TMVASYS}/lib:`root-config --libdir`/lib
 endif
 
-cd test
 
+cd $HERE

tmva/test/setup.sh

@@ -12,11 +12,11 @@ if [ $# -ne 1 ] ; then
       echo
       return
   fi
-  echo "$TMVASYS/test"
-  echo "$PWD"
 else
   export TMVASYS=$1
   TMVATESTDIR=0
+  echo 
+  echo "  you have specified to use TMVA installed in:" $argv[1]
 fi
 
 # check if the TMVA directory specified REALLY contains the TMVA libraries, otherwise it