General upgrade

[creaToolsTools.git] / Install / scripts / All.sh

diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh
index 07453889ea2df89873d8b3613aa55733e8bb6bfa..b762df25bafa46e64b9beb962c8af8e7bd44d0a5 100644 (file)
--- a/Install/scripts/All.sh
+++ b/Install/scripts/All.sh
@@ -37,6 +37,7 @@ fi
 #allow user to choose to generate the doc or not
 
 generationdir=$1
+docGeneration=$2
 cvsUserName=$3
 installPrefix=$4
 buildType=$5
@@ -170,7 +171,6 @@ fi
 fi
  creadll=$generationdir/creatools_bin/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
- 
 
 
 # -------------------------
@@ -243,11 +243,11 @@ then
 if [ true = true ]
 then
 # creaBruker
- sh cmakemod.sh                 $creabrukersource $generationdir $installPrefix $buildType 
- sh creaBrukerVariables.sh     $creabrukersource $generationdir $docgeneration $gdcmVersion
- sh compilemod.sh $buildType    $creabrukersource  $generationdir
+ sh cmakemod.sh              $creabrukersource $generationdir $installPrefix $buildType 
+ sh creaBrukerVariables.sh      $creabrukersource $generationdir $docgeneration $gdcmVersion
+ sh compilemod.sh $buildType $creabrukersource $generationdir
  echo generationdir 
- sh ctestmod.sh                 $creabrukersource $generationdir
+ sh ctestmod.sh              $creabrukersource $generationdir
 fi
 fi
  creabrukerdll=$generationdir/creatools_bin/creabrukerBin
@@ -266,7 +266,7 @@ then
 # creaImageIO
  sh cmakemod.sh                $creaimagesource $generationdir $installPrefix $buildType 
  sh creaImageIOVariables.sh    $creaimagesource $generationdir $docgeneration $gdcmVersion
- sh compilemod.sh              $buildType $creaimagesource $generationdir
+ sh compilemod.sh    $buildType $creaimagesource $generationdir
  sh ctestmod.sh                $creaimagesource $generationdir
 fi
 fi
@@ -286,7 +286,7 @@ then
 # creaContours
  sh cmakemod.sh                $creacontourssource $generationdir $installPrefix $buildType 
  sh creaContoursVariables.sh   $creacontourssource $generationdir $docgeneration
- sh compilemod.sh              $buildType $creacontourssource $generationdir
+ sh compilemod.sh       $buildType $creacontourssource $generationdir
  sh ctestmod.sh                $creacontourssource $generationdir
 fi
 fi
@@ -305,7 +305,7 @@ if [ true = true ]
 then
  sh cmakemod.sh                        $crearigidregistrationssource $generationdir $installPrefix $buildType 
  sh creaRigidRegistrationVariables.sh  $crearigidregistrationssource $generationdir $docgeneration
- sh compilemod.sh                      $buildType $crearigidregistrationssource $generationdir
+ sh compilemod.sh                       $buildType $crearigidregistrationssource $generationdir
  sh ctestmod.sh                        $crearigidregistrationssource $generationdir
 fi
 fi
@@ -325,7 +325,7 @@ then
 # bbtkGEditor
  sh cmakemod.sh                $bbtkgeditorsource $generationdir $installPrefix $buildType 
  sh bbtkGEditorVariables.sh    $bbtkgeditorsource $generationdir $docgeneration
- sh compilemod.sh              $buildType $bbtkgeditorsource $generationdir
+ sh compilemod.sh    $buildType $bbtkgeditorsource $generationdir
  sh ctestmod.sh                $bbtkgeditorsource $generationdir
 fi
 fi
@@ -345,7 +345,7 @@ then
 # creaTools
  sh cmakemod.sh                    $creatoolssource $generationdir $installPrefix $buildType 
  sh creaToolsVariables.sh          $creatoolssource $generationdir $docgeneration
- sh compilemod.sh                 $buildType $creatoolssource $generationdir
+ sh compilemod.sh              $buildType $creatoolssource $generationdir
 fi
 fi
 
@@ -366,8 +366,8 @@ sudo touch     $installPrefix/share/creatools_base_library_config.sh
 sudo chmod 666 $installPrefix/share/creatools_base_library_config.sh
 
 
-sudo echo export PATH='$'PATH:$installPrefix/bin                                  >> $installPrefix/share/creatools_base_library_config.sh
-sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh
+sudo echo export PATH='$'PATH:$installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
+sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
 sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
 
 #  modify .bashrc