re-indent + some fixes.

Works in Fedora

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 73336f4c0001b18228dd9e554305e6b1ce73b8ae..618a633fa0875960c59c8a5c72d0380150422cb1 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -33,19 +33,19 @@ do
      
    if [ $expanded = "YES" ]
    then
-   echo " Get the 'CreaTools' source files :.2.1 (CVS : as user!)" 
-   echo " Compile   the CreaTools :..........2.2"
-# Install creatools as user (no longer as root) // JPR 2/5/2011   
-   echo " Install   the CreaTools :..........2.3"
+      echo " Get the 'CreaTools' source files :.2.1 (CVS : as user!)" 
+      echo " Compile   the CreaTools :..........2.2"
+      # Install creatools as user (no longer as root) // JPR 2/5/2011   
+      echo " Install   the CreaTools :..........2.3"
    else
-   echo " Get and Install the 'CreaTools':...2"
+      echo " Get and Install the 'CreaTools':...2"
    fi
    echo
    if [ $expanded = "NO" ]
    then
-   echo " Use Expanded menu :................5 "
+      echo " Use Expanded menu :................5 "
    else
-   echo " Use compact menu :.................5 "
+      echo " Use compact menu :.................5 "
    fi
    echo " Uninstall the CreaTools :..........6 "
    echo " Help ..............................7 Help about this menu"   
@@ -60,6 +60,22 @@ do
 
   case $i in
   0)
+  
+  # Do it, while we are under user, not under root! # JPR
+             if [ -f $HOME/.bashrc ]
+             then
+                export ETC_BASHRC=$HOME/.bashrc
+             else
+                if [ -f $HOME/.profile ]
+                    then
+                   export ETC_BASHRC=$HOME/.profile
+                    else
+                       echo "======================== BIG TROUBLE : neither $HOME/.bashrc nor $HOME/.profile file found"
+                       echo "======================== You'd better to abort the program and (try to) fix the issue"
+                       read a # just to let the user time enough to read the message...
+                    fi
+          fi
+         
   clear
   suitable=XXX
   #ls -l  scripts/CreaTools-configure.sh
@@ -72,36 +88,24 @@ do
               "$suitable" != "NO"  && \
               "$suitable" != "no"  ]]
      do          
-        echo "'Configure' already done : "
+        echo "'Configure' already done; Content of scripts/CreaTools-configure.sh :"
         echo "------------------------"
         more scripts/CreaTools-configure.sh
         echo "------------------------"
        
-       # WARNING : $installPrefixThird is taken from CreaTools-configure.sh
+           # WARNING : $installPrefixThird is taken from CreaTools-configure.sh
         # If user configured without installing third party library,
         # last third party library is still in use!  JPR
 
-
         if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
         then
-              echo WARNING
-              echo
-             if [ -f $HOME/.bashrc ]
-             then
-                export ETC_BASHRC=$HOME/.bashrc
-             else
-                if [ -f $HOME/.profile ]
-                then
-                   export ETC_BASHRC=$HOME/.profile
-                fi
-              fi                             
-              echo "the curently used Third Party libraries are NOT in $installPrefixThird but in :"
-                
-              grep "installPrefixThird=" $ETC_BASHRC 
-              echo "VTK_DIR  : " $VTK_DIR
-              echo "ITK_DIR  : " $ITK_DIR
-              echo "GDCM_DIR : " $GDCM_DIR
-             echo "(Have a look at $ETC_BASHRC=, edit it or run again Install Third Party Libraries if you disagree)"
+           echo WARNING
+           echo "the curently used Third Party libraries are NOT in $installPrefixThird but ... in :"
+           grep "installPrefixThird=" $ETC_BASHRC 
+           echo "VTK_DIR  : " $VTK_DIR
+           echo "ITK_DIR  : " $ITK_DIR
+           echo "GDCM_DIR : " $GDCM_DIR
+           echo "(Have a look at $ETC_BASHRC=, edit it or run again Install Third Party Libraries if you disagree)"
         fi
        echo    
         echo "Are these values suitable for you : YES/NO? (default is YES)"
