From: davila Date: Wed, 31 Dec 2014 08:29:36 +0000 (+0100) Subject: #2493 creaToolsTools Feature New Normal - Prepare and Install binary CreaTools... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaToolsTools.git;a=commitdiff_plain;h=be3ecca8f693fc77904d72ffd79533262a78cd51 #2493 creaToolsTools Feature New Normal - Prepare and Install binary CreaTools version - Linux --- diff --git a/Linux/installscript b/Linux/installscript index 9c2ef2b..ee91e13 100755 --- a/Linux/installscript +++ b/Linux/installscript @@ -159,9 +159,6 @@ ITKVersion=ITK3 export ETC_BASHRC=~/.bashrc - - - function usage { echo "installscript [options] command" echo "creatools configure/compile/install script" @@ -359,8 +356,6 @@ if [ `checkVal $command all 3rd 3rd-base` == true ] ; then bash scripts/ThirdParty-install.sh fi - - # vtk if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then bigDisplay "INSTALL VTK" diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index 9260a64..4190ee0 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -52,15 +52,13 @@ fi cd $scriptDir - + cp CreaTools-bashrc.sh $baseLibraryCreatoolsDir/. #create creatools_base_library_config.sh at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011 export baseLibraryCreatoolsDir=$installPrefix/share/creatools mkdir -p $baseLibraryCreatoolsDir - cp CreaTools-bashrc.sh $baseLibraryCreatoolsDir/. - echo '## This file is call from .bashrc' > $baseLibraryCreatoolsDir/creatools_base_library_config.sh bash installmodBash.sh $installPrefix @@ -97,9 +95,8 @@ bash installmodNomake.sh $buildType wx $generationdir $installPrefix bash installmodNomake.sh $buildType wxvtk $generationdir $installPrefix - -source CreaTools-bashrc.sh -source $ETC_BASHRC + source CreaTools-bashrc.sh + source $ETC_BASHRC ##EED 21/12/2014 ##EED echo "===================================================" diff --git a/Linux/scripts/Install-Creatools-Bin.sh b/Linux/scripts/Install-Creatools-Bin.sh index f44dce7..cc87b37 100755 --- a/Linux/scripts/Install-Creatools-Bin.sh +++ b/Linux/scripts/Install-Creatools-Bin.sh @@ -29,8 +29,13 @@ mkdir Creatools cd Creatools wget http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/creatools-DownloadLastVersion.sh source creatools-DownloadLastVersion.sh + ETC_BASHRC=~/.bashrc -installPrefix=$(pwd)/creatools_install/ +installPrefix=$(pwd)/creatools_install +installPrefixThird=$(pwd)/thirdparty_install + +source thirdparty_install/share/creatools/ThirdParty-bashrc.sh source creatools_install/share/creatools/CreaTools-bashrc.sh + cd .. diff --git a/Linux/scripts/ThirdParty-bashrc.sh b/Linux/scripts/ThirdParty-bashrc.sh new file mode 100644 index 0000000..c9aa381 --- /dev/null +++ b/Linux/scripts/ThirdParty-bashrc.sh @@ -0,0 +1,38 @@ +# --------------------------------------------------------------------- +# +# 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 + +echo ThirdParty-bashrc.sh +echo $ETC_BASHRC +echo $installPrefixThird + +# Cleanning line in .bashrc file +sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC +sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC + +echo "====================================================ETC_BASHRC " $ETC_BASHRC +echo installPrefixThird=$installPrefixThird >> $ETC_BASHRC +echo '[ -f "$installPrefixThird/share/creatools/creatools_third_party_library_config.sh" ] && source $installPrefixThird/share/creatools/creatools_third_party_library_config.sh $installPrefixThird' >> $ETC_BASHRC + diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh index e5c752e..b533727 100644 --- a/Linux/scripts/ThirdParty-install-Finalize.sh +++ b/Linux/scripts/ThirdParty-install-Finalize.sh @@ -47,49 +47,46 @@ export GDCM_DIR=$installPrefixThird/lib/gdcm/ 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 -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 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 - -# - 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 +cd $PWD/scripts +cp ThirdParty-bashrc.sh $baseLibraryThirdPartyDir/. -source ~/.bashrc