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

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index aea3c47..e53bc07 100644
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
 then 
@@ -54,6 +54,12 @@ fi
    exit 0
 fi
 
+ cd $generationdir
+ if [ -e creatools_bin ]
+ then
+    rm -rf creatools_bin
+ fi
+ mkdir creatools_bin
 
 cd $scriptDir
 
@@ -67,10 +73,10 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
- sh $scriptDir/cmakemod.sh                  $creasource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaVariables.sh             $creasource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh     $buildType $creasource $generationdir
- sh $scriptDir/ctestmod.sh                  $creasource $generationdir
+ bash $scriptDir/cmakemod.sh                  $creasource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaVariables.sh             $creasource $generationdir $docgeneration
+ bash $scriptDir/compilemod.sh     $buildType $creasource $generationdir
+ bash $scriptDir/ctestmod.sh                  $creasource $generationdir
 fi
 fi
  creadll=$generationdir/creatools_bin/creaBin
@@ -87,10 +93,11 @@ then
 if [ true = true ]
 then
 # BBTK
- sh $scriptDir/cmakemod.sh       $bbtksource $generationdir $installPrefix $buildType
- sh $scriptDir/bbtkVariables.sh  $bbtksource $generationdir $docgeneration $gdcmVersion
- sh $scriptDir/compilemod.sh     $buildType  $bbtksource $generationdir
- sh $scriptDir/ctestmod.sh       $bbtksource $generationdir
+echo ========================================================= $bbtksource $generationdir $installPrefix $buildType
+ bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
+ bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
+ bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir
+ bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
 fi
 fi
  bbtkdll=$generationdir/creatools_bin/bbtkBin
@@ -107,10 +114,10 @@ then
 if [ true = true ]
 then
 # creaMaracasVisu
- sh $scriptDir/cmakemod.sh                $creamaracassource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaMaracasVariables.sh    $creamaracassource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh              $buildType $creamaracassource $generationdir
- sh $scriptDir/ctestmod.sh                $creamaracassource $generationdir
+ bash $scriptDir/cmakemod.sh              $creamaracassource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaMaracasVariables.sh  $creamaracassource $generationdir $docgeneration
+ bash $scriptDir/compilemod.sh $buildType $creamaracassource $generationdir
+ bash $scriptDir/ctestmod.sh              $creamaracassource $generationdir
 fi
 fi
  creamaracasdll=$generationdir/creatools_bin/creamaracasBin
@@ -127,10 +134,10 @@ then
 if [ true = true ]
 then
 # creaEnvironment
- sh $scriptDir/cmakemod.sh                 $creaenvironmentsource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh $buildType    $creaenvironmentsource $generationdir
- sh $scriptDir/ctestmod.sh                 $creaenvironmentsource $generationdir
+ bash $scriptDir/cmakemod.sh                 $creaenvironmentsource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
+ bash $scriptDir/compilemod.sh $buildType    $creaenvironmentsource $generationdir
+ bash $scriptDir/ctestmod.sh                 $creaenvironmentsource $generationdir
 fi
 fi
  creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin
@@ -147,10 +154,10 @@ then
 if [ true = true ]
 then
 # creaBruker
- sh $scriptDir/cmakemod.sh              $creabrukersource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaBrukerVariables.sh   $creabrukersource $generationdir $docgeneration $gdcmVersion
- sh $scriptDir/compilemod.sh $buildType $creabrukersource $generationdir
- sh $scriptDir/ctestmod.sh              $creabrukersource $generationdir
+ bash $scriptDir/cmakemod.sh              $creabrukersource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaBrukerVariables.sh   $creabrukersource $generationdir $docgeneration $gdcmVersion
+ bash $scriptDir/compilemod.sh $buildType $creabrukersource $generationdir
+ bash $scriptDir/ctestmod.sh              $creabrukersource $generationdir
 fi
 fi
  creabrukerdll=$generationdir/creatools_bin/creabrukerBin
@@ -167,10 +174,10 @@ then
 if [ true = true ]
 then
 # creaImageIO
- sh $scriptDir/cmakemod.sh              $creaimagesource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration $gdcmVersion
- sh $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir
- sh $scriptDir/ctestmod.sh              $creaimagesource $generationdir
+ bash $scriptDir/cmakemod.sh              $creaimagesource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration $gdcmVersion
+ bash $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir
+ bash $scriptDir/ctestmod.sh              $creaimagesource $generationdir
 fi
 fi
  creaimagedll=$generationdir/creatools_bin/creaimageBin
@@ -187,10 +194,10 @@ then
 if [ true = true ]
 then
 # creaContours
- sh $scriptDir/cmakemod.sh              $creacontourssource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir
- sh $scriptDir/ctestmod.sh              $creacontourssource $generationdir
+ bash $scriptDir/cmakemod.sh              $creacontourssource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
+ bash $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir
+ bash $scriptDir/ctestmod.sh              $creacontourssource $generationdir
 fi
 fi
 # creacontourdll=$generationdir/creatools_bin/creacontoursBin
@@ -206,10 +213,10 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
- sh $scriptDir/cmakemod.sh                         $crearigidregistrationssource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaRigidRegistrationVariables.sh   $crearigidregistrationssource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh            $buildType $crearigidregistrationssource $generationdir
- sh $scriptDir/ctestmod.sh                         $crearigidregistrationssource $generationdir
+ bash $scriptDir/cmakemod.sh                         $crearigidregistrationssource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaRigidRegistrationVariables.sh   $crearigidregistrationssource $generationdir $docgeneration
+ bash $scriptDir/compilemod.sh            $buildType $crearigidregistrationssource $generationdir
+ bash $scriptDir/ctestmod.sh                         $crearigidregistrationssource $generationdir
 fi
 fi
 # crearigidregistrationdll=$generationdir/creatools_bin/crearigidregistrationBin
@@ -226,10 +233,10 @@ then
 if [ true = true ]
 then
 # bbtkGEditor
- sh $scriptDir/cmakemod.sh              $bbtkgeditorsource $generationdir $installPrefix $buildType 
- sh $scriptDir/bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh $buildType $bbtkgeditorsource $generationdir
- sh $scriptDir/ctestmod.sh              $bbtkgeditorsource $generationdir
+ bash $scriptDir/cmakemod.sh              $bbtkgeditorsource $generationdir $installPrefix $buildType 
+ bash $scriptDir/bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
+ bash $scriptDir/compilemod.sh $buildType $bbtkgeditorsource $generationdir
+ bash $scriptDir/ctestmod.sh              $bbtkgeditorsource $generationdir
 fi
 fi
 # bbtkgeditordll=$generationdir/creatools_bin/bbtkgeditorBin
@@ -246,14 +253,14 @@ then
 if [ true = true ]
 then
 # creaTools
- sh $scriptDir/cmakemod.sh                $creatoolssource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaToolsVariables.sh      $creatoolssource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh   $buildType $creatoolssource $generationdir
+ bash $scriptDir/cmakemod.sh                $creatoolssource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaToolsVariables.sh      $creatoolssource $generationdir $docgeneration
+ bash $scriptDir/compilemod.sh   $buildType $creatoolssource $generationdir
 fi
 fi
 
 
-# sh ctestmod.sh $creatoolsbinary $generationdir
+# bash ctestmod.sh $creatoolsbinary $generationdir
 #  creatoolsdll=$generationdir/creatools_bin/creatoolsBin
 #  LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH