X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FAll.sh;h=b762df25bafa46e64b9beb962c8af8e7bd44d0a5;hb=6fc178d9ca1829f744c17e11e58d8ae75fc560d0;hp=8fffc7fe3bf7e263eaab92b5c12a9acd0188c6a6;hpb=2676936fffc8a282de9731455741919eaeae6226;p=creaToolsTools.git

diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh
index 8fffc7f..b762df2 100644
--- a/Install/scripts/All.sh
+++ b/Install/scripts/All.sh
@@ -3,10 +3,11 @@
 if [ $# = 0 ]
 then
 echo "Use it as :"
-echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <installPrefix> <buildType>"
+echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <installPrefix> <buildType> <GDCM Version>"
 echo "with 'installPrefix' : /usr/local or <directory where you want to generate>/creatools_install"
+echo "with 'GDCM Version' : GDCM1 / GDCM2"
 echo " "
-echo "ex : sh All.sh /tmp/gendir OFF jpr /tmp/gendir/creatools_install Debug"
+echo "ex : sh All.sh /tmp/gendir OFF jpr /tmp/gendir/creatools_install Debug GDCM2"
 exit 0
 fi
 
@@ -18,14 +19,15 @@ echo $2
 echo $3
 echo $4
 echo $5
+echo $6
 echo "----------"
 
-if [ $# != 5 ]
+if [ $# != 6 ]
 then 
-echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <installPrefix> <buildType>"
+echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <installPrefix> <buildType> <GDCM Version>"
 echo "with 'installPrefix' : /usr/local or <directory where you want to generate>/creatools_install"
 echo " "
-echo "ex : sh All.sh /tmp/gendir OFF jpr /tmp/gendir/creatools_install Debug"
+echo "ex : sh All.sh /tmp/gendir OFF jpr /tmp/gendir/creatools_install Debug GDCM2"
 exit 0
 fi
 
@@ -35,9 +37,11 @@ fi
 #allow user to choose to generate the doc or not
 
 generationdir=$1
+docGeneration=$2
 cvsUserName=$3
 installPrefix=$4
 buildType=$5
+gdcmVersion=$6
 
 scriptDir=$PWD
 echo scriptDir
@@ -91,7 +95,6 @@ then
 fi
 fi
 
-
 # --------------------------------
 #         start_point = 1 : remove everything but source files
 #---------------------------------
@@ -101,9 +104,9 @@ then
 #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
@@ -168,7 +171,6 @@ fi
 fi
  creadll=$generationdir/creatools_bin/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
- 
 
 
 # -------------------------
@@ -182,7 +184,7 @@ if [ true = true ]
 then
 # BBTK
  sh cmakemod.sh       	$bbtksource $generationdir $installPrefix $buildType 
- sh bbtkVariables.sh  	$bbtksource $generationdir $docgeneration
+ sh bbtkVariables.sh  	$bbtksource $generationdir $docgeneration $gdcmVersion
  sh compilemod.sh	$buildType $bbtksource $generationdir 
  sh ctestmod.sh        	$bbtksource $generationdir
 fi
@@ -241,11 +243,11 @@ then
 if [ true = true ]
 then
 # creaBruker
- sh cmakemod.sh                 $creabrukersource $generationdir $installPrefix $buildType 
- sh creaBrukerVariables.sh 	$creabrukersource $generationdir $docgeneration
- 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
@@ -263,8 +265,8 @@ if [ true = true ]
 then
 # creaImageIO
  sh cmakemod.sh              	$creaimagesource $generationdir $installPrefix $buildType 
- sh creaImageIOVariables.sh  	$creaimagesource $generationdir $docgeneration
- sh compilemod.sh 		$buildType $creaimagesource $generationdir
+ sh creaImageIOVariables.sh  	$creaimagesource $generationdir $docgeneration $gdcmVersion
+ sh compilemod.sh    $buildType $creaimagesource $generationdir
  sh ctestmod.sh              	$creaimagesource $generationdir
 fi
 fi
@@ -284,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
@@ -303,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
@@ -323,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
@@ -343,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
 
@@ -364,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
@@ -373,7 +375,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