X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FAll.sh;h=944b7c2530131383c5b4af93e65ab449d6ba9596;hb=322ef7eb18cf1799493d3a27ce919a3904e6c207;hp=ac4378821e4e981f3a13f6b9477f5d8a37c688a2;hpb=3bfb41d03f3ab4bf51e4444adfeb3a835575ef16;p=creaToolsTools.git

diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh
index ac43788..944b7c2 100644
--- 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
@@ -46,9 +47,9 @@ scriptDir=$PWD
 echo scriptDir
 echo $scriptDir
 
+
 mkdir $generationdir
-mkdir $generationdir/creatools_source
-mkdir $generationdir/creatools_bin
+cd $generationdir
 
  creasource=crea
  bbtksource=bbtk
@@ -60,8 +61,7 @@ mkdir $generationdir/creatools_bin
  crearigidregistrationssource=creaRigidRegistration
  bbtkgeditorsource=bbtkGEditor
  creatoolssource=creaTools
- 
-cd $generationdir
+
 
 # start_point : used at debug time : start point of the script
 # ex : if everything is OK, but bbtkGEditor, 
@@ -73,39 +73,18 @@ 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 but source files
 #---------------------------------
-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
@@ -170,7 +149,6 @@ fi
 fi
  creadll=$generationdir/creatools_bin/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
- 
 
 
 # -------------------------
@@ -243,11 +221,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 +244,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 +264,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 +283,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 +303,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 +323,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,16 +344,18 @@ 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
 # - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' if any (with accurate value for ???)
+sed -i -e '/.*installPrefixCreaTools*/ d' ~/.bashrc
 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 [ -f "$installPrefix/share/creatools_base_library_config.sh" ] &&  source $installPrefix/share/creatools_base_library_config.sh >> ~/.bashrc 
+echo installPrefixCreaTools=$installPrefix >> ~/.bashrc
+echo '[ -f "$installPrefixCreaTools/share/creatools_base_library_config.sh" ] &&  source $installPrefixCreaTools/share/creatools_base_library_config.sh' >> ~/.bashrc 
 
 
 # shutdown /s