Allow user to choose ITK3 / ITK4

[creaToolsTools.git] / Linux / scripts / CreaTools-install.sh

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index 06e59d130b913cb90ebbb97f2ccbded07f324e74..5d12ba5df8fcc4e00956088aa7920368c3a784b6 100644 (file)
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -29,7 +29,7 @@
   
   cd $scriptDir
 
-#create creatools_base_library_config.sh  at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
+  #create creatools_base_library_config.sh  at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
 
   if [ -f $installPrefix/share/creatools_base_library_config.sh ]
   then
@@ -39,20 +39,16 @@
   chmod 755 $installPrefix/share/creatools_base_library_config.sh
   
   echo export PATH='$'PATH:$installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
-  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
-  
-# Install creatools as user (no longer as root) // JPR 2/5/2011 
- 
-#            if [ ! -f /etc/bashrc ]
-#            then
-#               export ETC_BASHRC="/etc/bash.bashrc"
-#              else
-#                 export ETC_BASHRC="/etc/bashrc"
-#             fi
+  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
 
-export ETC_BASHRC=$HOME/.bashrc
-             
   # - 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
@@ -72,11 +68,34 @@ export ETC_BASHRC=$HOME/.bashrc
   bash installmod.sh $buildType $bbtkgeditorsource            $generationdir  $installPrefix
   bash installmod.sh $buildType $creatoolssource              $generationdir  $installPrefix
   bash installmod.sh $buildType $creaminitoolssource          $generationdir  $installPrefix
-   
-  #should be nice to add bbwx, too. (?) // JPR
-  #bash installmod.sh $buildType bbwx              $generationdir  $installPrefix
-  
-    
+  # bash installmod.sh $buildType $libidosource                 $generationdir  $installPrefix 
+
+  #export as well bbPackages_DIR // JPR 25 Mai 2011
+
+  bash installmodNomake.sh $buildType appli              $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType creaMiniToolsBase  $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType demo               $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType gdcmvtk            $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType itk                $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType itkvtk             $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType qt                 $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType std                $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType toolsbbtk          $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType vtk                $generationdir  $installPrefix
+  bash installmodNomake.sh $buildType wx                 $generationdir  $installPrefix
+  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
+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
+
+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