#3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 7797dce4d2902446c791d4942b42df4c5d028352..cf35dd35316aa5e97d455cc19f6984998ebdc943 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -164,8 +164,19 @@ 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 $corenumber
-     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbtk
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbi
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbfy
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbStudio
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbPackageBrowser
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbs2cpp
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbRegenerateBoxesLists
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbRegeneratePackageDoc
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbPlugPackage
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbpConfigurator
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbvtk
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbwx
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber 
      bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
    fi
 fi

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index c75afa726d94204169b3977213b82c5d7ea7efed..33af6db1173f3f9d50d3e7d0fadeeca9d2122eeb 100644 (file)
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -65,18 +65,18 @@
   #  modify /etc/bashrc (we cannot modify .bashrc, since we switched as root)  
   # - add line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh'
 
-  bash installmod.sh $buildType $creasource                   $generationdir  $installPrefix
-  bash installmod.sh $buildType $bbtksource                   $generationdir  $installPrefix
-  bash installmod.sh $buildType $creavtksource                $generationdir  $installPrefix
-  bash installmod.sh $buildType $creamaracassource            $generationdir  $installPrefix
-  bash installmod.sh $buildType $creaenvironmentsource        $generationdir  $installPrefix
-  bash installmod.sh $buildType $creabrukersource             $generationdir  $installPrefix
-  bash installmod.sh $buildType $creaimagesource              $generationdir  $installPrefix
-  bash installmod.sh $buildType $creacontourssource           $generationdir  $installPrefix
-  bash installmod.sh $buildType $crearigidregistrationssource $generationdir  $installPrefix
-  bash installmod.sh $buildType $bbtkgeditorsource            $generationdir  $installPrefix
-  bash installmod.sh $buildType $creatoolssource              $generationdir  $installPrefix
-  bash installmod.sh $buildType $creaminitoolssource          $generationdir  $installPrefix
+  bash installmod.sh $buildType $creasource                   $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $bbtksource                   $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creavtksource                $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creamaracassource            $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creaenvironmentsource        $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creabrukersource             $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creaimagesource              $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creacontourssource           $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $crearigidregistrationssource $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $bbtkgeditorsource            $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creatoolssource              $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creaminitoolssource          $generationdir  $installPrefix  $corenumber
   # bash installmod.sh $buildType $libidosource                 $generationdir  $installPrefix 
 
   #export as well bbPackages_DIR // JPR 25 Mai 2011

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 90a9d4c657497a8554a0a2ae003a78ff91a4bc55..863e964fa377d4bff73e379f2e597acd35b4d646 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -124,25 +124,25 @@ then
  #      mv $libidosource-ESRF $libidosource             
           
          cd $generationdir/creatools_source/$creasource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
          cd $generationdir/creatools_source/$bbtksource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
          cd $generationdir/creatools_source/$creavtksource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
          cd $generationdir/creatools_source/$creamaracassource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
          cd $generationdir/creatools_source/$creaimagesource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
          cd $generationdir/creatools_source/$creacontourssource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
          cd $generationdir/creatools_source/$crearigidregistrationssource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
          cd $generationdir/creatools_source/$bbtkgeditorsource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
          cd $generationdir/creatools_source/$creatoolssource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
                 cd $generationdir/creatools_source/$creabrukersource
-                git checkout vtk7itk4wx3
+                git checkout vtk8itk4wx3-mingw64
       fi
 
       if [ $sourcesFrom = HTML ]

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 5dca330a39b87b6830e8a901ed1cf60d523746c5..9adf1ab286f7c7e63930c0fcf93a1a56813254bf 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -44,9 +44,9 @@ echo "=================================== in ThirdParty-install-Finalize.sh ETC_
 # /// \TODO move theese ones upper in the process!  JPR
 
 export GDCM_DIR=$installPrefixThird/lib/gdcm/
-export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
+export VTK_DIR=$installPrefixThird/lib/cmake/vtk-8.1/
 export ITK_DIR=$installPrefixThird/lib
-export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+export WT_DIR=$installPrefixThird/lib/wt-4.0.4-rc1/
 
 baseLibraryThirdPartyDir=$installPrefixThird/share/creatools
 
@@ -72,7 +72,7 @@ echo export PATH='$'PATH:'$'installPrefixThird/bin                            >> $baseLibraryThirdP
 echo export VTK_DIR='$'installPrefixThird/lib                          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export ITK_DIR='$'installPrefixThird/lib                                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export GDCM_DIR='$'installPrefixThird/lib/gdcm            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export WT_DIR='$'installPrefixThird/lib/wt-3.3.4                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export WT_DIR='$'installPrefixThird/lib/wt-4.0.4-rc1              >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export TTH='$'installPrefixThird/bin/tth                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 
 if [ $OperatingSystem = "MacOS" ]

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 5183c5f15bafd5691dd13ef1bf156e4c23f9a151..4d20397438618de09e37555a9e362c9261989cab 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -123,7 +123,6 @@ fi
 
     wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2018_05_28_vtk8.zip
        unzip gdcm13_2018_05_28_vtk8.zip
-
  fi
 
 if [ $buildType = "Debug" ]
@@ -137,7 +136,7 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=gdcm
+  libname=gdcm13_2018_05_28_vtk8
   dirInstall=$binDir/$libname-Bin
   export GDCM_DIR=$installPrefixThird/lib/gdcm/
   mkdir -p $dirInstall

diff --git a/Linux/scripts/compilemod.sh b/Linux/scripts/compilemod.sh
index 8fe9df0874ccdda0fd179d9d69403a3f8caf79c6..a88a65e72056122b99fd6dce47279944527106b7 100644 (file)
--- a/Linux/scripts/compilemod.sh
+++ b/Linux/scripts/compilemod.sh
@@ -33,7 +33,8 @@ echo $2
 echo $3
 echo $4
 
-make -j $4
+#let halfProcessors=$( $4/2 )
+make -j $4 $5
 
 # We don't install immediately!
 

diff --git a/Linux/scripts/installmod.sh b/Linux/scripts/installmod.sh
index c3d4b2283d2306f8beee5fbcde13f830bb404a87..a1db560884b6cc26ecaa7491663db8396c6d22c2 100644 (file)
--- a/Linux/scripts/installmod.sh
+++ b/Linux/scripts/installmod.sh
@@ -41,6 +41,7 @@ installPrefix=$4
 # We install, now
 
 pwd
+make -j $5 install
 make install
 
 if [ -e $installPrefix/lib64 ]