Merge with Fred's modif

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index cd2705255d9c598dab349ca28104ff12c39c1993..c662efaae74d75a93ccd49d7ec9ec812ce8fac7e 100644 (file)
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -48,16 +48,24 @@ binDir=$generationdir/thirdparty_bin
 if [ ! -e $generationdir ]
 then
    mkdir $generationdir
-   chown $loginUserName:$loginGroupName $generationdir
+   chown $loginUserName  $generationdir
+   chgrp $loginGroupName $generationdir
+
 fi
 if [ ! -e $sourcesDir ]
 then
    mkdir $sourcesDir
+   #was : (pb on MacOS?)
+   #chown $loginUserName:$loginGroupName $sourcesDir
+   chown $loginUserName  $sourcesDir
+   chgrp $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
    mkdir $binDir
+   chown $loginUserName  $binDir
+   chgrp $loginGroupName $binDir
 fi
 
 
@@ -65,7 +73,7 @@ fi
 if [ true = true ]
 #if [ true = false ]
 then
-
+  # ///\TODO what about SuSE? Debian? Mandriva? Gentoo?
   case "$OperatingSystem" in
   Fedora)
      yum install cmake -y 
@@ -102,22 +110,23 @@ then
      apt-get --yes install libxaw7-dev # X11
      ;;
   MacOS)
-# QUESTION : is -y  mandatory?
+
      port selfupdate
-     port install cmake -y 
-     port install doxygen -y
-     port install graphviz -y
-     port install texlive -y
-     port install latex2html -y
-     port install wxGTK -y
-     port install boost -y
-     port install sqlite3 -y
-     port install qt4-mac -y
-     port install mesa -y
+     port install cmake                -y
+     port install cmake-gui            -y
+     port install doxygen              -y
+     port install graphviz             -y
+     port install texlive              -y
+     port install latex2html           -y
+     port install wxGTK-devel wxBase   -y
+     port install boost-devel          -y
+     port install sqlite-devel         -y
+     port install qt-devel             -y
+     port install mesa-libOSMesa-devel -y
      ;;
   *)
      #echo " '$OperatingSystem' : Unknown (for us...) Operating Sytem "
-    echo " Allowed values are (right now) Fedora, Ubuntu, MacOS "
+     echo " Allowed values are (right now) Fedora, Ubuntu, MacOS "
      exit 0
      ;;
   esac             
@@ -139,17 +148,13 @@ then
   rm -rf $binDir/InsightToolkit*
   rm -rf $binDir/VTK*
   cd $sourcesDir
+
  if [ $OperatingSystem = "MacOS" ]
  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
-  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
-
-  tar -xvf VTK-5.6.1.patchCreatis.tar.gz
-  tar -xvf gdcm_05_Mai_2011.tar.gz
-  tar -xvf InsightToolkit-3.20.0.tar.gz
-
+  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
+  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
 else
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
@@ -237,6 +242,7 @@ fi
 if [ true = true ]
 then
   cd $sourcesDir
+ # pourquoi ne copie-t-on plus? JPR
  # cp tth $installPrefixThird/bin
 fi
 
@@ -302,3 +308,6 @@ fi
 # - add line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
 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