@@ -114,7 +118,7 @@ do
   else
      suitable="NO"
   fi
-  
+
   if [[ "$suitable" = "YES" || "$suitable" = "Y" || "$suitable" = "yes" || "$suitable" = "y" ]]
   then
      source scripts/CreaTools-configure.sh
@@ -201,14 +205,14 @@ then
         do
            echo "Boolean For Doc Generation : ON/OFF (default is OFF)"
            read docgeneration
-          if [ "$docgeneration" = "" ]
-          then
-             docgeneration="OFF"
-          fi
-          echo "you said : [" $docgeneration "]"
-        done
-        echo
-        echo
+           if [ "$docgeneration" = "" ]
+           then
+              docgeneration="OFF"
+           fi
+           echo "you said : [" $docgeneration "]"
+         done
+         echo
+         echo
 fi
 
 docgeneration="OFF"
@@ -248,7 +252,7 @@ docgeneration="OFF"
 
 
         #loginUserName=""
-       loginUserName=$USER
+           loginUserName=$USER
         #while [ "$loginUserName" == "" ]
         #do 
            echo "Have a look at the following line to know 'Login User Name'/'Login Group Name'"
@@ -264,7 +268,7 @@ docgeneration="OFF"
         while [ "$loginGroupName" == "" ]
         do
            echo "Have a look at the following line to know 'Login User Name'/'Login Group Name'"
-          echo "Login Group Name (mandatory!)"
+              echo "Login Group Name (mandatory!)"
            read loginGroupName  
            echo "you said : [" $loginGroupName "]"  
         done
@@ -288,7 +292,7 @@ docgeneration="OFF"
         # ------------------
 
         gdcmVersion="___"
-        while [[ "$gdcmVersion" != "GDCM1"  && "$gdcmVersion " != "GDCM2" ]]
+        while [[ "$gdcmVersion" != "GDCM1"  && "$gdcmVersion" != "GDCM2" ]]
         do
            echo "Gdcm version : GDCM1/GDCM2 (default is GDCM1)"
            read gdcmVersion
@@ -298,6 +302,20 @@ docgeneration="OFF"
            fi
            echo "you said : [" $gdcmVersion "]"
         done
+
+# NOT YET CHECKED ! JPR
+        ITKVersion="___"
+        while [[ "$ITKVersion" != "ITK3"  && "$ITKVersion" != "ITK4" ]]
+        do
+           echo "ITK version : ITK3/ITK4 (default is ITK3)"
+           read ITKVersion
+           if [ "$ITKVersion" = "" ]
+           then
+              ITKVersion="ITK3"
+           fi
+           echo "you said : [" $ITKVersion "]"
+        done
+
         echo
         echo
         echo
@@ -318,6 +336,7 @@ docgeneration="OFF"
         echo "  Login Group Name                           : $loginGroupName"
         echo "  Build type                                 : $buildType"          
         echo "  Gdcm version                               : $gdcmVersion"
+        echo "  ITK version                                : $ITKVersion"
         echo
         echo
      
@@ -329,11 +348,7 @@ docgeneration="OFF"
        fi
    done
 
- # GROS SOUCIS : Ou generer le fichier CreaTools-configure.sh?
- # dans $generationdir/creatools_bin ?
- # -> il n'est pas encore cree !
- # dans ./Linux/scripts?
- # ==> On le genere chez l'utilisateur (no choice!)...
+ # ==> On genere le fichier CreaTools-configure.sh genere chez l'utilisateur (no choice!)...
  # 
 
    configureFile="scripts/CreaTools-configure.sh"
@@ -356,14 +371,17 @@ docgeneration="OFF"
    echo "loginGroupName=$loginGroupName"         >> $configureFile
    echo "buildType=$buildType"                   >> $configureFile
    echo "gdcmVersion=$gdcmVersion"               >> $configureFile
