From 3b6b1d008f0c615621246f10273025c572424729 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Fri, 22 Jul 2011 12:41:34 +0000 Subject: [PATCH] re - indent --- Linux/scripts/CreaTools-compile.sh | 12 ++++++------ Linux/scripts/CreaTools-install.sh | 17 ++++++++++++----- Linux/scripts/CreaTools-load.sh | 2 +- Linux/scripts/ThirdParty-install-Base-Stuff.sh | 12 ++++++------ Linux/scripts/ThirdParty-install-Finalize.sh | 2 -- Linux/scripts/ThirdParty-install.sh | 3 ++- Linux/scripts/ThirdParty-install_no_compile.sh | 8 -------- 7 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh index aa10f43..9fbe55b 100644 --- a/Linux/scripts/CreaTools-compile.sh +++ b/Linux/scripts/CreaTools-compile.sh @@ -137,12 +137,12 @@ then if [ true = true ] then # BBTK - echo ========================================================= $bbtksource $generationdir $installPrefix $buildType - bash $scriptDir/cmakemod.sh $bbtksource $generationdir $installPrefix $buildType - bash $scriptDir/bbtkVariables.sh $bbtksource $generationdir $docgeneration $gdcmVersion - bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber - bash $scriptDir/ctestmod.sh $bbtksource $generationdir - fi + echo ========================================================= $bbtksource $generationdir $installPrefix $buildType + bash $scriptDir/cmakemod.sh $bbtksource $generationdir $installPrefix $buildType + bash $scriptDir/bbtkVariables.sh $bbtksource $generationdir $docgeneration $gdcmVersion + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber + bash $scriptDir/ctestmod.sh $bbtksource $generationdir + fi fi bbtkdll=$generationdir/creatools_bin/bbtkBin diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index 776d170..5d12ba5 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -37,10 +37,18 @@ fi touch $installPrefix/share/creatools_base_library_config.sh chmod 755 $installPrefix/share/creatools_base_library_config.sh - - # Install creatools as user (no longer as root) // JPR 2/5/2011 - + echo export PATH='$'PATH:$installPrefix/bin >> $installPrefix/share/creatools_base_library_config.sh + if [ $OperatingSystem = "MacOS" ] + then + echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh + else + echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh + echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh + fi + + # Install creatools as user (no longer as root) // JPR 2/5/2011 + # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh' if any sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC sed -i -e '/installPrefixtmp*/ d' $ETC_BASHRC @@ -78,7 +86,7 @@ bash installmodNomake.sh $buildType wxvtk $generationdir $installPrefix #EED I don't know why this works here and not after the chmod 755 - echo export PATH='$'PATH:$installPrefix/bin >> $installPrefix/share/creatools_base_library_config.sh +echo export PATH='$'PATH:$installPrefix/bin >> $installPrefix/share/creatools_base_library_config.sh if [ $OperatingSystem = "MacOS" ] then echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh @@ -88,7 +96,6 @@ else fi echo "===================================================in CreaTools-install.sh ETC_BASHRC : " $ETC_BASHRC - echo installPrefixtmp=$installPrefix >> $ETC_BASHRC echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] && source $installPrefixtmp/share/creatools_base_library_config.sh' >> $ETC_BASHRC diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh index 1d9ac3b..cc5bac0 100644 --- a/Linux/scripts/CreaTools-load.sh +++ b/Linux/scripts/CreaTools-load.sh @@ -20,7 +20,7 @@ echo --gdcmVersion-- echo $gdcmVersion echo "--ETC_BASHRC--" - echo $ETC_BASHRC + echo $ETC_BASHRC echo --sourcesFrom-- echo $sourcesFrom echo --scriptDir-- diff --git a/Linux/scripts/ThirdParty-install-Base-Stuff.sh b/Linux/scripts/ThirdParty-install-Base-Stuff.sh index cdc23c9..dbbe81c 100644 --- a/Linux/scripts/ThirdParty-install-Base-Stuff.sh +++ b/Linux/scripts/ThirdParty-install-Base-Stuff.sh @@ -25,8 +25,8 @@ then mkdir $generationdir chown $loginUserName $generationdir chgrp $loginGroupName $generationdir - fi + if [ ! -e $sourcesDir ] then mkdir $sourcesDir @@ -93,13 +93,13 @@ then port install latex2html -y port install wxGTK -y port install boost -y - ln -s libboost_signals-xgcc40-mt-1_38.dylib libboost_signals.dylib /opt/local/lib # cf EED : http://www.creatis.insa-lyon.fr/site - ln -s libboost_signals-xgcc40-mt-1_38.dylib libboost_signals.dylib /opt/local/lib # cf EED - ln -s libboost_filesystem-xgcc40-mt-1_38.dylib libboost_filesystem.dylib /opt/local/lib # cf EE - ln -s libboost_system-xgcc40-mt-1_38.dylib libboost_system.dylib /opt/local/lib # cf EE + ln -s libboost_signals-xgcc40-mt-1_38.dylib libboost_signals.dylib /opt/local/lib # cf EED : http://www.creatis.insa-lyon.fr/site + ln -s libboost_signals-xgcc40-mt-1_38.dylib libboost_signals.dylib /opt/local/lib # cf EED + ln -s libboost_filesystem-xgcc40-mt-1_38.dylib libboost_filesystem.dylib /opt/local/lib # cf EE + ln -s libboost_system-xgcc40-mt-1_38.dylib libboost_system.dylib /opt/local/lib # cf EE port install sqlite3 -y port install qt4-mac -y - ln -s qmake-mac qmake /opt/local/bin # cf EED + ln -s qmake-mac qmake /opt/local/bin # cf EED port install mesa -y ;; *) diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh index 04de94d..537795e 100644 --- a/Linux/scripts/ThirdParty-install-Finalize.sh +++ b/Linux/scripts/ThirdParty-install-Finalize.sh @@ -58,13 +58,11 @@ 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' >> $ETC_BASHRC - chown -R $loginUserName $generationdir chgrp -R $loginGroupName $generationdir diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh index b9b32e1..c06dd1e 100644 --- a/Linux/scripts/ThirdParty-install.sh +++ b/Linux/scripts/ThirdParty-install.sh @@ -53,6 +53,7 @@ then chown $loginUserName $generationdir chgrp $loginGroupName $generationdir fi + if [ ! -e $sourcesDir ] then mkdir $sourcesDir @@ -82,7 +83,7 @@ then cd $sourcesDir if [ $OperatingSystem = "MacOS" ] - then + then # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz diff --git a/Linux/scripts/ThirdParty-install_no_compile.sh b/Linux/scripts/ThirdParty-install_no_compile.sh index 16f6e5e..d0e2d8d 100644 --- a/Linux/scripts/ThirdParty-install_no_compile.sh +++ b/Linux/scripts/ThirdParty-install_no_compile.sh @@ -74,14 +74,6 @@ else echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh fi -# done in CreaTools-configure.sh JPR -#if [ $OperatingSystem = "MacOS" ] -#then -# export ETC_BASHRC=$HOME/.profile -#else -# export ETC_BASHRC=$HOME/.bashrc -#fi - sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC -- 2.45.1