Try to solve MacOS issues

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 6edb1a643398670a566bcbd077a68369b93ab972..af8d8b429b8adc900cdf69a2a2971acd918c3e6c 100644 (file)
--- 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 f908a2afb65ed53a63916779263a091f5fdfba85..7f6f4a80940b5117dd11b1f52a9efa60e9b74d58 100644 (file)
--- 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 9de3ca61dca88adc1f71fc416693289f10eadbf9..8254db01cdb59de4c6175579cb3223943baf8ee3 100644 (file)
--- 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 25feeaf75bdfedc19efd0228e0dec468d0ccfdc1..1ecbbdcb69533d402dd8bcbbff88c6c603a88e66 100644 (file)
--- 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 e2df511a37b6c945bcc8be5ccd0ef3260024752a..8a5fa1c4d5855d1606c875866863201645a844a6 100644 (file)
--- 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 f6400f1435ae4ff53824b734ac5ec404bf65120e..cad923aa4cd38fa11f53cbcc73bc6c0cbd251873 100644 (file)
--- 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