Allow user to specify number of cores

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 74acab218461ddddaeff29ce0f982009f815f182..4326d714ea40a4fed7ccc7d70216047ed05204bb 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -140,6 +140,18 @@ do
         echo "you said : [" $OperatingSystem "]"
         echo
         echo
+       
+        # ------------------
+        echo "How many cores on your computer 2 (default is 2)"
+        read corenumber
+        if [ "$corenumber" = "" ]
+        then
+           generationdir="2"
+        fi
+        echo "you said : [" $corenumber "]"
+
+        echo
+        echo   
 
         # ------------------
         echo "Name of the Generation Directory (default is /tmp/myGenerationDir)"
@@ -195,7 +207,7 @@ do
         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 +224,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 +293,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"
@@ -321,6 +334,7 @@ do
    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

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 6df11a8d098f1faf6c3a5d1b185fab82eec6c097..98bb731e0e19b0c42172a5674c1b9002b999fcd9 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -23,6 +23,8 @@ fi
    echo $PWD/scripts/CreaTools-configure.sh
    echo --generationdir--
    echo $generationdir
+   echo --corenumber--
+   echo $corenumber   
    echo --docgeneration--
    echo $docgeneration
    echo --installPrefix--
@@ -109,7 +111,7 @@ 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
+ bash $scriptDir/compilemod.sh     $buildType $creasource $generationdir $corenumber
  bash $scriptDir/ctestmod.sh                  $creasource $generationdir
 fi
 fi
@@ -130,7 +132,7 @@ then
 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
+ bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
  bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
 fi
 fi
@@ -150,7 +152,7 @@ then
 # creaMaracasVisu
  bash $scriptDir/cmakemod.sh              $creamaracassource $generationdir $installPrefix $buildType 
  bash $scriptDir/creaMaracasVariables.sh  $creamaracassource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh $buildType $creamaracassource $generationdir
+ bash $scriptDir/compilemod.sh $buildType $creamaracassource $generationdir $corenumber
  bash $scriptDir/ctestmod.sh              $creamaracassource $generationdir
 fi
 fi
@@ -170,7 +172,7 @@ then
 # creaEnvironment
  bash $scriptDir/cmakemod.sh                 $creaenvironmentsource $generationdir $installPrefix $buildType 
  bash $scriptDir/creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh $buildType    $creaenvironmentsource $generationdir
+ bash $scriptDir/compilemod.sh    $buildType $creaenvironmentsource $generationdir $corenumber 
  bash $scriptDir/ctestmod.sh                 $creaenvironmentsource $generationdir
 fi
 fi
@@ -190,7 +192,7 @@ 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
+ bash $scriptDir/compilemod.sh $buildType $creabrukersource $generationdir $corenumber
  bash $scriptDir/ctestmod.sh              $creabrukersource $generationdir
 fi
 fi
@@ -210,7 +212,7 @@ 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
+ bash $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir $corenumber
  bash $scriptDir/ctestmod.sh              $creaimagesource $generationdir
 fi
 fi
@@ -230,7 +232,7 @@ then
 # creaContours
  bash $scriptDir/cmakemod.sh              $creacontourssource $generationdir $installPrefix $buildType 
  bash $scriptDir/creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir
+ bash $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir $corenumber
  bash $scriptDir/ctestmod.sh              $creacontourssource $generationdir
 fi
 fi
@@ -249,7 +251,7 @@ 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
+ bash $scriptDir/compilemod.sh            $buildType $crearigidregistrationssource $generationdir $corenumber
  bash $scriptDir/ctestmod.sh                         $crearigidregistrationssource $generationdir
 fi
 fi
@@ -269,7 +271,7 @@ then
 # bbtkGEditor
  bash $scriptDir/cmakemod.sh              $bbtkgeditorsource $generationdir $installPrefix $buildType 
  bash $scriptDir/bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh $buildType $bbtkgeditorsource $generationdir
+ bash $scriptDir/compilemod.sh $buildType $bbtkgeditorsource $generationdir $corenumber
  bash $scriptDir/ctestmod.sh              $bbtkgeditorsource $generationdir
 fi
 fi
@@ -289,7 +291,7 @@ then
 # creaTools
  bash $scriptDir/cmakemod.sh                $creatoolssource $generationdir $installPrefix $buildType 
  bash $scriptDir/creaToolsVariables.sh      $creatoolssource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh   $buildType $creatoolssource $generationdir
+ bash $scriptDir/compilemod.sh   $buildType $creatoolssource $generationdir $corenumber
 fi
 fi
 
@@ -309,9 +311,9 @@ then
 if [ true = true ]
 then
 # creaMiniTools
- bash $scriptDir/cmakemod.sh                   $creaminitoolssource $generationdir $installPrefix $buildType 
+ bash $scriptDir/cmakemod.sh                   $creaminitoolssource $generationdir $installPrefix $buildType 
  bash $scriptDir/creaMiniToolsVariables.sh     $creaminitoolssource $generationdir $docgeneration
- bash $scriptDir/compilemod.sh                 $buildType $creaminitoolssource $generationdir
+ bash $scriptDir/compilemod.sh      $buildType $creaminitoolssource $generationdir $corenumber
 fi
 fi
 

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index cd5bc068b823cbaedb3304ba9b0bbe60c86ef831..6406c47af1030a4bab45c642d0b818ab1e79b1b2 100644 (file)
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -19,6 +19,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo $PWD/scripts/CreaTools-configure.sh
    echo --generationdir--
    echo $generationdir
+   echo --corenumber--
+   echo $corenumber   
    echo --docgeneration--
    echo $docgeneration
    echo --installPrefix--
@@ -171,7 +173,7 @@ then
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
-  make -j 2
+  make -j $corenumber
   make install
   cd ..
 fi

diff --git a/Linux/scripts/compilemod.sh b/Linux/scripts/compilemod.sh
index 79131209c9f17ae5f8f380d479e3fd4fcaa96285..e970944583d0bf6fea6ad280b48ec0aeb5658c49 100644 (file)
--- a/Linux/scripts/compilemod.sh
+++ b/Linux/scripts/compilemod.sh
@@ -7,8 +7,9 @@ echo "--------------------------------------in compilemod-- $2 ------------"
 echo $1
 echo $2
 echo $3
+echo $4
 
-make -j 2
+make -j $4
 
 # We don't install immediately!