X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-compile.sh;h=7797dce4d2902446c791d4942b42df4c5d028352;hb=24003d856ffe0f7d73c987db33e5ca7d26697fd4;hp=52613a67d1074905d08e87cd9faa68227491c09d;hpb=2778417a909f19f22a8ba4d6d8bdc1fa3982b926;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 52613a6..7797dce 100644
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -1,3 +1,27 @@
+# ---------------------------------------------------------------------
+#
+# 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
 
 if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
@@ -45,9 +69,9 @@ fi
    echo $start_point
    echo "------"
 
-if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
+if [ ! -f $installPrefixThird/share/creatools/creatools_third_party_library_config.sh ]
 then
- echo missing  $installPrefixThird/share/creatools_third_party_library_config.sh
+ echo missing  $installPrefixThird/share/creatools/creatools_third_party_library_config.sh
    echo
    echo "..ERROR.."
    echo "==================================================="
@@ -77,9 +101,9 @@ fi
 fi
 
 
-if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
+if [ ! -f $installPrefixThird/share/creatools/creatools_third_party_library_config.sh ]
 then
- echo missing  $installPrefixThird/share/creatools_third_party_library_config.sh
+ echo missing  $installPrefixThird/share/creatools/creatools_third_party_library_config.sh
    echo
    echo "..ERROR.."
    echo "==================================================="
@@ -97,7 +121,7 @@ fi
  then
     rm -rf creatools_bin
  fi
- mkdir creatools_bin
+ mkdir -p creatools_bin
 
 cd $scriptDir
 
@@ -141,6 +165,7 @@ then
      bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
      bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
      bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
      bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
    fi
 fi
@@ -391,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