General upgrade

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

diff --git a/Install/scripts/make.sh b/Install/scripts/make.sh
index 6e698758a589da2f5ce5dc946a39524764982727..90b000fd31661c0f4c39a235a32b1d223178a4b7 100644 (file)
--- a/Install/scripts/make.sh
+++ b/Install/scripts/make.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
@@ -71,63 +72,22 @@ cd $generationdir
 
 start_point=0
 
-
-
-# ----------------------------------
-#         start_point =  0 : checkout all
-#-----------------------------------
-if [ $start_point -le 0 ]
-then
-#if [ true = false ]
-if [ true = true ]
-then
-  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
-fi
-
 # --------------------------------
-#         start_point = 1 : remove everything but source files
+#         start_point = 0 : remove everything
 #---------------------------------
-if [ $start_point -le 1 ]
+if [ $start_point -le 0 ]
 then
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
 then
-  sudo rm -rf creatools_bin
+  rm -rf creatools_bin
   mkdir $generationdir/creatools_bin
-  sudo rm -rf creatools_source
+  rm -rf creatools_source
   mkdir $generationdir/creatools_source
-
-  sudo rm -rf creatools_install/lib/creatools
-  sudo rm -rf creatools_install/lib64/creatools
-  sudo rm -rf creatools_install/bin/bb*
-  sudo rm -rf creatools_install/bin/crea*
-  sudo rm -rf creatools_install/include/bb*
-  sudo rm -rf creatools_install/include/crea*
-  sudo rm -rf creatools_install/share/bb*
-  sudo rm -rf creatools_install/share/crea*
-
-#this is for the old versions EED
-  sudo rm -rf creatools_install/lib/crea*
-  sudo rm -rf creatools_install/lib/libbb*
-  sudo rm -rf creatools_install/lib/libcrea*
-  sudo rm -rf creatools_install/lib64/crea*
-  sudo rm -rf creatools_install/lib64/libbb*
-  sudo rm -rf creatools_install/lib64/libcrea*
 fi
 fi
 
-
 # ----------------------------------
 #         start_point =  1 : checkout all
 #-----------------------------------
@@ -149,6 +109,8 @@ then
 fi
 fi
 
+
+
 cd $scriptDir
 
 
@@ -170,7 +132,7 @@ fi
 fi
  creadll=$generationdir/creatools_bin/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
- 
+
 
 
 # -------------------------
@@ -185,13 +147,14 @@ then
 # BBTK
  sh cmakemod.sh        $bbtksource $generationdir $installPrefix $buildType 
  sh bbtkVariables.sh   $bbtksource $generationdir $docgeneration $gdcmVersion
- sh compilemod.sh      $buildType $bbtksource $generationdir 
+ sh compilemod.sh      $buildType  $bbtksource $generationdir 
  sh ctestmod.sh                $bbtksource $generationdir
 fi
 fi
  bbtkdll=$generationdir/creatools_bin/bbtkBin
  LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
 
+ exit 0
 
 # -------------------------
 #        start_point =  4 : creaMaracasVisu
@@ -243,11 +206,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 +229,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 +249,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 +268,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 +288,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 +308,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 +329,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
@@ -375,7 +338,7 @@ sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatoo
 sed -i -e '/.*creatools_base_library_config.*/ d' ~/.bashrc
 
 # - add line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' (with accurate value for ???)
-echo source $installPrefix/share/creatools_base_library_config.sh >> ~/.bashrc 
+echo [ -f "$installPrefix/share/creatools_base_library_config.sh" ] &&  source $installPrefix/share/creatools_base_library_config.sh >> ~/.bashrc 
 
 
 # shutdown /s