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

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index e5c752e..83e2569 100644
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -46,50 +46,55 @@ echo "=================================== in ThirdParty-install-Finalize.sh ETC_
 export GDCM_DIR=$installPrefixThird/lib/gdcm/
 export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
 export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
+export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+
+baseLibraryThirdPartyDir=$installPrefixThird/share/creatools
 
 
 #deal with create creatools_third_party_libraries_config.sh
 echo "=========================================================installPrefixThird "$installPrefixThird
-if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
+if [ -f $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh ]
 then
-   rm $installPrefixThird/share/creatools_third_party_library_config.sh
+   rm $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 fi
 
-if [ ! -e $installPrefixThird/share ]
+if [ ! -e $baseLibraryThirdPartyDir ]
 then
-   mkdir -p $installPrefixThird/share
+   mkdir -p $baseLibraryThirdPartyDir
 fi
-touch     $installPrefixThird/share/creatools_third_party_library_config.sh
-chmod 755 $installPrefixThird/share/creatools_third_party_library_config.sh
+touch     $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+chmod 755 $baseLibraryThirdPartyDir/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
+echo installPrefixThird='$1'   											>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export PATH='$'PATH:'$'installPrefixThird/bin           	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export VTK_DIR='$'installPrefixThird/lib/vtk-5.10        	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export ITK_DIR='$'installPrefixThird/lib/InsightToolkit	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export GDCM_DIR='$'installPrefixThird/lib/gdcm          	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export WT_DIR='$'installPrefixThird/lib/wt-3.3.4          	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export TTH='$'installPrefixThird/bin/tth                	>> $baseLibraryThirdPartyDir/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   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/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   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 fi
 
-   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 "====================================================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 
-
+cd $PWD/scripts
+source ThirdParty-bashrc.sh
 chown -R $loginUserName  $generationdir
 chgrp -R $loginGroupName $generationdir
+source $ETC_BASHRC 
+
+## copping files to prepare the package Intall-Creatools-Bin.sh
+cp ThirdParty-bashrc.sh $baseLibraryThirdPartyDir/.
+cp ThirdParty-install-Base-Stuff.sh $baseLibraryThirdPartyDir/.
+cp ThirdParty-install-Base-rpm.sh $baseLibraryThirdPartyDir/.
+
 
-source ~/.bashrc