-   echo "ETC_BASHRC=$ETC_BASHRC"                 >> $configureFile   
-   
+   echo "ITKVersion=$ITKVersion"                 >> $configureFile
+   echo "ETC_BASHRC=$ETC_BASHRC"                 >> $configureFile
+
   # ------------------      
   # endif 'suitable'
   fi 
   ;;
   
-  1)
+  1)    
+     echo "===================================at begin 1) ======ETC_BASHRC : " $ETC_BASHRC
+     read a
      echo "========================== 1 "
      source scripts/Check-if-root.sh
      bash scripts/ThirdParty-install-Base-Stuff.sh     
@@ -371,7 +389,8 @@ docgeneration="OFF"
      bash scripts/ThirdParty-install-gdcm.sh
      bash scripts/ThirdParty-install-ITK.sh
      bash scripts/ThirdParty-install.sh
-     bash scripts/ThirdParty-install-Finalize.sh     
+     bash scripts/ThirdParty-install-Finalize.sh 
+     echo "===================================after ThirdParty-install-Finalize.sh ======ETC_BASHRC : " $ETC_BASHRC
 
      if [ "$sourcesFrom" = "CVS" ]
      then
@@ -419,12 +438,11 @@ docgeneration="OFF"
   1.3)
      echo "========================== 1.3 "
      #source scripts/Check-if-root.sh
-     bash scripts/ThirdParty-install-ITK.sh     
+     bash scripts/ThirdParty-install-ITK.sh
      bash scripts/ThirdParty-install-Finalize.sh         
      read a
   ;;
 
-
   2)
      #2.1
      bash scripts/CreaTools-load.sh
@@ -466,7 +484,7 @@ docgeneration="OFF"
         chgrp -R $loginGroupName $generationdir/creatools_source
     fi    
   ;;
-  
+
   2.3)
 
       echo "========================= 4"
@@ -482,7 +500,6 @@ docgeneration="OFF"
      source $ETC_BASHRC
   ;;
 
-
   5)
    if [ $expanded = "NO" ]
    then
@@ -491,7 +508,7 @@ docgeneration="OFF"
      expanded="NO"
    fi
   ;;
-   
+
   6)
      echo "========================= 5"
      bash scripts/CreaTools-uninstall.sh 
@@ -523,7 +540,7 @@ docgeneration="OFF"
         echo WARNING
         echo
         echo "the curently used Third Party libraries are NOT in $installPrefixThird but in :"
-        grep "installPrefixThird=" $ETC_BASHRC 
+        grep "installPrefixThird=" $ETC_BASHRC
         echo "VTK_DIR  : " $VTK_DIR
         echo "ITK_DIR  : " $ITK_DIR
         echo "GDCM_DIR : " $GDCM_DIR
@@ -534,9 +551,9 @@ docgeneration="OFF"
      if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
      then
         echo  "Third party config file : " $installPrefixThird/share/creatools_third_party_library_config.sh
-       echo  ------
-       more $installPrefixThird/share/creatools_third_party_library_config.sh
-       echo  ------
+           echo  ------
+           more $installPrefixThird/share/creatools_third_party_library_config.sh
+           echo  ------
      fi
      
      echo
@@ -544,17 +561,17 @@ docgeneration="OFF"
      if [ -f $installPrefix/share/creatools_base_library_config.sh ]
      then
         echo  "Creatools base library config file : " $installPrefix/share/creatools_base_library_config.sh
-       echo  ------ 
-       more $installPrefix/share/creatools_base_library_config.sh
-       echo  ------ 
-       echo
+           echo  ------ 
+           more $installPrefix/share/creatools_base_library_config.sh
+           echo  ------ 
+           echo
         echo "installPrefix ... " $installPrefix
