2411 creaToolsTools Feature New Normal Add creaVtk Library in Linux version

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 57c9cc4802de0d7bd8284784d3c1cf9d87272f8e..72b7311b4835b89832ef97c02e12869ba877ad84 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -416,5 +416,36 @@ then
 fi
 
 
+# -------------------------
+#        start_point =  14 : creaVtk
+#-------------------------
+if [ $start_point -le 14 ]
+then
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+      # creaVtk
+      bash $scriptDir/cmakemod.sh              $creavtksource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaVtkVariables.sh  $creavtksource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh $buildType $creavtksource $generationdir $corenumber
+      bash $scriptDir/ctestmod.sh              $creavtksource $generationdir
+   fi
+fi
+ creavtkdll=$generationdir/creatools_bin/creaVtkBin
+
+if [ $OperatingSystem = "MacOS" ]
+then
+    #duplicate form creaTools_name.sh?? //FCY
+    DYLD_LIBRARY_PATH=$creavtkdll:$DYLD_LIBRARY_$PATH
+else
+    LD_LIBRARY_PATH=$creavtkdll:$LD_LIBRARY_$PATH
+fi 
+ 
+ export creaVtk_DIR=$generationdir/creatools_bin/creaVtkBin
+
+
+
+
 # shutdown /s
 # exit /b

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index 29b639dc838bb24ff5a4163e64c18b5264593581..4a37bb3f4f2709c94c6577cb09ce465a6422aafd 100644 (file)
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -83,6 +83,7 @@
 
   bash installmod.sh $buildType $creasource                   $generationdir  $installPrefix
   bash installmod.sh $buildType $bbtksource                   $generationdir  $installPrefix
+  bash installmod.sh $buildType $creavtksource                $generationdir  $installPrefix
   bash installmod.sh $buildType $creamaracassource            $generationdir  $installPrefix
   bash installmod.sh $buildType $creaenvironmentsource        $generationdir  $installPrefix
   bash installmod.sh $buildType $creabrukersource             $generationdir  $installPrefix

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 2a5283389b61ac913b15a1fdf26aa5d7cf3704d7..3fd2e768460da8f01c98dcdab15dec2d4977f44e 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -108,6 +108,7 @@ then
       then
          bash $scriptDir/gitclone.sh $creasource                   $generationdir      $sourcesFrom
          bash $scriptDir/gitclone.sh $bbtksource                   $generationdir      $sourcesFrom
+         bash $scriptDir/gitclone.sh $creavtksource               $generationdir       $sourcesFrom 
          bash $scriptDir/gitclone.sh $creamaracassource            $generationdir      $sourcesFrom 
          bash $scriptDir/gitclone.sh $creaenvironmentsource        $generationdir      $sourcesFrom 
          bash $scriptDir/gitclone.sh $creabrukersource             $generationdir      $sourcesFrom 
@@ -130,6 +131,7 @@ then
 
          wget $wwwtargz/crea.tgz
          wget $wwwtargz/bbtk.tgz
+         wget $wwwtargz/creaVtk.tgz
          wget $wwwtargz/creaMaracasVisu.tgz
          wget $wwwtargz/creaEnvironment.tgz
          wget $wwwtargz/creaBruker.tgz
@@ -144,6 +146,7 @@ then
  then                           
          curl $wwwtargz/crea.tgz
          curl $wwwtargz/bbtk.tgz
+         curl $wwwtargz/creaVtk.tgz
          curl $wwwtargz/creaMaracasVisu.tgz
          curl $wwwtargz/creaEnvironment.tgz
          curl $wwwtargz/creaBruker.tgz
@@ -156,6 +159,7 @@ then
  else   
          tar xvzf crea.tgz
          tar xvzf bbtk.tgz
+         tar xvzf creaVtk.tgz
          tar xvzf creaMaracasVisu.tgz
          tar xvzf creaEnvironment.tgz           
          tar xvzf creaBruker.tgz

