From 05de7503f8808d9bf6930c92424db7f55e17e971 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Fri, 10 Jun 2011 18:13:22 +0000 Subject: [PATCH] Try to solve MacOS issues --- Linux/scripts/CreaTools-compile.sh | 64 ++++++++++++++++--- Linux/scripts/CreaTools-install.sh | 5 ++ Linux/scripts/CreaTools-names.sh | 34 +++++++++- Linux/scripts/ThirdParty-install-gdcm.sh | 8 +++ Linux/scripts/ThirdParty-install.sh | 20 +++++- .../scripts/ThirdParty-install_no_compile.sh | 13 ++++ 6 files changed, 132 insertions(+), 12 deletions(-) diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh index 6edb1a6..af8d8b4 100644 --- a/Linux/scripts/CreaTools-compile.sh +++ b/Linux/scripts/CreaTools-compile.sh @@ -116,7 +116,12 @@ then fi fi creadll=$generationdir/creatools_bin/creaBin - LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH + if [ $OperatingSystem = "MacOS" ] + then + DYLD_LIBRARY_PATH=$creadll:DYLD_LIBRARY_$PATH + else + LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH + fi export crea_DIR=$generationdir/creatools_bin/creaBin # ------------------------- @@ -136,9 +141,15 @@ echo ========================================================= $bbtksource $gene bash $scriptDir/ctestmod.sh $bbtksource $generationdir fi fi - bbtkdll=$generationdir/creatools_bin/bbtkBin - LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH - export BBTK_DIR=$generationdir/creatools_bin/bbtkBin + +bbtkdll=$generationdir/creatools_bin/bbtkBin +if [ $OperatingSystem = "MacOS" ] +then + DYLD_LIBRARY_PATH=$bbtkdll:$DYLD_LIBRARY_PATH +else + LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH +fi +export BBTK_DIR=$generationdir/creatools_bin/bbtkBin # ------------------------- # start_point = 4 : creaMaracasVisu @@ -157,7 +168,14 @@ then fi fi creamaracasdll=$generationdir/creatools_bin/creaMaracasVisuBin - LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_PATH + +if [ $OperatingSystem = "MacOS" ] +then + DYLD_LIBRARY_PATH=$creamaracasdll:DYLD_LIBRARY_$PATH +else + LD_LIBRARY_PATH=$creamaracasdll:LD_LIBRARY_$PATH +fi + export creaMaracasVisu_DIR=$generationdir/creatools_bin/creaMaracasVisuBin # ------------------------- @@ -177,7 +195,14 @@ then fi fi creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin - LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_PATH + +if [ $OperatingSystem = "MacOS" ] +then + DYLD_LIBRARY_PATH=$creaenvironmentdll:DYLD_LIBRARY_$PATH +else + LD_LIBRARY_PATH=$creaenvironmentdll:LD_LIBRARY_$PATH +fi + export creaEnvironment_DIR=$generationdir/creatools_bin/creaEnvironmentBin # ------------------------- @@ -197,7 +222,14 @@ then fi fi creabrukerdll=$generationdir/creatools_bin/creabrukerBin - LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH + +if [ $OperatingSystem = "MacOS" ] +then + DYLD_LIBRARY_PATH=$creabrukerdll:DYLD_LIBRARY_$PATH +else + LD_LIBRARY_PATH=$creabrukerdll:LD_LIBRARY_$PATH +fi + export creaBruker_DIR=$generationdir/creatools_bin/creaBrukerBin # ------------------------- @@ -217,7 +249,14 @@ then fi fi creaimagedll=$generationdir/creatools_bin/creaimageBin - LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH + +if [ $OperatingSystem = "MacOS" ] +then + DYLD_LIBRARY_PATH=$creaimagedll:DYLD_LIBRARY_$PATH +else + LD_LIBRARY_PATH=$creaimagedll:LD_LIBRARY_$PATH +fi + export creaImageIO_DIR=$generationdir/creatools_bin/creaImageIOBin # ------------------------- @@ -237,7 +276,14 @@ then fi fi creacontourdll=$generationdir/creatools_bin/creacontoursBin - LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH + +if [ $OperatingSystem = "MacOS" ] +then + DYLD_LIBRARY_PATH=$creacontoursdll:DYLD_LIBRARY_$PATH +else + LD_LIBRARY_PATH=$creacontoursdll:LD_LIBRARY_$PATH +fi + export creaContours_DIR=$generationdir/creatools_bin/creaContoursBin # ------------------------- diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index f908a2a..7f6f4a8 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -39,8 +39,13 @@ chmod 755 $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 +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 diff --git a/Linux/scripts/CreaTools-names.sh b/Linux/scripts/CreaTools-names.sh index 9de3ca6..8254db0 100644 --- a/Linux/scripts/CreaTools-names.sh +++ b/Linux/scripts/CreaTools-names.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# This one is here just in order not tp duppliacte the following code +# This one is here just in order not tp dupplicate the following code # #allow debugger to choose the startpoint @@ -29,8 +29,37 @@ scriptDir=$PWD/scripts # libidosource=libidoNewProj +echo "++++++++++++++++++++++++++++++++++++++++++++++++OperatingSystem " $OperatingSystem + +if [ $OperatingSystem = "MacOS" ] +then + creadll=$generationdir/creatools_bin/creaBin +DYLD_LIBRARY_PATH=$creadll:DYLD_LIBRARY_PATH + bbtkdll=$generationdir/creatools_bin/bbtkBin +DYLD_LIBRARY_PATH=$bbtkdll:$DYLD_LIBRARY_PATH + creamaracasdll=$generationdir/creatools_bin/creamaracasBin +DYLD_LIBRARY_PATH=$creamaracasdll:$DYLD_LIBRARY_PATH + creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin +DYLD_LIBRARY_PATH=$creaenvironmentdll:$DYLD_LIBRARY_PATH + creabrukerdll=$generationdir/creatools_bin/creabrukerBin +DYLD_LIBRARY_PATH=$creabrukerdll:$DYLD_LIBRARY_PATH + creaimagedll=$generationdir/creatools_bin/creaimageBin +DYLD_LIBRARY_PATH=$creaimagedll:$DYLD_LIBRARY_PATH + creacontourdll=$generationdir/creatools_bin/creacontoursBin +DYLD_LIBRARY_PATH=$creacontoursdll:$DYLD_LIBRARY_PATH + crearigidregistrationdll=$generationdir/creatools_bin/crearigidregistrationBin +DYLD_LIBRARY_PATH=$crearigidregistrationdll:$DYLD_LIBRARY_PATH + bbtkgeditordll=$generationdir/creatools_bin/bbtkgeditorBin +DYLD_LIBRARY_PATH=$bbtkgeditordll:$DYLD_LIBRARY_PATH + creatoolsdll=$generationdir/creatools_bin/creatoolsBin +DYLD_LIBRARY_PATH=$creatoolssdll:$DYLD_LIBRARY_PATH + creaminitoolsdll=$generationdir/creatools_bin/creaMiniToolsBin +DYLD_LIBRARY_PATH=$creaminitoolssdll:$DYLD_LIBRARY_PATH +# crealibidodll=$generationdir/creatools_bin/libidoBin +#DYLD_LIBRARY_PATH=$libidodll:$DYLD_LIBRARY_PATH +else creadll=$generationdir/creatools_bin/creaBin -LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH +LD_LIBRARY_PATH=$creadll:LD_LIBRARY_PATH bbtkdll=$generationdir/creatools_bin/bbtkBin LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH creamaracasdll=$generationdir/creatools_bin/creamaracasBin @@ -53,3 +82,4 @@ LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH LD_LIBRARY_PATH=$creaminitoolssdll:$LD_LIBRARY_PATH # crealibidodll=$generationdir/creatools_bin/libidoBin #LD_LIBRARY_PATH=$libidodll:$LD_LIBRARY_PATH +fi diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh index 25feeaf..1ecbbdc 100644 --- a/Linux/scripts/ThirdParty-install-gdcm.sh +++ b/Linux/scripts/ThirdParty-install-gdcm.sh @@ -129,9 +129,17 @@ echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6 >> $installPrefixThir 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 +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 +fi export ETC_BASHRC=$HOME/.bashrc diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh index e2df511..8a5fa1c 100644 --- a/Linux/scripts/ThirdParty-install.sh +++ b/Linux/scripts/ThirdParty-install.sh @@ -248,9 +248,16 @@ echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6 >> $installPrefixThir 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 +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 +fi # modify .bashrc # - remove line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' if any (with accurate value for ???) @@ -263,7 +270,18 @@ echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR >> $installPrefixThir # export ETC_BASHRC="/etc/bashrc" #fi -export ETC_BASHRC=$HOME/.bashrc + 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 diff --git a/Linux/scripts/ThirdParty-install_no_compile.sh b/Linux/scripts/ThirdParty-install_no_compile.sh index f6400f1..cad923a 100644 --- a/Linux/scripts/ThirdParty-install_no_compile.sh +++ b/Linux/scripts/ThirdParty-install_no_compile.sh @@ -45,11 +45,24 @@ echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6 >> $installPrefixThir 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 +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 +fi +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