-     fi 
+     fi
      echo  ------
         echo "VTK_DIR  :                 " $VTK_DIR
         echo "ITK_DIR  :                 " $ITK_DIR
         echo "GDCM_DIR :                 " $GDCM_DIR
-       echo
+        echo
         echo "crea_DIR :                 " $crea_DIR
         echo "BBTK_DIR :                 " $BBTK_DIR
         echo "creaMaracasVisu_DIR :      " $creaMaracasVisu_DIR

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 0904608f0bfe8270f598e518b6c9b23a7605e790..084e39db633e35faa4109d7ab5041c4a93ef47f3 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -35,6 +35,8 @@ fi
    echo $buildType
    echo --gdcmVersion--
    echo $gdcmVersion
+   echo "--ETC_BASHRC--"
+   echo $ETC_BASHRC  
    echo --sourcesFrom--
    echo $sourcesFrom
    echo --scriptDir--
@@ -107,22 +109,22 @@ then
 # CREA
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
-if [ true = true ]
-then
- bash $scriptDir/cmakemod.sh                  $creasource $generationdir $installPrefix $buildType 
- bash $scriptDir/creaVariables.sh             $creasource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh     $buildType $creasource $generationdir $corenumber
- bash $scriptDir/ctestmod.sh                  $creasource $generationdir
-fi
+   if [ true = true ]
+   then
+      bash $scriptDir/cmakemod.sh                  $creasource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaVariables.sh             $creasource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh     $buildType $creasource $generationdir $corenumber
+      bash $scriptDir/ctestmod.sh                  $creasource $generationdir
+   fi
 fi
- creadll=$generationdir/creatools_bin/creaBin
- if [ $OperatingSystem = "MacOS" ]
- then
-  #duplicate form creaTools_name.sh?? //FCY
+creadll=$generationdir/creatools_bin/creaBin
+if [ $OperatingSystem = "MacOS" ]
+then
+   #duplicate form creaTools_name.sh?? //FCY
     DYLD_LIBRARY_PATH=$creadll:$DYLD_LIBRARY_$PATH 
- else
+else
     LD_LIBRARY_PATH=$creadll:$LD_LIBRARY_$PATH
- fi
+fi
  export crea_DIR=$generationdir/creatools_bin/creaBin
 
 # -------------------------
@@ -130,23 +132,23 @@ fi
 #-------------------------
 if [ $start_point -le 3 ]
 then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-# BBTK
-echo ========================================================= $bbtksource $generationdir $installPrefix $buildType
- bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
- bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
- bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
- bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
-fi
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+   # BBTK
+     echo ========================================================= $bbtksource $generationdir $installPrefix $buildType
+     bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
+     bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
+     bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
+   fi
 fi
 
 bbtkdll=$generationdir/creatools_bin/bbtkBin
 if [ $OperatingSystem = "MacOS" ]
 then
-#duplicate form creaTools_name.sh?? //FCY
+    #duplicate form creaTools_name.sh?? //FCY
     DYLD_LIBRARY_PATH=$bbtkdll:$DYLD_LIBRARY_PATH
 else
     LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
@@ -158,22 +160,22 @@ export BBTK_DIR=$generationdir/creatools_bin/bbtkBin
 #-------------------------
 if [ $start_point -le 4 ]
 then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-# creaMaracasVisu
- bash $scriptDir/cmakemod.sh              $creamaracassource $generationdir $installPrefix $buildType 
- bash $scriptDir/creaMaracasVariables.sh  $creamaracassource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh $buildType $creamaracassource $generationdir $corenumber
- bash $scriptDir/ctestmod.sh              $creamaracassource $generationdir
-fi
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+      # creaMaracasVisu
+      bash $scriptDir/cmakemod.sh              $creamaracassource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaMaracasVariables.sh  $creamaracassource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh $buildType $creamaracassource $generationdir $corenumber
+      bash $scriptDir/ctestmod.sh              $creamaracassource $generationdir
+   fi
 fi
  creamaracasdll=$generationdir/creatools_bin/creaMaracasVisuBin
 
 if [ $OperatingSystem = "MacOS" ]
 then
