New structure

diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh
index 1e23099821ae316799c18fa46966efab87fa0ee4..63691199055868232d3737d1df10449d6efd79e1 100644 (file)
--- a/Install/scripts/All.sh
+++ b/Install/scripts/All.sh
@@ -5,13 +5,24 @@ then
 echo "Use it as :"
 echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <VTKdir> <installPrefix> <buildType>"
 echo " "
-echo "ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
+echo "ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myIntsallDirectory"
 exit 0
 fi
 
+echo $#
+echo "----------"
+echo $0
+echo $1
+echo $2
+echo $3
+echo $4
+echo $5
+echo $6
+echo "----------"
+
 if [ $# != 6 ]
 then 
-echo "use it as           sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory Release"
+echo "use it as           sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInstallDirectory Release"
 exit 0
 fi
 
@@ -26,8 +37,13 @@ VTKdir=$4
 installPrefix=$5
 buildtype=$6
 
+scriptDir=$PWD/scripts
+echo scriptDir
+echo $scriptDir
+
 mkdir $generationdir
-mkdir $generationdir/tmpCreaToolsBIN
+mkdir $generationdir/creatools_source
+mkdir $generationdir/creatools_bin
 
  creasource=crea
  bbtksource=bbtk
@@ -39,47 +55,54 @@ mkdir $generationdir/tmpCreaToolsBIN
  crearigidregistrationssource=creaRigidRegistration
  bbtkgeditorsource=bbtkGEditor
  creatoolssource=creaTools
+ 
+cd $generationdir
 
 # the following stupid test is used at debug time; Please don't remove!
-if [ true = true ]
+if [ true = false ]
 then
 
-rm -rf $generationdir/creaBin
-rm -rf $generationdir/bbtkBin
-rm -rf $generationdir/creamaracasBin
-rm -rf $generationdir/creaEnvironmentBin
-rm -rf $generationdir/creaBrukerBin
-rm -rf $generationdir/creaImageIOBin
-rm -rf $generationdir/creaContoursBin
-rm -rf $generationdir/creaRigidRegistrationBin
-rm -rf $generationdir/bbtkGEditorBin
-rm -rf $generationdir/creaToolsBin
-
-sh cvscheckout.sh $creasource                   $generationdir $cvsUserName
-sh cvscheckout.sh $bbtksource                   $generationdir $cvsUserName
-sh cvscheckout.sh $creamaracassource            $generationdir $cvsUserName
-sh cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName
-sh cvscheckout.sh $creabrukersource             $generationdir $cvsUserName
-sh cvscheckout.sh $creaimagesource              $generationdir $cvsUserName
-sh cvscheckout.sh $creacontourssource           $generationdir $cvsUserName
-sh cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName
-sh cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName
-sh cvscheckout.sh $creatoolssource              $generationdir $cvsUserName
+rm -rf creatools_bin/creaBin
+rm -rf creatools_bin/bbtkBin
+rm -rf creatools_bin/creamaracasBin
+rm -rf creatools_bin/creaEnvironmentBin
+rm -rf creatools_bin/creaBrukerBin
+rm -rf creatools_bin/creaImageIOBin
+rm -rf creatools_bin/creaContoursBin
+rm -rf creatools_bin/creaRigidRegistrationBin
+rm -rf creatools_bin/bbtkGEditorBin
+rm -rf /creatools_bin/creaToolsBin
+
+sh $scriptDir/cvscheckout.sh $creasource                   $generationdir $cvsUserName
+sh $scriptDir/cvscheckout.sh $bbtksource                   $generationdir $cvsUserName
+sh $scriptDir/cvscheckout.sh $creamaracassource            $generationdir $cvsUserName
+sh $scriptDir/cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName
+sh $scriptDir/cvscheckout.sh $creabrukersource             $generationdir $cvsUserName
+sh $scriptDir/cvscheckout.sh $creaimagesource              $generationdir $cvsUserName
+sh $scriptDir/cvscheckout.sh $creacontourssource           $generationdir $cvsUserName
+sh $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName
+sh $scriptDir/cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName
+sh $scriptDir/cvscheckout.sh $creatoolssource              $generationdir $cvsUserName
 
 fi
 
+cd $scriptDir
+
 # CREA
 #if [ true = false ]
 #then
  sh cmakemod.sh                    $creasource $generationdir $VTKdir $installPrefix $buildType
  sh creaVariables.sh               $creasource $generationdir $docgeneration
  sh compilemod.sh     $buildtype   $creasource $generationdir 
+  echo " ---------------after compilemod -------------------------"
+ pwd
  sh ctestmod.sh                    $creasource $generationdir
 #fi
     
- creadll=$generationdir/tmpCreaTools_INSTALL/creaBin
+ creadll=$generationdir/creatools_bin/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
- 
+
+
 # echo "=in All.sh, out of crea ============================================================================ $LD_LIBRARY_PATH"
 
 
@@ -98,9 +121,10 @@ fi
  sh ctestmod.sh              $bbtksource $generationdir
 #fi
 
- bbtkdll=$generationdir/tmpCreaTools_INSTALL/bbtkBin
+ bbtkdll=$generationdir/creatools_bin/bbtkBin
  LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
 
+
 #if [ true = false ]
 #then
  creaMaracasVisu
@@ -109,23 +133,22 @@ fi
 # echo "=======================================================================================creaMaracasVisu out of cmakemod "
  
  sh creaMaracasVariables.sh            $creamaracassource $generationdir $docgeneration
- sh compilemod.sh           $buildtype $creamaracassource $generationdir
+ sh compilemod.sh           $buildtype $creamaracassource $generationdir 
+
  sh ctestmod.sh                        $creamaracassource $generationdir
 #fi
- creamaracasdll=$generationdir/tmpCreaTools_INSTALL/creamaracasBin
+ creamaracasdll=$generationdir/creatools_bin/creamaracasBin
  LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_PATH
 
-
 #if [ true = false ]
 #then
 # creaEnvironment
  sh cmakemod.sh                 $creaenvironmentsource $generationdir $VTKdir $installPrefix $buildType
-
  sh creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
  sh compilemod.sh $buildtype    $creaenvironmentsource $generationdir
  sh ctestmod.sh                 $creaenvironmentsource $generationdir
 #fi
- creaenvironmentdll=$generationdir/tmpCreaTools_INSTALL/creaenvironmentBin
+ creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin
  LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_PATH
 
 #if [ true = false ]
@@ -139,7 +162,7 @@ fi
 # echo "creaBruker : out of compilemod.sh; stop here, now!"
 # exit 0
  sh ctestmod.sh                 $creabrukersource $creabinfolder
- creabrukerdll=$generationdir/tmpCreaTools_INSTALL/creabrukerBin
+ creabrukerdll=$generationdir/creatools_bin/creabrukerBin
  LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH
 
 # creaImageIO
@@ -147,7 +170,7 @@ fi
  sh creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creaimagesource $generationdir
  sh ctestmod.sh              $creaimagesource $generationdir
- creaimagedll=$generationdir/tmpCreaTools_INSTALL/creaimageBin
+ creaimagedll=$generationdir/creatools_bin/creaimageBin
  LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH
 
 # creaContours
@@ -155,7 +178,7 @@ fi
  sh creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creacontourssource $generationdir
  sh ctestmod.sh              $creacontourssource $generationdir
-# creacontourdll=$generationdir/tmpCreaTools_INSTALL/creacontoursBin
+# creacontourdll=$generationdir/creatools_bin/creacontoursBin
 # LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH
 
 # creaRigidRegistration
@@ -163,7 +186,7 @@ fi
  sh creaRigidRegistrationVariables.sh $crearigidregistrationssource $generationdir $docgeneration
  sh compilemod.sh $buildtype          $crearigidregistrationssource $generationdir
  sh ctestmod.sh                       $crearigidregistrationssource $generationdir
-# crearigidregistrationdll=$generationdir/tmpCreaTools_INSTALL/crearigidregistrationBin
+# crearigidregistrationdll=$generationdir/creatools_bin/crearigidregistrationBin
 # LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH
 
 # bbtkGEditor
@@ -171,7 +194,7 @@ fi
  sh bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
  sh compilemod.sh $buildtype $bbtkgeditorsource $generationdir
  sh ctestmod.sh              $bbtkgeditorsource $generationdir
-# bbtkgeditordll=$generationdir/tmpCreaTools_INSTALL/bbtkgeditorBin
+# bbtkgeditordll=$generationdir/creatools_bin/bbtkgeditorBin
 # LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH
 
 # creaTools
@@ -179,7 +202,7 @@ fi
  sh creaToolsVariables.sh          $creatoolssource $generationdir $docgeneration
  sh compilemod.sh $buildtype       $creatoolssource $generationdir
 # sh ctestmod.sh $creatoolsbinary $generationdir
-#  creatoolsdll=$generationdir/tmpCreaTools_INSTALL/creatoolsBin
+#  creatoolsdll=$generationdir/creatools_bin/creatoolsBin
 #  LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH
 
 # shutdown /s

diff --git a/Install/scripts/bbtkGEditorVariables.sh b/Install/scripts/bbtkGEditorVariables.sh
index ee26523bf876056fc4a2728b0ad04c2ae36bed06..72fb49fd81f89204c49257bc054d103fee3516a2 100644 (file)
--- a/Install/scripts/bbtkGEditorVariables.sh
+++ b/Install/scripts/bbtkGEditorVariables.sh
@@ -2,12 +2,12 @@
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
 
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin                       CMakeCache.txt
-cmake -D BBTK_DIR:PATH=$2/tmpCreaTools_INSTALL/bbtkBin                       CMakeCache.txt
-cmake -D creaMaracasVisu_DIR:PATH=$2/tmpCreaTools_INSTALL/creaMaracasVisuBin CMakeCache.txt
+cmake -D crea_DIR:PATH=$2/creatools_bin/creaBin                       CMakeCache.txt
+cmake -D BBTK_DIR:PATH=$2/creatools_bin/bbtkBin                       CMakeCache.txt
+cmake -D creaMaracasVisu_DIR:PATH=$2/creatools_bin/creaMaracasVisuBin CMakeCache.txt
 cmake -D BUILD_bbtkGEditor_DOC:BOOL=$3                                       CMakeCache.txt
 cmake -D BUILD_DOXYGEN_DOC:BOOL=$3                                           CMakeCache.txt
 cmake CMakeCache.txt

diff --git a/Install/scripts/bbtkVariables.sh b/Install/scripts/bbtkVariables.sh
index 01a4dd91bcbf5b6b8a46d0768024f60bcd4d860d..aba72ea045edc4436e71f5b42f873f0f0882dd4d 100644 (file)
--- a/Install/scripts/bbtkVariables.sh
+++ b/Install/scripts/bbtkVariables.sh
@@ -4,11 +4,11 @@
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
 
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
 cmake -D --BUILD_ALL:BOOL=ON                           CMakeCache.txt
-cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
+cmake -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt
 cmake -D BUILD_BBTK_DOC:BOOL=$3                        CMakeCache.txt
 cmake -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=$3            CMakeCache.txt
 

diff --git a/Install/scripts/cmakemod.sh b/Install/scripts/cmakemod.sh
index 4a401cde76a2cb6e7ba5bb158f92dbdc57fb879d..89c994cd9a5dde04dfeddcfee3b3743895adcf0e 100644 (file)
--- a/Install/scripts/cmakemod.sh
+++ b/Install/scripts/cmakemod.sh
@@ -3,15 +3,15 @@
 currentdir=$2
 VTKdir=$3
 installPrefix=$4
-dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin
+dirInstall=$currentdir/creatools_bin/$1Bin
 installPrefix=$4
 buildType=$5
-
+echo $debug
 if [ buildType = "Debug" ]
 then
-debug = "ON"
+debug="ON"
 else
-debug = "OFF"
+debug="OFF"
 fi
 
 echo dirInstall
@@ -19,12 +19,12 @@ echo $dirInstall
 
 mkdir $dirInstall
 cd $dirInstall
-echo -H$currentdir/$1
+echo -H$currentdir/creatools_source/$1
 echo -B$dirInstall/
 
 ## cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
-cmake -G"Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
-cmake -D BUILD_ALL:BOOL=ON -D USE_DEBUG_LIB:BOOL=$debug CMakeCache.txt
+cmake -G"Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/
+cmake -D BUILD_ALL:BOOL=ON -D USE_DEBUG_LIB:BOOL=$buildType CMakeCache.txt
 
 # the following line is the right one!
 #cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin CMakeCache.txt

diff --git a/Install/scripts/compilemod.sh b/Install/scripts/compilemod.sh
index 5ef07b157b3f6563a13c747377a16d923191f4be..28011502b9d410dfc42d240d93dd21cbedfd3bc1 100644 (file)
--- a/Install/scripts/compilemod.sh
+++ b/Install/scripts/compilemod.sh
@@ -1,14 +1,16 @@
 # $1 : useless for Linux (Release/Debug)
 
-cd $3/tmpCreaTools_INSTALL/$2Bin
-
-#echo $1
-#echo $2
-#echo $3
+cd $3/creatools_bin/$2Bin
+echo "--------------------------------------in compilemod--------------"
+echo $1
+echo $2
+echo $3
 
 make -j 2
 echo " "
 echo $2
 pwd
 sudo make install
-cd ..
+cd ../..
+pwd
+echo "--------------------------------------out compilemod--------------"

diff --git a/Install/scripts/creaBrukerVariables.sh b/Install/scripts/creaBrukerVariables.sh
index 5355243495f0e45d3d10e086d508ce0c0afeb0cd..1be2e2443457a03512a926c919b6dd802aa92596 100644 (file)
--- a/Install/scripts/creaBrukerVariables.sh
+++ b/Install/scripts/creaBrukerVariables.sh
@@ -2,12 +2,12 @@
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
 
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
 #cmake -D BUILD_ALL:BOOL=OFF                            CMakeCache.txt
 cmake -D BUILD_creaBruker_DOC:BOOL=$3                  CMakeCache.txt
-cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
+cmake -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt
 cmake -D BUILD_DOXYGEN_DOC:BOOL=$3                     CMakeCache.txt
 
 cmake CMakeCache.txt

diff --git a/Install/scripts/creaContoursVariables.sh b/Install/scripts/creaContoursVariables.sh
index e4675ce7b44179186c5b9a0b8604a90915cbc054..9d705d4b7c23fca069a60626e768b947210754be 100644 (file)
--- a/Install/scripts/creaContoursVariables.sh
+++ b/Install/scripts/creaContoursVariables.sh
@@ -2,15 +2,15 @@
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
 
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin       CMakeCache.txt
-cmake -D BBTK_DIR:PATH=$2/tmpCreaTools_INSTALL/bbtkBin       CMakeCache.txt
-cmake -D BBTK_DIR:PATH=$2/tmpCreaTools_INSTALL/bbtkBin       CMakeCache.txt
-cmake -D creaEnvironment_DIR:PATH=$2/tmpCreaTools_INSTALL/creaEnvironmentBin       CMakeCache.txt
-cmake -D creaMaracasVisu_DIR:PATH=$2/tmpCreaTools_INSTALL/creaMaracasVisuBin       CMakeCache.txt
-cmake -D creaImageIO_DIR:PATH=$2/tmpCreaTools_INSTALL/creaImageIOBin       CMakeCache.txt
+cmake -D crea_DIR:PATH=$2/creatools_bin/creaBin       CMakeCache.txt
+cmake -D BBTK_DIR:PATH=$2/creatools_bin/bbtkBin       CMakeCache.txt
+cmake -D BBTK_DIR:PATH=$2/creatools_bin/bbtkBin       CMakeCache.txt
+cmake -D creaEnvironment_DIR:PATH=$2/creatools_bin/creaEnvironmentBin       CMakeCache.txt
+cmake -D creaMaracasVisu_DIR:PATH=$2/creatools_bin/creaMaracasVisuBin       CMakeCache.txt
+cmake -D creaImageIO_DIR:PATH=$2/creatools_bin/creaImageIOBin       CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaContours:BOOL=ON             CMakeCache.txt
 cmake -D creaContours_DOC:BOOL=$3                            CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=$3 CMakeCache.txt

diff --git a/Install/scripts/creaImageIOVariables.sh b/Install/scripts/creaImageIOVariables.sh
index c14ebabf3a04d9411629c435ea16c44bc6c305ff..906ca881cac3375d018355f0d878591f4e0eb9e7 100644 (file)
--- a/Install/scripts/creaImageIOVariables.sh
+++ b/Install/scripts/creaImageIOVariables.sh
@@ -5,12 +5,12 @@
 # $3 : ON/OFF (generate doc)
 
 currentdir=$2
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin  CMakeCache.txt
-cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin  CMakeCache.txt
-cmake -D creaBruker_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBrukerBin  CMakeCache.txt
+cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin  CMakeCache.txt
+cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin  CMakeCache.txt
+cmake -D creaBruker_DIR:PATH=$currentdir/creatools_bin/creaBrukerBin  CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON                  CMakeCache.txt
 cmake -D BUILD_creaImageIO_DOC:BOOL=$3                           CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=$3      CMakeCache.txt

diff --git a/Install/scripts/creaMaracasVariables.sh b/Install/scripts/creaMaracasVariables.sh
index de556290d25e36cc69b45ff47d78579bda665737..e3632089ebebad8c55b3fe20a80184b49c345c11 100644 (file)
--- a/Install/scripts/creaMaracasVariables.sh
+++ b/Install/scripts/creaMaracasVariables.sh
@@ -5,11 +5,11 @@
 # $3 : ON/OFF (generate doc)
 
 currentdir=$2
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin  CMakeCache.txt
-cmake -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin  CMakeCache.txt
+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_creaMaracasVisu:BOOL=ON              CMakeCache.txt
 cmake -D creaMaracasVisu_DOC:BOOL=$3                             CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=$3  CMakeCache.txt

diff --git a/Install/scripts/creaRigidRegistrationVariables.sh b/Install/scripts/creaRigidRegistrationVariables.sh
index 29a137a793e129bb4a2c5caa222c935d6f1e7b77..c34c98ccbb58d5204e53dd1f7f590f551ca2ad89 100644 (file)
--- a/Install/scripts/creaRigidRegistrationVariables.sh
+++ b/Install/scripts/creaRigidRegistrationVariables.sh
@@ -2,11 +2,11 @@
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
 
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
 
-cmake -D crea_DIR:PATH=$currentdir$2 -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON -D BUILD_creaRigidRegistration_DOC:BOOL=$3 -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
+cmake -D crea_DIR:PATH=$currentdir$2 -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON -D BUILD_creaRigidRegistration_DOC:BOOL=$3 -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt
 
 cmake CMakeCache.txt
 cmake CMakeCache.txt

diff --git a/Install/scripts/creaToolsVariables.sh b/Install/scripts/creaToolsVariables.sh
index f9da12e600f14f9276ca46886b7cff2e6122fca7..21dc39fe2d99076db726dc7bc656af0082d706d4 100644 (file)
--- a/Install/scripts/creaToolsVariables.sh
+++ b/Install/scripts/creaToolsVariables.sh
@@ -2,10 +2,10 @@
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
 
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D CREATOOLS_SOURCE_PATH:PATH=$currentdir/tmpCreaTools_INSTALL/ CMakeCache.txt
+cmake -D CREATOOLS_SOURCE_PATH:PATH=$currentdir/creatools_bin/ CMakeCache.txt
 
 cmake  CMakeCache.txt
 

diff --git a/Install/scripts/creaVariables.sh b/Install/scripts/creaVariables.sh
index 3cff629c77fb42681744589be777e31f7bdd9814..aeb42292d00ec165031d913528ea3994e953d7a5 100644 (file)
--- a/Install/scripts/creaVariables.sh
+++ b/Install/scripts/creaVariables.sh
@@ -4,7 +4,7 @@
 # $2 : generationdir
 # $3 : ON/OFF (generate doc) --> Not used
 
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 
 cd $binfolder
 

diff --git a/Install/scripts/creaenvironmentVariables.sh b/Install/scripts/creaenvironmentVariables.sh
index 0eed0f1f31414f2bf643277b3d4d3642024bc803..48c082b0e98e55e6b03f827490b77645e9126657 100644 (file)
--- a/Install/scripts/creaenvironmentVariables.sh
+++ b/Install/scripts/creaenvironmentVariables.sh
@@ -4,10 +4,10 @@
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
 
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
+cmake -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt
 
 cmake  CMakeCache.txt
 

diff --git a/Install/scripts/ctestmod.sh b/Install/scripts/ctestmod.sh
index 0e4b6ed72eea07135f63f18238e09674bcb58dd0..8be88bb474619671ca92d3e0a79d4e41cf7b29c0 100644 (file)
--- a/Install/scripts/ctestmod.sh
+++ b/Install/scripts/ctestmod.sh
@@ -1,5 +1,5 @@
-echo "=in ctestmod ===========================================$2/tmpCreaTools_INSTALL/$1Bin"
-cd $2/tmpCreaTools_INSTALL/$1Bin
+echo "=in ctestmod ===========================================$2/creatools_bin/$1Bin"
+cd $2/creatools_bin/$1Bin
 
 /usr/bin/ctest -D ExperimentalConfigure -D ExperimentalBuild