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

diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh
index 944b7c2..423248e 100644
--- a/Install/scripts/All.sh
+++ b/Install/scripts/All.sh
@@ -141,10 +141,10 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
- sh cmakemod.sh        	$creasource $generationdir $installPrefix $buildType 
- sh creaVariables.sh	$creasource $generationdir $docgeneration
- sh compilemod.sh     	$buildType   $creasource $generationdir  
- sh ctestmod.sh       	$creasource $generationdir
+ sh cmakemod.sh              $creasource $generationdir $installPrefix $buildType 
+ sh creaVariables.sh         $creasource $generationdir $docgeneration
+ sh compilemod.sh $buildType $creasource $generationdir  
+ sh ctestmod.sh              $creasource $generationdir
 fi
 fi
  creadll=$generationdir/creatools_bin/creaBin
@@ -161,10 +161,10 @@ then
 if [ true = true ]
 then
 # BBTK
- sh cmakemod.sh       	$bbtksource $generationdir $installPrefix $buildType 
- sh bbtkVariables.sh  	$bbtksource $generationdir $docgeneration $gdcmVersion
- sh compilemod.sh	$buildType $bbtksource $generationdir 
- sh ctestmod.sh        	$bbtksource $generationdir
+ sh cmakemod.sh              $bbtksource $generationdir $installPrefix $buildType 
+ sh bbtkVariables.sh         $bbtksource $generationdir $docgeneration $gdcmVersion
+ sh compilemod.sh $buildType $bbtksource $generationdir 
+ sh ctestmod.sh              $bbtksource $generationdir
 fi
 fi
  bbtkdll=$generationdir/creatools_bin/bbtkBin
@@ -181,10 +181,10 @@ then
 if [ true = true ]
 then
 # creaMaracasVisu
- sh cmakemod.sh                	$creamaracassource $generationdir $installPrefix $buildType 
- sh creaMaracasVariables.sh    	$creamaracassource $generationdir $docgeneration
- sh compilemod.sh           	$buildType $creamaracassource $generationdir 
- sh ctestmod.sh               	$creamaracassource $generationdir
+ sh cmakemod.sh              $creamaracassource $generationdir $installPrefix $buildType 
+ sh creaMaracasVariables.sh  $creamaracassource $generationdir $docgeneration
+ sh compilemod.sh $buildType $creamaracassource $generationdir 
+ sh ctestmod.sh              $creamaracassource $generationdir
 fi
 fi
  creamaracasdll=$generationdir/creatools_bin/creamaracasBin
@@ -203,7 +203,7 @@ then
 # creaEnvironment
  sh cmakemod.sh                 $creaenvironmentsource $generationdir $installPrefix $buildType 
  sh creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
- sh compilemod.sh $buildType    $creaenvironmentsource $generationdir
+ sh compilemod.sh    $buildType $creaenvironmentsource $generationdir
  sh ctestmod.sh                 $creaenvironmentsource $generationdir
 fi
 fi
@@ -222,10 +222,10 @@ if [ true = true ]
 then
 # creaBruker
  sh cmakemod.sh              $creabrukersource $generationdir $installPrefix $buildType 
- sh creaBrukerVariables.sh 	 $creabrukersource $generationdir $docgeneration $gdcmVersion
+ sh creaBrukerVariables.sh   $creabrukersource $generationdir $docgeneration $gdcmVersion
  sh compilemod.sh $buildType $creabrukersource $generationdir
- echo generationdir 
  sh ctestmod.sh              $creabrukersource $generationdir
+  echo generationdir 
 fi
 fi
  creabrukerdll=$generationdir/creatools_bin/creabrukerBin
@@ -242,10 +242,10 @@ then
 if [ true = true ]
 then
 # creaImageIO
- sh cmakemod.sh              	$creaimagesource $generationdir $installPrefix $buildType 
- sh creaImageIOVariables.sh  	$creaimagesource $generationdir $docgeneration $gdcmVersion
- sh compilemod.sh    $buildType $creaimagesource $generationdir
- sh ctestmod.sh              	$creaimagesource $generationdir
+ sh cmakemod.sh              $creaimagesource $generationdir $installPrefix $buildType 
+ sh creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration $gdcmVersion
+ sh compilemod.sh $buildType $creaimagesource $generationdir
+ sh ctestmod.sh              $creaimagesource $generationdir
 fi
 fi
  creaimagedll=$generationdir/creatools_bin/creaimageBin
@@ -262,10 +262,10 @@ then
 if [ true = true ]
 then
 # creaContours
- sh cmakemod.sh              	$creacontourssource $generationdir $installPrefix $buildType 
- sh creaContoursVariables.sh	$creacontourssource $generationdir $docgeneration
- sh compilemod.sh 	 $buildType $creacontourssource $generationdir
- sh ctestmod.sh              	$creacontourssource $generationdir
+ sh cmakemod.sh              $creacontourssource $generationdir $installPrefix $buildType 
+ sh creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
+ sh compilemod.sh $buildType $creacontourssource $generationdir
+ sh ctestmod.sh              $creacontourssource $generationdir
 fi
 fi
 # creacontourdll=$generationdir/creatools_bin/creacontoursBin
@@ -281,10 +281,10 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
- sh cmakemod.sh                       	$crearigidregistrationssource $generationdir $installPrefix $buildType 
- sh creaRigidRegistrationVariables.sh 	$crearigidregistrationssource $generationdir $docgeneration
- sh compilemod.sh	 		 $buildType $crearigidregistrationssource $generationdir
- sh ctestmod.sh                       	$crearigidregistrationssource $generationdir
+ sh cmakemod.sh                       $crearigidregistrationssource $generationdir $installPrefix $buildType 
+ sh creaRigidRegistrationVariables.sh $crearigidregistrationssource $generationdir $docgeneration
+ sh compilemod.sh          $buildType $crearigidregistrationssource $generationdir
+ sh ctestmod.sh                       $crearigidregistrationssource $generationdir
 fi
 fi
 # crearigidregistrationdll=$generationdir/creatools_bin/crearigidregistrationBin
@@ -321,9 +321,9 @@ then
 if [ true = true ]
 then
 # creaTools
- sh cmakemod.sh                    $creatoolssource $generationdir $installPrefix $buildType 
- sh creaToolsVariables.sh          $creatoolssource $generationdir $docgeneration
- sh compilemod.sh 		$buildType $creatoolssource $generationdir
+ sh cmakemod.sh                      $creatoolssource $generationdir $installPrefix $buildType 
+ sh creaToolsVariables.sh            $creatoolssource $generationdir $docgeneration
+ sh compilemod.sh         $buildType $creatoolssource $generationdir
 fi
 fi
 
@@ -348,14 +348,8 @@ sudo echo export PATH='$'PATH:$installPrefix/bin
 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 installPrefixCreaTools=$installPrefix >> ~/.bashrc
-echo '[ -f "$installPrefixCreaTools/share/creatools_base_library_config.sh" ] &&  source $installPrefixCreaTools/share/creatools_base_library_config.sh' >> ~/.bashrc 
+
 
 
 # shutdown /s