-#duplicate form creaTools_name.sh?? //FCY
+    #duplicate form creaTools_name.sh?? //FCY
     DYLD_LIBRARY_PATH=$creamaracasdll:$DYLD_LIBRARY_$PATH 
 else
     LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_$PATH
@@ -186,22 +188,22 @@ fi
 #-------------------------
 if [ $start_point -le 5 ]
 then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-# creaEnvironment
- bash $scriptDir/cmakemod.sh                 $creaenvironmentsource $generationdir $installPrefix $buildType 
- bash $scriptDir/creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh    $buildType $creaenvironmentsource $generationdir $corenumber 
- bash $scriptDir/ctestmod.sh                 $creaenvironmentsource $generationdir
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+   # creaEnvironment
+      bash $scriptDir/cmakemod.sh                 $creaenvironmentsource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh    $buildType $creaenvironmentsource $generationdir $corenumber 
+      bash $scriptDir/ctestmod.sh                 $creaenvironmentsource $generationdir
+   fi
 fi
-fi
- creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin
+creaenvironmentdll=$generationdir/creatools_bin/creaenvironmentBin
  
 if [ $OperatingSystem = "MacOS" ]
 then
-#duplicate form creaTools_name.sh?? //FCY
+    #duplicate form creaTools_name.sh?? //FCY
     DYLD_LIBRARY_PATH=$creaenvironmentdll:$DYLD_LIBRARY_$PATH 
 else
     LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_$PATH
@@ -214,22 +216,22 @@ fi
 #-------------------------
 if [ $start_point -le 6 ]
 then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-# creaBruker
- bash $scriptDir/cmakemod.sh              $creabrukersource $generationdir $installPrefix $buildType 
- bash $scriptDir/creaBrukerVariables.sh   $creabrukersource $generationdir $docgeneration $gdcmVersion
- bash $scriptDir/compilemod.sh $buildType $creabrukersource $generationdir $corenumber
- bash $scriptDir/ctestmod.sh              $creabrukersource $generationdir
-fi
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+   # creaBruker
+      bash $scriptDir/cmakemod.sh              $creabrukersource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaBrukerVariables.sh   $creabrukersource $generationdir $docgeneration $gdcmVersion
+      bash $scriptDir/compilemod.sh $buildType $creabrukersource $generationdir $corenumber
+      bash $scriptDir/ctestmod.sh              $creabrukersource $generationdir
+   fi
 fi
- creabrukerdll=$generationdir/creatools_bin/creabrukerBin
+creabrukerdll=$generationdir/creatools_bin/creabrukerBin
  
 if [ $OperatingSystem = "MacOS" ]
 then
-#duplicate form creaTools_name.sh?? //FCY
+    #duplicate form creaTools_name.sh?? //FCY
     DYLD_LIBRARY_PATH=$creabrukerdll:$DYLD_LIBRARY_$PATH 
 else
     LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_$PATH
@@ -242,18 +244,18 @@ fi
 #-------------------------
 if [ $start_point -le 7 ]
 then
- # the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-# creaImageIO
- bash $scriptDir/cmakemod.sh              $creaimagesource $generationdir $installPrefix $buildType 
- bash $scriptDir/creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration $gdcmVersion
- bash $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir $corenumber
- bash $scriptDir/ctestmod.sh              $creaimagesource $generationdir
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+   # creaImageIO
+      bash $scriptDir/cmakemod.sh              $creaimagesource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration $gdcmVersion
+      bash $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir $corenumber
+      bash $scriptDir/ctestmod.sh              $creaimagesource $generationdir
+   fi
 fi
-fi
- creaimagedll=$generationdir/creatools_bin/creaimageBin
+creaimagedll=$generationdir/creatools_bin/creaimageBin
  
 if [ $OperatingSystem = "MacOS" ]
 then