diff --git a/Linux/scripts/CreaTools-names.sh b/Linux/scripts/CreaTools-names.sh
index 83b50cb15eb4c316ac32fe314c085b8257ecfa7d..83abca6c61839c89c3e7c82121dc0c937c6dba51 100644 (file)
--- a/Linux/scripts/CreaTools-names.sh
+++ b/Linux/scripts/CreaTools-names.sh
@@ -41,6 +41,7 @@ scriptDir=$PWD/scripts
 
  creasource=crea
  bbtksource=bbtk
+ creavtksource=creaVtk
  creamaracassource=creaMaracasVisu
  creaenvironmentsource=creaEnvironment
  creabrukersource=creaBruker
@@ -53,8 +54,9 @@ scriptDir=$PWD/scripts
  creatoolstoolssource=creaToolsTools
 # libidosource=libidoNewProj 
   
- creaversion=v0_3_3
+ creaversion=v0_4_3
  bbtkversion=v0_9_5
+ creavtkversion=v1_0_0
  creamaracasversion=v1_0_3
  creaenvironmentversion=v1_0_1
  creabrukerversion=v1_0_1
@@ -76,6 +78,8 @@ then
 DYLD_LIBRARY_PATH=$creadll:$DYLD_LIBRARY_PATH
   bbtkdll=$generationdir/creatools_bin/bbtkBin
 DYLD_LIBRARY_PATH=$bbtkdll:$DYLD_LIBRARY_PATH
+  creavtkdll=$generationdir/creatools_bin/creavtkBin
+DYLD_LIBRARY_PATH=$creavtkdll:$DYLD_LIBRARY_PATH
   creamaracasdll=$generationdir/creatools_bin/creamaracasBin
 DYLD_LIBRARY_PATH=$creamaracasdll:$DYLD_LIBRARY_PATH
   creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin
@@ -101,6 +105,8 @@ else
 LD_LIBRARY_PATH=$creadll:$LD_LIBRARY_PATH
   bbtkdll=$generationdir/creatools_bin/bbtkBin
 LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
+  creavtkdll=$generationdir/creatools_bin/creavtkBin
+LD_LIBRARY_PATH=$creavtkdll:$LD_LIBRARY_PATH
   creamaracasdll=$generationdir/creatools_bin/creamaracasBin
 LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_PATH
   creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin

diff --git a/Linux/scripts/creaVtkVariables.sh b/Linux/scripts/creaVtkVariables.sh
new file mode 100644 (file)
index 0000000..c7e7053
--- /dev/null
+++ b/Linux/scripts/creaVtkVariables.sh
@@ -0,0 +1,44 @@
+# ---------------------------------------------------------------------
+#
+# 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
+
+# $1 : bbtk
+# $2 : generationdir
+# $3 : ON/OFF (generate doc)
+
+currentdir=$2
+binfolder=$2/creatools_bin/$1Bin
+cd $binfolder
+
+cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin        CMakeCache.txt
+cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin        CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON                    CMakeCache.txt
+cmake -D creaVtk_DOC:BOOL=$3                                   CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=$3        CMakeCache.txt
+
+cmake CMakeCache.txt
+cmake CMakeCache.txt
+
+cd ..

diff --git a/Linux/scripts/creaVtkVariables.sh~ b/Linux/scripts/creaVtkVariables.sh~
new file mode 100644 (file)
index 0000000..c7e7053
--- /dev/null
+++ b/Linux/scripts/creaVtkVariables.sh~
@@ -0,0 +1,44 @@
+# ---------------------------------------------------------------------
+#
+# 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
+
+# $1 : bbtk
+# $2 : generationdir
+# $3 : ON/OFF (generate doc)
+
+currentdir=$2
+binfolder=$2/creatools_bin/$1Bin
+cd $binfolder
+
+cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin        CMakeCache.txt
+cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin        CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON                    CMakeCache.txt
+cmake -D creaVtk_DOC:BOOL=$3                                   CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=$3        CMakeCache.txt
+
+cmake CMakeCache.txt
+cmake CMakeCache.txt
+
+cd ..