From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Fri, 17 Jun 2011 10:00:36 +0000 (+0000)
Subject: Forcing the compiler must be done *before* any else
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c06edf8f066f0491a9c5f63b8240a2f84d22e10e;p=creaToolsTools.git

Forcing the compiler must be done *before* any else
---

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 1d05c04..17af671 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+ echo  "in ThirdParty-install-ITK.sh, source " $PWD/scripts/CreaTools-configure.sh
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
  then 
    echo
@@ -16,6 +17,29 @@ fi
 
 source $PWD/scripts/CreaTools-configure.sh
 
+   echo "------"
+   echo $PWD/scripts/CreaTools-configure.sh
+   echo --generationdir--
+   echo $generationdir
+   echo --docgeneration--
+   echo $docgeneration
+   echo --installPrefix--
+   echo $installPrefix
+   echo --installPrefixThird--
+   echo $installPrefixThird
+   echo --buildType--
+   echo $buildType
+   echo --gdcmVersion--
+   echo $gdcmVersion
+#   echo --sourcesFrom--
+#   echo $sourcesFrom
+#   echo --scriptDir--
+#   echo $scriptDir
+#   echo --start_point--
+#   echo $start_point
+   echo "------"
+
+
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
@@ -45,16 +69,19 @@ fi
 
   echo "we remove old stuff"
   rm -rf $sourcesDir/InsightToolkit*
+  rm -rf $binDir/InsightToolkit*
 
- cd $sourcesDir
+  cd $sourcesDir
 
+ echo "we download new stuff"
  if [ $OperatingSystem = "MacOS" ]
-   then
-    curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz    # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
-    tar -xvf InsightToolkit-3.20.0.tar.gz
-   else
-    wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
-    tar -xzvf InsightToolkit-3.20.0.tar.gz    
+ then
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
+  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+  tar -xvf InsightToolkit-3.20.0.tar.gz
+ else
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
+  tar -xzvf InsightToolkit-3.20.0.tar.gz
  fi
 
 if [ $buildType = "Debug" ]
@@ -73,6 +100,7 @@ then
   export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
   mkdir $dirInstall
   cd $dirInstall
+
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
@@ -84,4 +112,3 @@ then
   make install
   cd ..
 fi
-    
diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index f2a0b21..36ac030 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo  "in ThirdParty-onstall-VTK.sh, source " $PWD/scripts/CreaTools-configure.sh
+ echo  "in ThirdParty-install-VTK.sh, source " $PWD/scripts/CreaTools-configure.sh
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
  then 
    echo
@@ -17,6 +17,29 @@ fi
 
 source $PWD/scripts/CreaTools-configure.sh
 
+   echo "------"
+   echo $PWD/scripts/CreaTools-configure.sh
+   echo --generationdir--
+   echo $generationdir
+   echo --docgeneration--
+   echo $docgeneration
+   echo --installPrefix--
+   echo $installPrefix
+   echo --installPrefixThird--
+   echo $installPrefixThird
+   echo --buildType--
+   echo $buildType
+   echo --gdcmVersion--
+   echo $gdcmVersion
+#   echo --sourcesFrom--
+#   echo $sourcesFrom
+#   echo --scriptDir--
+#   echo $scriptDir
+#   echo --start_point--
+#   echo $start_point
+   echo "------"
+
+
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
@@ -47,21 +70,21 @@ fi
   echo "we remove old stuff"
   rm -rf $sourcesDir/VTK*
   rm -rf $sourcesDir/vtk*
-  rm -rf $binDir/VTK*  
-  
- cd $sourcesDir
+  rm -rf $binDir/VTK*
+
+  cd $sourcesDir
 
-  echo "we download new stuff" 
+ echo "we download new stuff"
  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
-    # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
-    tar -xvf VTK-5.6.1.patchCreatis.tar.gz
-   else
-    wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
-    tar -xzvf VTK-5.6.1.patchCreatis.tar.gz    
+ then
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+  tar -xvf VTK-5.6.1.patchCreatis.tar.gz
+ else
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+  tar -xzvf VTK-5.6.1.patchCreatis.tar.gz
  fi
- 
+
 if [ $buildType = "Debug" ]
 then
    debug="ON"
@@ -72,29 +95,32 @@ fi
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
-then  
-
+then
   libname=VTK
   dirInstall=$binDir/$libname-Bin
-  dirInstallVTK=$dirInstall
   export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
   mkdir $dirInstall
-  echo "we prepare directories dirInstallVTK " $dirInstallVTK  " VTK_DIR " $installPrefixThird/lib/vtk-5.6/
+  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.6/
   cd $dirInstall
- 
+
+# See EED why we have to do this
+  if [ $OperatingSystem = "MacOS" ]
+  then
+     cmake -D  CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
+  fi
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
-  cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird  CMakeCache.txt
-  
+  cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
+
   if [ $OperatingSystem = "MacOS" ]
   then
-    cmake -D BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=ON -D  VTK_USE_COCOA:BOOL=OFF CMakeCache.txt 
-    cmake -D  VTK_USE_TCL:BOOL=OFF                                                         CMakeCache.txt  
-    cmake -D  CMAKE_CXX_COMPILER:FILE=/usr/bin/g++                                         CMakeCache.txt    
-  fi	  
+    cmake -D BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=ON -D  VTK_USE_COCOA:BOOL=OFF CMakeCache.txt
+    cmake -D  VTK_USE_TCL:BOOL=OFF                                                         CMakeCache.txt
+    CMakeCache.txt
+  fi
+
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
   make -j $corenumber
   make install
   cd ..
 fi
-    
diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index a0d65e4..ed672c3 100644
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -66,28 +66,23 @@ then
    chgrp $loginGroupName $binDir
 fi
 
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-
+  echo "we remove old stuff"
   rm -rf $sourcesDir/gdcm*
-
   rm -rf $binDir/gdcm*
 
   cd $sourcesDir
 
+  echo "we download new stuff"
  if [ $OperatingSystem = "MacOS" ]
  then
-  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
-  tar -xvf gdcm_05_Mai_2011.tar.gz   
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+  tar -xvf gdcm_05_Mai_2011.tar.gz
  else
-  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz 
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
   tar -xvzf gdcm_05_Mai_2011.tar.gz
  fi
 
-fi
-
 if [ $buildType = "Debug" ]
 then
    debug="ON"
@@ -104,12 +99,13 @@ then
   export GDCM_DIR=$installPrefixThird/lib/gdcm/
   mkdir $dirInstall
   cd $dirInstall
+
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
   cmake -D VTK_DIR:PATH=$dirInstallVTK CMakeCache.txt
   cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
-  make -j 2
+  make -j $corenumber
   make install
   cd ..
 fi