@@ -270,22 +272,22 @@ export creaImageIO_DIR=$generationdir/creatools_bin/creaImageIOBin
 #-------------------------
 if [ $start_point -le 8 ]
 then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-# creaContours
- bash $scriptDir/cmakemod.sh              $creacontourssource $generationdir $installPrefix $buildType 
- bash $scriptDir/creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir $corenumber
- bash $scriptDir/ctestmod.sh              $creacontourssource $generationdir
-fi
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+      # creaContours
+      bash $scriptDir/cmakemod.sh              $creacontourssource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir $corenumber
+      bash $scriptDir/ctestmod.sh              $creacontourssource $generationdir
+   fi
 fi
  creacontourdll=$generationdir/creatools_bin/creacontoursBin
  
 if [ $OperatingSystem = "MacOS" ]
 then
-#duplicate form creaTools_name.sh?? //FCY
+    #duplicate form creaTools_name.sh?? //FCY
     DYLD_LIBRARY_PATH=$creacontoursdll:$DYLD_LIBRARY_$PATH 
 else
     LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_$PATH
@@ -298,15 +300,15 @@ fi
 #-------------------------
 if [ $start_point -le 9 ]
 then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
- bash $scriptDir/cmakemod.sh                         $crearigidregistrationssource $generationdir $installPrefix $buildType 
- bash $scriptDir/creaRigidRegistrationVariables.sh   $crearigidregistrationssource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh            $buildType $crearigidregistrationssource $generationdir $corenumber
- bash $scriptDir/ctestmod.sh                         $crearigidregistrationssource $generationdir
-fi
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+      bash $scriptDir/cmakemod.sh                         $crearigidregistrationssource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaRigidRegistrationVariables.sh   $crearigidregistrationssource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh            $buildType $crearigidregistrationssource $generationdir $corenumber
+      bash $scriptDir/ctestmod.sh                         $crearigidregistrationssource $generationdir
+   fi
 fi
 # crearigidregistrationdll=$generationdir/creatools_bin/crearigidregistrationBin
 # LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH
@@ -317,37 +319,35 @@ fi
 #-------------------------
 if [ $start_point -le 10 ]
 then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-# bbtkGEditor
- bash $scriptDir/cmakemod.sh              $bbtkgeditorsource $generationdir $installPrefix $buildType 
- bash $scriptDir/bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh $buildType $bbtkgeditorsource $generationdir $corenumber
- bash $scriptDir/ctestmod.sh              $bbtkgeditorsource $generationdir
-fi
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+      # bbtkGEditor
+      bash $scriptDir/cmakemod.sh              $bbtkgeditorsource $generationdir $installPrefix $buildType 
+      bash $scriptDir/bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh $buildType $bbtkgeditorsource $generationdir $corenumber
+      bash $scriptDir/ctestmod.sh              $bbtkgeditorsource $generationdir
+   fi
 fi
 # bbtkgeditordll=$generationdir/creatools_bin/bbtkgeditorBin
 # LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH
 
 
-
-
 # -------------------------
 #        start_point =  11 : libido
 #-------------------------
 #if [ $start_point -le 11 ]
 #then
-## the following stupid test is used at debug time; Please don't remove!
-##if [ true = false ]
-#if [ true = true ]
-#then
-## creaTools
-# bash $scriptDir/cmakemod.sh                $libidosource $generationdir $installPrefix $buildType 
-# bash $scriptDir/libidoVariables.sh         $libidosource $generationdir $docgeneration
-# bash $scriptDir/compilemod.sh   $buildType $libidosource $generationdir $corenumber
-#fi
+   ## the following stupid test is used at debug time; Please don't remove!
+   ##if [ true = false ]
+   #if [ true = true ]
+   #then
+      ## creaTools
+      # bash $scriptDir/cmakemod.sh                $libidosource $generationdir $installPrefix $buildType 
+      # bash $scriptDir/libidoVariables.sh         $libidosource $generationdir $docgeneration
+      # bash $scriptDir/compilemod.sh   $buildType $libidosource $generationdir $corenumber
+   #fi
 #fi
 
 
