*** empty log message ***

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

diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh
index e6b3fd06fac3e95b3ba51f5e169f4ac13928f44b..944b7c2530131383c5b4af93e65ab449d6ba9596 100644 (file)
--- 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,17 +37,19 @@ 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
 echo $scriptDir
 
+
 mkdir $generationdir
-mkdir $generationdir/creatools_source
-mkdir $generationdir/creatools_bin
+cd $generationdir
 
  creasource=crea
  bbtksource=bbtk
@@ -57,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, 
@@ -68,8 +71,10 @@ cd $generationdir
 
 start_point=0
 
+
+
 # --------------------------------
-#         start_point = 0 : remove all
+#         start_point = 0 : remove everything but source files
 #---------------------------------
 if [ $start_point -le 0 ]
 then
@@ -77,16 +82,10 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
-  sudo rm -rf creatools_bin/creaBin
-  sudo rm -rf creatools_bin/bbtkBin
-  sudo rm -rf creatools_bin/creaMaracasVisuBin
-  sudo rm -rf creatools_bin/creaEnvironmentBin
-  sudo rm -rf creatools_bin/creaBrukerBin
-  sudo rm -rf creatools_bin/creaImageIOBin
-  sudo rm -rf creatools_bin/creaContoursBin
-  sudo rm -rf creatools_bin/creaRigidRegistrationBin
-  sudo rm -rf creatools_bin/bbtkGEditorBin
-  sudo rm -rf creatools_bin/creaToolsBin
+  rm -rf creatools_bin
+  mkdir $generationdir/creatools_bin
+  rm -rf creatools_source
+  mkdir $generationdir/creatools_source
 
   sudo rm -rf creatools_install/lib/creatools
   sudo rm -rf creatools_install/lib64/creatools
@@ -107,6 +106,7 @@ then
 fi
 fi
 
+
 # ----------------------------------
 #         start_point =  1 : checkout all
 #-----------------------------------
@@ -149,7 +149,6 @@ fi
 fi
  creadll=$generationdir/creatools_bin/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
- 
 
 
 # -------------------------
@@ -163,7 +162,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
@@ -222,11 +221,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
@@ -244,8 +243,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
@@ -265,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
@@ -284,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
@@ -304,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
@@ -324,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
 
@@ -345,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 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