X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fmenu.sh;h=3be1b00a10aba6ac78eaef9493114df253ca1a27;hb=8c418a79f4b2b36f681a8acc9ec28ac601ea8d3b;hp=a8a50ac8bc113c57f293239bf06dd6a5da413452;hpb=083fdb596f33e421db569ccc2661f68433d3b772;p=creaToolsTools.git

diff --git a/Linux/menu.sh b/Linux/menu.sh
index a8a50ac..3be1b00 100644
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -140,13 +140,25 @@ do
         echo "you said : [" $OperatingSystem "]"
         echo
         echo
+	
+        # ------------------
+        echo "How many cores on your computer 2 (default is 2)"
+        read corenumber
+        if [ "$corenumber" = "" ]
+        then
+           corenumber="2"
+        fi
+        echo "you said : [" $corenumber "]"
+
+        echo
+        echo	
 
         # ------------------
-        echo "Name of the Generation Directory (default is /tmp/myGenerationDir)"
+        echo "Name of the Generation Directory (default is ~/creaToolsGenerationDir)"
         read generationdir
         if [ "$generationdir" = "" ]
         then
-           generationdir="/tmp/myGenerationDir"
+           generationdir="~/creaToolsGenerationDir"
         fi
         echo "you said : [" $generationdir "]"
 
@@ -177,6 +189,8 @@ do
         echo 
         # ------------------
 
+if [ false ]
+then
         docgeneration="___"
         while [[ "$docgeneration" != "ON"  && "$docgeneration" != "OFF" ]]
         do
@@ -190,12 +204,15 @@ do
         done
         echo
         echo
+fi
+docgeneration="OFF"
+
         # ------------------
 
         sourcesFrom="___"
         while [[ "$sourcesFrom" != "CVS"  && "$sourcesFrom" != "HTML" ]]
         do
-           echo "Where do you want to get source files from : CVS/HTML (default is CVS)"
+           echo "Where do you want to get source files from : CVS/HTML ( CVS : for registered CREATIS users only! )"
            read sourcesFrom
            if [ "$sourcesFrom" = "" ]
            then
@@ -212,7 +229,7 @@ do
         then
            while [ "$cvsUserName" == "" ]
            do
-              echo "CVS User Name (mandatory!)"
+              echo "CVS User Name ( registered CREATIS user : mandatory!)"
               read cvsUserName
            done
            echo "you said : [" $cvsUserName "]"
@@ -281,6 +298,7 @@ do
         echo
         echo "You said :"
         echo "  Operating System                           : $OperatingSystem"
+        echo "  Number of Cores                            : $corenumber"	
         echo "  Name of the Generation Directory           : $generationdir"
         echo "  Install Prefix for Third Party Libraries   : $installPrefixThird"	
         echo "  Install Prefix for CreaTools               : $installPrefix"
@@ -318,9 +336,10 @@ do
    echo                                          >> $configureFile
    echo "#File generated by 'menu.sh'"           >> $configureFile
    echo "#DO NOT edit !"                         >> $configureFile
-   echo "#(except if you *know* what you do)"    >> $configureFile
+   echo "#(except if you *do* know what you do)" >> $configureFile
    echo                                          >> $configureFile
    echo "OperatingSystem=$OperatingSystem"       >> $configureFile
+   echo "corenumber=$corenumber"                 >> $configureFile   
    echo "generationdir=$generationdir"           >> $configureFile
    echo "installPrefix=$installPrefix"           >> $configureFile
    echo "installPrefixThird=$installPrefixThird" >> $configureFile
@@ -500,7 +519,7 @@ do
 	     
      if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
      then
-        echo  $installPrefixThird/share/creatools_third_party_library_config.sh
+        echo  "Third party config file : " $installPrefixThird/share/creatools_third_party_library_config.sh
 	echo  ------
 	more $installPrefixThird/share/creatools_third_party_library_config.sh
 	echo  ------
@@ -510,7 +529,7 @@ do
      
      if [ -f $installPrefix/share/creatools_base_library_config.sh ]
      then
-        echo  $installPrefix/share/creatools_base_library_config.sh
+        echo  "Creatools base library config file : " $installPrefix/share/creatools_base_library_config.sh
 	echo  ------ 
 	more $installPrefix/share/creatools_base_library_config.sh
 	echo  ------ 
@@ -518,9 +537,10 @@ do
         echo "installPrefix ... " $installPrefix
      fi 
      echo  ------
-        echo "VTK_DIR  : " $VTK_DIR
-        echo "ITK_DIR  : " $ITK_DIR
-        echo "GDCM_DIR : " $GDCM_DIR
+        echo "VTK_DIR  :                 " $VTK_DIR
+        echo "ITK_DIR  :                 " $ITK_DIR
+        echo "GDCM_DIR :                 " $GDCM_DIR
+	echo
         echo "crea_DIR :                 " $crea_DIR
         echo "BBTK_DIR :                 " $BBTK_DIR
         echo "creaMaracasVisu_DIR :      " $creaMaracasVisu_DIR
@@ -531,7 +551,7 @@ do
         echo "creaRigidRegistration_DIR :" $creaRigidRegistration_DIR
         echo "bbtkGEditor_DIR :          " $bbtkGEditor_DIR
         echo "creaTools_DIR :            " $creaTools_DIR
-			            
+        echo "creaMiniTools_DIR :        " $creaMiniTools_DIR			            
         echo "==================================="
         echo
         echo "Press any key to continue"
@@ -544,6 +564,7 @@ do
     ;;
 
   10)
+  # Hiden option, usefull at debug time
     bash scripts/ThirdParty-install_no_compile.sh  
     ;;