@@ -357,15 +357,15 @@ fi
 #-------------------------
 if [ $start_point -le 12 ]
 then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-# creaTools
- bash $scriptDir/cmakemod.sh                $creatoolssource $generationdir $installPrefix $buildType 
- bash $scriptDir/creaToolsVariables.sh      $creatoolssource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh   $buildType $creatoolssource $generationdir $corenumber
-fi
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+      # creaTools
+      bash $scriptDir/cmakemod.sh                $creatoolssource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaToolsVariables.sh      $creatoolssource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh   $buildType $creatoolssource $generationdir $corenumber
+   fi
 fi
 
 
@@ -379,15 +379,15 @@ fi
 #-------------------------
 if [ $start_point -le 13 ]
 then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-# creaMiniTools
- bash $scriptDir/cmakemod.sh                   $creaminitoolssource $generationdir $installPrefix $buildType 
- bash $scriptDir/creaMiniToolsVariables.sh     $creaminitoolssource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh      $buildType $creaminitoolssource $generationdir $corenumber
-fi
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+      # creaMiniTools
+      bash $scriptDir/cmakemod.sh                   $creaminitoolssource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaMiniToolsVariables.sh     $creaminitoolssource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh      $buildType $creaminitoolssource $generationdir $corenumber
+   fi
 fi
 
 

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index 7f6f4a80940b5117dd11b1f52a9efa60e9b74d58..6aa4b0a9f6dcedcf18861ecfe4875b17f90a4f89 100644 (file)
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -56,7 +56,7 @@ fi
 #                 export ETC_BASHRC="/etc/bashrc"
 #             fi
 
-export ETC_BASHRC=$HOME/.bashrc
+# export ETC_BASHRC=$HOME/.bashrc
              
   # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh' if any
   sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC
@@ -94,7 +94,7 @@ export ETC_BASHRC=$HOME/.bashrc
   bash installmodNomake.sh $buildType wx                 $generationdir  $installPrefix
   bash installmodNomake.sh $buildType wxvtk              $generationdir  $installPrefix
 
-  
+echo "===================================================in CreaTools-install.sh ETC_BASHRC : "  $ETC_BASHRC 
 echo installPrefixtmp=$installPrefix >> $ETC_BASHRC
 echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] &&  source $installPrefixtmp/share/creatools_base_library_config.sh' >> $ETC_BASHRC 
 

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 9d53565c94392100d420884a99c76c2e21bcd39f..1f53ddeb0a494a4ed1eef7131795f4af7f066cbd 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -18,7 +18,9 @@
    echo --buildType--
    echo $buildType
    echo --gdcmVersion--
-   echo $gdcmVersion
+   echo $gdcmVersion 
+   echo "--ETC_BASHRC--"
+   echo $ETC_BASHRC  
    echo --sourcesFrom--
    echo $sourcesFrom
    echo --scriptDir--

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 06f77fc195c33487cc9c5e4f82b70b5a824cdc6b..b1e24bafc7b4039238897fe4865380e6f9625ac4 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -15,6 +15,7 @@
 fi
 
 source $PWD/scripts/CreaTools-configure.sh
+echo "=================================== in ThirdParty-install-Finalize.sh ETC_BASHRC : " $ETC_BASHRC
 
 # /// \TODO move theese ones upper in the process!  JPR
 
@@ -45,36 +46,38 @@ echo export TTH=$installPrefixThird/bin/tth                >> $installPrefixThir
 
 if [ $OperatingSystem = "MacOS" ]
 then
-echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 else
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 fi
 
