Allow installation in a user choosen directory (no longer only in /usr/local!)

diff --git a/ctest/dashboard/All.sh b/ctest/dashboard/All.sh
index 69c11536aa3611010ad6f6b55e2252ee3b09860a..4fd8885d909c11e9d889a0dbf03df9f41134f196 100644 (file)
--- a/ctest/dashboard/All.sh
+++ b/ctest/dashboard/All.sh
@@ -1,9 +1,18 @@
 #!/bin/sh
-
+if [$# = 0]
+then
 echo "Use it as :"
-echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <VTKdir>"
+echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <VTKdir> <installPrefix>"
 echo " "
-echo "ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4"
+echo "ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
+exit 0
+fi
+
+if [$# != 5]
+then 
+echo "use it as           sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
+exit 0
+fi
 
 # @echo off
 
@@ -11,10 +20,13 @@ echo "ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4"
 #allow user to choose to generate the doc or not
 
 generationdir=$1
-mkdir $generationdir
-mkdir $generationdir/tmpCreaTools_INSTALL
 cvsUserName=$3
 VTKdir=$4
+installPrefix=$5
+
+mkdir $generationdir
+mkdir $generationdir/tmpCreaTools_INSTALL
+
 
 # buildtype, useless for Linux; let here for compatibility purpose
  buildtype=Release
@@ -37,11 +49,11 @@ rm -rf $generationdir/creaBin
 rm -rf $generationdir/bbtkBin
 rm -rf $generationdir/creamaracasBin
 rm -rf $generationdir/creaEnvironmentBin
-rm -rf $generationdir/creaBrukerBin 
+rm -rf $generationdir/creaBrukerBin
 rm -rf $generationdir/creaImageIOBin
-rm -rf $generationdir/creaContoursBin 
-rm -rf $generationdir/creaRigidRegistrationBin 
-rm -rf $generationdir/bbtkGEditorBin 
+rm -rf $generationdir/creaContoursBin
+rm -rf $generationdir/creaRigidRegistrationBin
+rm -rf $generationdir/bbtkGEditorBin
 rm -rf $generationdir/creaToolsBin
 
 sh cvscheckout.sh $creasource                   $generationdir $cvsUserName
@@ -60,7 +72,7 @@ fi
 # CREA
 #if [ true = false ]
 #then
- sh cmakemod.sh                    $creasource $generationdir  $VTKdir
+ sh cmakemod.sh                    $creasource $generationdir $VTKdir $installPrefix
  sh creaVariables.sh               $creasource $generationdir $docgeneration
  sh compilemod.sh     $buildtype   $creasource $generationdir 
  sh ctestmod.sh                    $creasource $generationdir
@@ -76,7 +88,7 @@ fi
 #if [ true = false ]
 #then
 # BBTK
- sh cmakemod.sh              $bbtksource $generationdir $VTKdir
+ sh cmakemod.sh              $bbtksource $generationdir $VTKdir $installPrefix
 # echo "============================BBTK out of cmakemod "
  
  sh bbtkVariables.sh         $bbtksource $generationdir $docgeneration
@@ -96,7 +108,7 @@ fi
 #then
  creaMaracasVisu
 # echo "========================================================================================start creaMaracasVisu " 
- sh cmakemod.sh                        $creamaracassource $generationdir $VTKdir
+ sh cmakemod.sh                        $creamaracassource $generationdir $VTKdir $installPrefix
 # echo "=======================================================================================creaMaracasVisu out of cmakemod "
  
  sh creaMaracasVariables.sh            $creamaracassource $generationdir $docgeneration
@@ -111,7 +123,7 @@ fi
 #if [ true = false ]
 #then
 # creaEnvironment
- sh cmakemod.sh                 $creaenvironmentsource $generationdir  $VTKdir
+ sh cmakemod.sh                 $creaenvironmentsource $generationdir $VTKdir $installPrefix
 
  sh creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
  sh compilemod.sh $buildtype    $creaenvironmentsource $generationdir
@@ -123,19 +135,19 @@ fi
 #if [ true = false ]
 #then
 # creaBruker
- sh cmakemod.sh                 $creabrukersource $generationdir  $VTKdir
+ sh cmakemod.sh                 $creabrukersource $generationdir $VTKdir $installPrefix
  sh creaBrukerVariables.sh $creabrukersource $generationdir $docgeneration
 #fi
 
  sh compilemod.sh $buildtype    $creabrukersource  $generationdir
 # echo "creaBruker : out of compilemod.sh; stop here, now!"
-# exit 0 
+# exit 0
  sh ctestmod.sh                 $creabrukersource $creabinfolder
  creabrukerdll=$generationdir/tmpCreaTools_INSTALL/creabrukerBin
  LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH
 
 # creaImageIO
- sh cmakemod.sh              $creaimagesource $generationdir  $VTKdir
+ sh cmakemod.sh              $creaimagesource $generationdir $VTKdir $installPrefix
  sh creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creaimagesource $generationdir
  sh ctestmod.sh              $creaimagesource $generationdir
@@ -143,7 +155,7 @@ fi
  LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH
 
 # creaContours
- sh cmakemod.sh              $creacontourssource $generationdir  $VTKdir
+ sh cmakemod.sh              $creacontourssource $generationdir $VTKdir $installPrefix
  sh creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creacontourssource $generationdir
  sh ctestmod.sh              $creacontourssource $generationdir
@@ -151,7 +163,7 @@ fi
 # LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH
 
 # creaRigidRegistration
- sh cmakemod.sh                       $crearigidregistrationssource $generationdir  $VTKdir
+ sh cmakemod.sh                       $crearigidregistrationssource $generationdir $VTKdir $installPrefix
  sh creaRigidRegistrationVariables.sh $crearigidregistrationssource $generationdir $docgeneration
  sh compilemod.sh $buildtype          $crearigidregistrationssource $generationdir
  sh ctestmod.sh                       $crearigidregistrationssource $generationdir
@@ -159,7 +171,7 @@ fi
 # LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH
 
 # bbtkGEditor
- sh cmakemod.sh              $bbtkgeditorsource $generationdir  $VTKdir
+ sh cmakemod.sh              $bbtkgeditorsource $generationdir $VTKdir $installPrefix
  sh bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
  sh compilemod.sh $buildtype $bbtkgeditorsource $generationdir
  sh ctestmod.sh              $bbtkgeditorsource $generationdir
@@ -167,7 +179,7 @@ fi
 # LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH
 
 # creaTools
- sh cmakemod.sh                    $creatoolssource $generationdir  $VTKdir
+ sh cmakemod.sh                    $creatoolssource $generationdir $VTKdir $installPrefix
  sh creaToolsVariables.sh          $creatoolssource $generationdir $docgeneration
  sh compilemod.sh $buildtype       $creatoolssource $generationdir
 # sh ctestmod.sh $creatoolsbinary $generationdir

diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh
index 751883e48da7bc1ed36073d08ea0da68e2d06904..00d15e914197d8add5a6fdb083303268c237b2a1 100644 (file)
--- a/ctest/dashboard/cmakemod.sh
+++ b/ctest/dashboard/cmakemod.sh
@@ -1,7 +1,17 @@
+#!/bin/sh
+
 currentdir=$2
 VTKdir=$3
+installPrefix=$4
 dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin
 
+if [$# = 4]
+then 
+installPrefix=$4
+else
+installPrefix="/usr/local"
+fi
+
 echo dirInstall
 echo $dirInstall
 
@@ -19,5 +29,5 @@ cmake -D --BUILD_ALL:BOOL=ON CMakeCache.txt
 # This one : only for misinstalled vtk:
 # modify VTK_DIR:PATH=, acording to your own computer
 
-cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$currentdir/tmpCreaTools_INSTALL/$1 -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin CMakeCache.txt
+cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$currentdir/tmpCreaTools_INSTALL/$1 -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin CMAKE_INSTALL_PREFIX=$installPrefix CMakeCache.txt
 cd ..

diff --git a/ctest/dashboard/creaVariables.sh b/ctest/dashboard/creaVariables.sh
index 63876005821740136d19eadbea7ddfa88ed9c4a6..3cff629c77fb42681744589be777e31f7bdd9814 100644 (file)
--- a/ctest/dashboard/creaVariables.sh
+++ b/ctest/dashboard/creaVariables.sh
@@ -1,3 +1,9 @@
+#!/bin/sh
+
+# $1 : bbtk
+# $2 : generationdir
+# $3 : ON/OFF (generate doc) --> Not used
+
 binfolder=$2/tmpCreaTools_INSTALL/$1Bin
 
 cd $binfolder