From: Eduardo DAVILA Date: Mon, 27 Aug 2018 10:53:08 +0000 (+0200) Subject: #3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=791d6701a9ccbf2455b25e499b876b2a4f1323a8;p=creaToolsTools.git #3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64 --- diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh index 7797dce..cf35dd3 100644 --- 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 c75afa7..33af6db 100644 --- 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 90a9d4c..863e964 100644 --- 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 5dca330..9adf1ab 100644 --- 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 5183c5f..4d20397 100644 --- 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 8fe9df0..a88a65e 100644 --- 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 c3d4b22..a1db560 100644 --- 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 ]