-  case "$OperatingSystem" in
-  Fedora)
-     export ETC_BASHRC=$HOME/.bashrc
-     ;;
-  Ubuntu)
-     export ETC_BASHRC=$HOME/.bashrc
-     ;;
-  MacOS)
-     export ETC_BASHRC=$HOME/.profile
-     ;;
-  esac
+#                                 done in scripts/CreaTools-configure.sh // JPR
+#  case "$OperatingSystem" in
+#  Fedora)
+#     export ETC_BASHRC=$HOME/.bashrc
+#     ;;
+#  Ubuntu)
+#     export ETC_BASHRC=$HOME/.bashrc
+#     ;;
+#  MacOS)
+#     export ETC_BASHRC=$HOME/.profile
+#     ;;
+#  esac
 
    sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
    sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC
 
 
 # - add line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
+
+echo "====================================================ETC_BASHRC "  $ETC_BASHRC 
 echo installPrefixThird=$installPrefixThird >> $ETC_BASHRC
 echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh' >> $ETC_BASHRC 
 
-echo "====================================================ETC_BASHRC "  $ETC_BASHRC 
 
 chown -R $loginUserName  $generationdir
 chgrp -R $loginGroupName $generationdir

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 3b71a4707e2717b665ad8059ed7926ee6dbbc9ae..1db579a4e854aa3a577158071a53ee929aa28f2d 100644 (file)
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -32,6 +32,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo $buildType
    echo --gdcmVersion--
    echo $gdcmVersion
+   echo "--ETC_BASHRC--"
+   echo $ETC_BASHRC  
 #   echo --sourcesFrom--
 #   echo $sourcesFrom
 #   echo --scriptDir--
@@ -50,8 +52,8 @@ then
    mkdir $generationdir
    chown $loginUserName  $generationdir
    chgrp $loginGroupName $generationdir
-
 fi
+
 if [ ! -e $sourcesDir ]
 then
    mkdir $sourcesDir
@@ -101,8 +103,8 @@ then
     wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
   
     # tar -xvzf VTK-5.6.1.patchCreatis.tar.gz
-     #tar -xvzf gdcm_05_Mai_2011.tar.gz
-     #tar -xvzf InsightToolkit-3.20.0.tar.gz
+    #tar -xvzf gdcm_05_Mai_2011.tar.gz
+    #tar -xvzf InsightToolkit-3.20.0.tar.gz
   fi
 
 fi

diff --git a/Linux/scripts/ThirdParty-install_no_compile.sh b/Linux/scripts/ThirdParty-install_no_compile.sh
index b06b71a2943de3540b53cf6b0dce08413897c0e2..56c6c1e8ec5cdf6d9bdfffc5671e0198ae70f9ea 100644 (file)
--- a/Linux/scripts/ThirdParty-install_no_compile.sh
+++ b/Linux/scripts/ThirdParty-install_no_compile.sh
@@ -30,6 +30,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo $buildType
    echo --gdcmVersion--
    echo $gdcmVersion
+   echo "--ETC_BASHRC--"
+   echo $ETC_BASHRC  
 #   echo --sourcesFrom--
 #   echo $sourcesFrom
 #   echo --scriptDir--
@@ -61,21 +63,22 @@ echo export GDCM_DIR=$installPrefixThird/lib/gdcm          >> $installPrefixThir
 echo export TTH=$installPrefixThird/bin/tth                >> $installPrefixThird/share/creatools_third_party_library_config.sh
 if [ $OperatingSystem = "MacOS" ]
 then
-echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 else
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 fi
 
-if [ $OperatingSystem = "MacOS" ]
-then
-export ETC_BASHRC=$HOME/.profile
-else
-export ETC_BASHRC=$HOME/.bashrc
-fi
+#   done in CreaTools-configure.sh JPR
+#if [ $OperatingSystem = "MacOS" ]
+#then
+#   export ETC_BASHRC=$HOME/.profile
+#else
+#   export ETC_BASHRC=$HOME/.bashrc
+#fi
 
    sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
    sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC