X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-Finalize.sh;h=e5c752ed8073b83ba757f14568aefcdbf40d0d58;hb=fd2aac7e56a2ae4ecd5ed98deec488f6dbbedc1b;hp=2310b2e55e04d3d16b5f7503e6b6dee622735167;hpb=b09ac6096e0e160da27ebeff3732c465244a7765;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 2310b2e..e5c752e 100644
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -1,3 +1,27 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
 #!/bin/bash
 
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
@@ -15,9 +39,17 @@
 fi
 
 source $PWD/scripts/CreaTools-configure.sh
+echo "=================================== in ThirdParty-install-Finalize.sh ETC_BASHRC : " $ETC_BASHRC
 
-#deal with create creatools_third_party_libraries_config.sh
+# /// \TODO move theese ones upper in the process!  JPR
 
+export GDCM_DIR=$installPrefixThird/lib/gdcm/
+export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
+
+
+#deal with create creatools_third_party_libraries_config.sh
+echo "=========================================================installPrefixThird "$installPrefixThird
 if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
 then
    rm $installPrefixThird/share/creatools_third_party_library_config.sh
@@ -25,49 +57,39 @@ fi
 
 if [ ! -e $installPrefixThird/share ]
 then
-   mkdir $installPrefixThird/share
+   mkdir -p $installPrefixThird/share
 fi
 touch     $installPrefixThird/share/creatools_third_party_library_config.sh
 chmod 755 $installPrefixThird/share/creatools_third_party_library_config.sh
 
-echo export PATH='$'PATH:$installPrefixThird/bin           >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6        >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export ITK_DIR=$installPrefixThird/lib/InsightToolkit >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export GDCM_DIR=$installPrefixThird/lib/gdcm          >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export TTH=$installPrefixThird/bin/tth                >> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo installPrefixThird='$1'   											>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export PATH='$'PATH:'$'installPrefixThird/bin           	>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export VTK_DIR='$'installPrefixThird/lib/vtk-5.10        	>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export ITK_DIR='$'installPrefixThird/lib/InsightToolkit	>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export GDCM_DIR='$'installPrefixThird/lib/gdcm          	>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export TTH='$'installPrefixThird/bin/tth                	>> $installPrefixThird/share/creatools_third_party_library_config.sh
 
 if [ $OperatingSystem = "MacOS" ]
 then
-echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 else
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 fi
 
-  case "$OperatingSystem" in
-  Fedora)
-     export ETC_BASHRC=$HOME/.bashrc
-     ;;
-  Ubuntu)
-     export ETC_BASHRC=$HOME/.bashrc
-     ;;
-  MacOS)
-     export ETC_BASHRC=$HOME/.profile
-     ;;
-  esac
-
    sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
    sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC
 
-
 # - add line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
-echo installPrefixThird=$installPrefixThird >> $ETC_BASHRC
-echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh' >> $ETC_BASHRC 
-
 
+echo "====================================================ETC_BASHRC "  $ETC_BASHRC 
+echo installPrefixThird=$installPrefixThird >> $ETC_BASHRC
+echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh $installPrefixThird' >> $ETC_BASHRC 
 
 chown -R $loginUserName  $generationdir
 chgrp -R $loginGroupName $generationdir
+
+source ~/.bashrc