]> Creatis software - creaToolsTools.git/commitdiff
#2689 creaToolsTools Feature New Normal - Third party Linux WT configuration
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 5 Aug 2015 14:20:58 +0000 (16:20 +0200)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 5 Aug 2015 14:20:58 +0000 (16:20 +0200)
Linux/installscript
Linux/scripts/ThirdParty-install-Finalize.sh
Linux/scripts/ThirdParty-install-ITK.sh
Linux/scripts/ThirdParty-install-VTK.sh
Linux/scripts/ThirdParty-install-WT.sh [new file with mode: 0644]
Linux/scripts/ThirdParty-install-gdcm.sh

index 3a754ee0cdcd53b07a6f9a92b8d80ee91c23e58d..7bebda06e1c6eaa36a2eaa90733f999695ec3894 100755 (executable)
@@ -72,6 +72,7 @@ function usage {
     echo "         3rd-itk                   : Get, Compile, Install itk"
     echo "         3rd-gdcm                  : Get, Compile, Install gdcm"
     echo "         3rd-wx                    : Get, Compile, Install wx widget (for Mac Users)"
+    echo "         3rd-wt                    : Get, Compile, Install wt"
     echo "   "
     echo "    as a normal user:" 
     echo "         creatools                 : Get Compile and Install the CreaTools"
@@ -138,7 +139,7 @@ if [ $# -le 0 ] ; then usage; fi
 command=$1
 
 # check that command is valid
-if [ `checkVal $command all config 3rd 3rd-base 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx creatools creatools-get creatools-cmp creatools-install creatools-generateBinTGZ uninstall printconfig help env` == "false" ] ; then
+if [ `checkVal $command all config 3rd 3rd-base 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx 3rd-wt creatools creatools-get creatools-cmp creatools-install creatools-generateBinTGZ uninstall printconfig help env` == "false" ] ; then
     echo "Unrecognized command: $command"
     echo ""
     usage
@@ -259,6 +260,13 @@ if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     cd $scriptDirName
 fi
 
+# wt
+if [ `checkVal $command all 3rd 3rd-wt` == true ] ; then
+    bigDisplay "INSTALL WT"
+    source scripts/ThirdParty-install-WT.sh
+    cd $scriptDirName
+fi
+
 # itk
 if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
     bigDisplay "INSTALL $ITKVersion"
@@ -268,7 +276,7 @@ fi
 
 
 # Setup the user .bashrc correctly
-if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
+if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx 3rd-wt ` == true ] ; then
     bigDisplay "FINALIZE 3RD PARTY LIBRARY INSTALLATION"
     bash scripts/ThirdParty-install-Finalize.sh
     if [ `checkVal $command 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
index 15a0aec2fb8853dfb71876a0b518a28a6721f9e1..83e2569951ff26e6deef6fad56ef928399ad051c 100644 (file)
@@ -46,6 +46,7 @@ echo "=================================== in ThirdParty-install-Finalize.sh ETC_
 export GDCM_DIR=$installPrefixThird/lib/gdcm/
 export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
 export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
+export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
 
 baseLibraryThirdPartyDir=$installPrefixThird/share/creatools
 
@@ -69,6 +70,7 @@ echo export PATH='$'PATH:'$'installPrefixThird/bin            >> $baseLibraryThi
 echo export VTK_DIR='$'installPrefixThird/lib/vtk-5.10         >> $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
 echo export TTH='$'installPrefixThird/bin/tth                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 
 if [ $OperatingSystem = "MacOS" ]
@@ -76,10 +78,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
 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
 fi
 
 cd $PWD/scripts
index d289d0eb50248fc557ea593ffeb2699e55ad1895..cdc26815e70054a98555b218f448db7a9b57553b 100644 (file)
@@ -158,7 +158,7 @@ then
 
   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 CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
   if [ $ITKVersion = ITK4 ]
   then
index 528490f98f84225736e48be367fcbc54d643bdd3..a6a63fb489ca1e1a2843cbbc56c8c482040444bb 100644 (file)
@@ -160,7 +160,7 @@ then
   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 CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
 
   if [ $OperatingSystem = "MacOS" ]
   then
diff --git a/Linux/scripts/ThirdParty-install-WT.sh b/Linux/scripts/ThirdParty-install-WT.sh
new file mode 100644 (file)
index 0000000..2c9cf3d
--- /dev/null
@@ -0,0 +1,153 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
+#!/bin/bash
+
+ echo  "in ThirdParty-install-WT.sh, source " $PWD/scripts/CreaTools-configure.sh
+ if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
+ then 
+   echo
+   echo "..ERROR.."
+   echo "==================================================="
+   echo "REMEMBER !"
+   echo ""
+   echo "YOU NEED TO RUN 'Configure' (0) First !"
+   echo "==================================================="
+   echo
+   echo
+   exit 0
+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
+
+if [ ! -e $generationdir ]
+then
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
+
+fi
+if [ ! -e $sourcesDir ]
+then
+   mkdir -p $sourcesDir
+   #was : (pb on MacOS?)
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
+fi
+
+if [ ! -e $binDir ]
+then
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
+fi
+
+  echo "we remove old stuff"
+  rm -rf $sourcesDir/wt*
+  rm -rf $sourcesDir/wt*
+  rm -rf $binDir/wt*
+
+  cd $sourcesDir
+
+ echo "we download new stuff"
+ if [ $OperatingSystem = "MacOS" ]
+ then
+
+  curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
+  tar -xvzf wt-3.3.4.tar.gz
+  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+ else
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
+  echo tar -xvzf wt-3.3.4.tar.gz
+  pwd
+  tar -xvzf wt-3.3.4.tar.gz
+ fi
+
+
+#if [ $buildType = "Debug" ]
+#then
+#   debug="ON"
+#else
+#   debug="OFF"
+#fi
+
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
+if [ true = true ]
+then
+  libname=wt-3.3.4
+  dirInstall=$binDir/$libname-Bin
+##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+  export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+
+  mkdir -p $dirInstall
+  echo "we prepare directories dirInstall " $dirInstall  " WT_DIR " $installPrefixThird/lib/wt-3.3.4/
+  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
+  cmake -D LIB_INSTALL_DIR:PATH=lib/$libname -D ENABLE_EXT:BOOL=true CMakeCache.txt
+#  if [ $OperatingSystem = "MacOS" ]
+#  then
+#     ###
+#  fi
+
+  make -j $corenumber
+  make install
+  cd ..
+fi
index 29319a8d2072b14c1a5d3726dd8bb616da8dc576..b6a3951a9a73b04e74a974015a2752022d7bc3da 100644 (file)
@@ -127,7 +127,7 @@ then
 
   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 CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
   cmake -D VTK_DIR:PATH=$VTK_DIR CMakeCache.txt
   cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
   make -j $corenumber