]> Creatis software - creaToolsTools.git/commitdiff
git://git.creatis.insa-lyon.fr / creaToolsTools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: fc0a494)
#3133 creaToolsTools Feature New Normal - branch vtk7itk4wx3
authorEduardo DAVILA <davila@localhost.localdomain>
Tue, 3 Oct 2017 10:18:57 +0000 (12:18 +0200)
committerEduardo DAVILA <davila@localhost.localdomain>
Tue, 3 Oct 2017 10:18:57 +0000 (12:18 +0200)
Linux/scripts/CreaTools-load.sh patch | blob | history
Linux/scripts/ThirdParty-install-Finalize.sh patch | blob | history
Linux/scripts/ThirdParty-install-VTK.sh patch | blob | history
Linux/scripts/ThirdParty-install-gdcm.sh patch | blob | history

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index d85a4b4589871f2c61f1c32a61dd7d521842a450..bf64e01171cadafab069f68351d859a470732059 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -106,7 +106,7 @@ then
 #
       if [ $sourcesFrom = GIT ] || [ $sourcesFrom = GIT-READ-ONLY ];
       then
-                       ssh-add
+                ssh-add
          bash $scriptDir/gitclone.sh $creasource                   $generationdir      $sourcesFrom
          bash $scriptDir/gitclone.sh $bbtksource                   $generationdir      $sourcesFrom
          bash $scriptDir/gitclone.sh $creavtksource                   $generationdir   $sourcesFrom 
@@ -121,7 +121,26 @@ then
          bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir      $sourcesFrom
          bash $scriptDir/gitclone.sh $creatoolstoolssource         $generationdir      $sourcesFrom
  #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF         $generationdir   $cvsUserName
- #            mv $libidosource-ESRF $libidosource               
+ #          mv $libidosource-ESRF $libidosource                 
+          
+         cd $generationdir/creatools_source/$creasource
+                git checkout vtk7itk4wx3
+         cd $generationdir/creatools_source/$bbtksource
+                git checkout vtk7itk4wx3
+         cd $generationdir/creatools_source/$creavtksource
+                git checkout vtk7itk4wx3
+         cd $generationdir/creatools_source/$creamaracassource
+                git checkout vtk7itk4wx3
+         cd $generationdir/creatools_source/$creaimagesource
+                git checkout vtk7itk4wx3
+         cd $generationdir/creatools_source/$creacontourssource
+                git checkout vtk7itk4wx3
+         cd $generationdir/creatools_source/$crearigidregistrationssource
+                git checkout vtk7itk4wx3
+         cd $generationdir/creatools_source/$bbtkgeditorsource
+                git checkout vtk7itk4wx3
+         cd $generationdir/creatools_source/$creatoolssource
+                git checkout vtk7itk4wx3
       fi
 
       if [ $sourcesFrom = HTML ]
diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 83e2569951ff26e6deef6fad56ef928399ad051c..35479fcc7b23b613fd39fe48c723636f2d44ba9a 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -44,7 +44,7 @@ echo "=================================== in ThirdParty-install-Finalize.sh ETC_
 # /// \TODO move theese ones upper in the process!  JPR
 
 export GDCM_DIR=$installPrefixThird/lib/gdcm/
-export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
 export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
 export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
 
@@ -65,9 +65,10 @@ fi
 touch     $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 chmod 755 $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 
-echo installPrefixThird='$1'                                                                                           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export PATH='$'PATH:'$'installPrefixThird/bin             >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export VTK_DIR='$'installPrefixThird/lib/vtk-5.10         >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export MESA_GL_VERSION_OVERRIDE=3.2                               >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo installPrefixThird='$1'                                                                           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export PATH='$'PATH:'$'installPrefixThird/bin                     >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export VTK_DIR='$'installPrefixThird/lib                          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export ITK_DIR='$'installPrefixThird/lib/InsightToolkit   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export GDCM_DIR='$'installPrefixThird/lib/gdcm            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export WT_DIR='$'installPrefixThird/lib/wt-3.3.4                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
@@ -78,12 +79,12 @@ then
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR        >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 else
    echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
    echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
    echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 fi
 
 cd $PWD/scripts
diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index c8b269ca1b5d0ecbdbc3801d3b6a059457ecce15..efe7f32e086929b70d1346afe35186002628b3c4 100644 (file)
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -129,20 +129,22 @@ fi
 ## EED 2013-10-29
 ##  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
-  wget http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip
 
-echo unzip vtk-5.10.1.zip
-pwd
-  unzip vtk-5.10.1.zip
-
-  cd VTK5.10.1/Rendering
-##EED19mai2015  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
-  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
-  patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
-
-  cd ../CMake
-  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
-  patch < vtk-5.10.1.vtkCompilerExtras.cmake-PATCH 
+## EED 2016-12-28
+##  wget http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip
+##  echo unzip vtk-5.10.1.zip
+##  pwd
+##  unzip vtk-5.10.1.zip
+##  cd VTK5.10.1/Rendering
+####EED19mai2015  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+##  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+##  patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+##  cd ../CMake
+##  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
+##  patch < vtk-5.10.1.vtkCompilerExtras.cmake-PATCH 
+
+       wget http://www.vtk.org/files/release/7.1/VTK-7.1.0.zip
+       unzip VTK-7.1.0.zip
 
  fi
 
@@ -156,17 +158,56 @@ pwd
 #   debug="OFF"
 #fi
 
+### the following stupid test is used at debug time; Please don't remove!
+###if [ true = false ]
+##if [ true = true ]
+##then
+##  libname=VTK5.10.1
+##  dirInstall=$binDir/$libname-Bin
+####  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+##  export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+##
+##  mkdir -p $dirInstall
+##  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
+##  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 CMAKE_BUILD_TYPE:STRING=$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
+##    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
+##  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+##
+####EED 2016-12-22  make -j $corenumber
+##  make -j $corenumber
+##  make -j $corenumber install
+##  cd ..
+##fi
+
+
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=VTK5.10.1
+  libname=VTK-7.1.0
   dirInstall=$binDir/$libname-Bin
 ##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
-  export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+  export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
 
   mkdir -p $dirInstall
-  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
+  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-7.1/
   cd $dirInstall
 
 # See EED why we have to do this
@@ -174,6 +215,7 @@ then
   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 CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
@@ -185,11 +227,17 @@ then
     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
-  cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
+  cmake -D VTK_Group_Views:BOOL=ON  -D VTK_Group_Qt:BOOL=ON   CMakeCache.txt
+  cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt
 
 ##EED 2016-12-22  make -j $corenumber
   make -j $corenumber
   make -j $corenumber install
   cd ..
+
 fi
+
+
+
+
+
diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index b3aa011fc3f5a6ba3f08fe2226a249d3d5b99791..3563f6fba9bd4c28ea1e2e4e7410559f9e5951fb 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -113,8 +113,14 @@ fi
   tar -xvf gdcm_05_Mai_2011.tar.gz
  else
 ##19mai2015  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/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
-  tar -xvzf gdcm_05_Mai_2011.tar.gz
+
+##VTK-5
+#    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+#      tar -xvzf gdcm_05_Mai_2011.tar.gz
+
+    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_10_Mars_2017-vtk7.tar.gz
+       tar -xvzf gdcm_10_Mars_2017-vtk7.tar.gz
+
  fi
 
 if [ $buildType = "Debug" ]
Basic tools for creaTools installation