BUG instalation first time ..creatools_install with PATH and LD_LIBRARRIES_PATH

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

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index 6ea2d1bb1a31179ec0abe360a7da7d3bf80d8195..430b0b6a2809cd581b0304b898b2284358f28810 100644 (file)
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -37,21 +37,18 @@
   fi
   touch     $installPrefix/share/creatools_base_library_config.sh
   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
+#             else
 #                 export ETC_BASHRC="/etc/bashrc"
 #             fi
 
-export ETC_BASHRC=$HOME/.bashrc
+# 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
@@ -71,7 +68,36 @@ export ETC_BASHRC=$HOME/.bashrc
   bash installmod.sh $buildType $crearigidregistrationssource $generationdir  $installPrefix
   bash installmod.sh $buildType $bbtkgeditorsource            $generationdir  $installPrefix
   bash installmod.sh $buildType $creatoolssource              $generationdir  $installPrefix
-  
+  bash installmod.sh $buildType $creaminitoolssource          $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