X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-Finalize.sh;h=15a0aec2fb8853dfb71876a0b518a28a6721f9e1;hb=4e5e6d52e9be90b36ef08b90138669c51f5b4b49;hp=e9fb0588198fe5da08ac51ba155a41a03530cb25;hpb=c6a324a9e343fcd992fc3e73e886bc0323d5c0a7;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index e9fb058..15a0aec 100644
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -44,49 +44,53 @@ echo "=================================== in ThirdParty-install-Finalize.sh ETC_
 # /// \TODO move theese ones upper in the process!  JPR
 
 export GDCM_DIR=$installPrefixThird/lib/gdcm/
-export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
 export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
 
+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 $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 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'   											>> $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 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
 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
 fi
 
-   sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
-   sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC
+cd $PWD/scripts
+source ThirdParty-bashrc.sh
+chown -R $loginUserName  $generationdir
+chgrp -R $loginGroupName $generationdir
+source $ETC_BASHRC 
 
-# - add line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
+## 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/.
 
-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' >> $ETC_BASHRC 
 
-chown -R $loginUserName  $generationdir
-chgrp -R $loginGroupName $generationdir