X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-compile.sh;h=6df11a8d098f1faf6c3a5d1b185fab82eec6c097;hb=d9bbd856b648fb29ffefed7ac0d971aedbfa6a91;hp=e53bc0711f67148b8caaac7703e6f7a826557da0;hpb=a0b3560b65656c6c2601dced3aeddebd66c0ea6d;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index e53bc07..6df11a8 100644
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -27,7 +27,9 @@ fi
    echo $docgeneration
    echo --installPrefix--
    echo $installPrefix
-   echo --buildType--
+   echo --installPrefixThird--
+   echo $installPrefixThird   
+   echo --buildType-- 
    echo $buildType
    echo --gdcmVersion--
    echo $gdcmVersion
@@ -39,6 +41,22 @@ fi
    echo $start_point
    echo "------"
 
+if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
+then
+ echo missing  $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo
+   echo "..ERROR.."
+   echo "==================================================="
+   echo "REMEMBER !"
+   echo ""
+   echo "YOU NEED TO RUN 'Install Third Party Libraries' (1) FIRST !"
+   echo "==================================================="
+   echo
+   echo "Hit any key to continue"
+   read a
+   exit 0
+fi
+
  if [ ! -e $generationdir/creatools_source ]
  then 
  echo missing  $generationdir/creatools_source
@@ -54,6 +72,22 @@ fi
    exit 0
 fi
 
+
+if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
+then
+ echo missing  $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo
+   echo "..ERROR.."
+   echo "==================================================="
+   echo "REMEMBER !"
+   echo ""
+   echo "YOU NEED TO RUN 'Load' (2) FIRST !"
+   echo "==================================================="
+   echo
+   echo
+   exit 0
+fi
+
  cd $generationdir
  if [ -e creatools_bin ]
  then
@@ -81,7 +115,7 @@ fi
 fi
  creadll=$generationdir/creatools_bin/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
-
+ export crea_DIR=$generationdir/creatools_bin/creaBin
 
 # -------------------------
 #        start_point =  3 : BBTK
@@ -102,7 +136,7 @@ fi
 fi
  bbtkdll=$generationdir/creatools_bin/bbtkBin
  LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
-
+ export BBTK_DIR=$generationdir/creatools_bin/bbtkBin
 
 # -------------------------
 #        start_point =  4 : creaMaracasVisu
@@ -120,9 +154,9 @@ then
  bash $scriptDir/ctestmod.sh              $creamaracassource $generationdir
 fi
 fi
- creamaracasdll=$generationdir/creatools_bin/creamaracasBin
+ creamaracasdll=$generationdir/creatools_bin/creaMaracasVisuBin
  LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_PATH
-
+ export creaMaracasVisu_DIR=$generationdir/creatools_bin/creaMaracasVisuBin
 
 # -------------------------
 #        start_point =  5 : creaEnvironment
@@ -142,7 +176,7 @@ fi
 fi
  creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin
  LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_PATH
-
+ export creaEnvironment_DIR=$generationdir/creatools_bin/creaEnvironmentBin
 
 # -------------------------
 #        start_point =  6 : creaBruker
@@ -162,7 +196,7 @@ fi
 fi
  creabrukerdll=$generationdir/creatools_bin/creabrukerBin
  LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH
-
+ export creaBruker_DIR=$generationdir/creatools_bin/creaBrukerBin
 
 # -------------------------
 #        start_point =  7 : creaImageIO
@@ -182,7 +216,7 @@ fi
 fi
  creaimagedll=$generationdir/creatools_bin/creaimageBin
  LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH
-
+export creaImageIO_DIR=$generationdir/creatools_bin/creaImageIOBin
 
 # -------------------------
 #        start_point =  8 : creaContour
@@ -200,9 +234,9 @@ then
  bash $scriptDir/ctestmod.sh              $creacontourssource $generationdir
 fi
 fi
-# creacontourdll=$generationdir/creatools_bin/creacontoursBin
-# LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH
-
+ creacontourdll=$generationdir/creatools_bin/creacontoursBin
+ LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH
+ export creaContours_DIR=$generationdir/creatools_bin/creaContoursBin
 
 # -------------------------
 #        start_point =  9 : creaRigidRegistration
@@ -264,5 +298,23 @@ fi
 #  creatoolsdll=$generationdir/creatools_bin/creatoolsBin
 #  LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH
 
+
+# -------------------------
+#        start_point =  12 : creaMiniTools
+#-------------------------
+if [ $start_point -le 12 ]
+then
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
+if [ true = true ]
+then
+# creaMiniTools
+ bash $scriptDir/cmakemod.sh                	$creaminitoolssource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaMiniToolsVariables.sh     $creaminitoolssource $generationdir $docgeneration
+ bash $scriptDir/compilemod.sh   		$buildType $creaminitoolssource $generationdir
+fi
+fi
+
+
 # shutdown /s
 # exit /b