Merge branch 'vtk8itk5wx3-mingw64' of ssh://git.creatis.insa-lyon.fr/creaToolsTools...

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index a672776e53dfff9d4227631bb5041b52f5791fae..1c7be804f703f772d728f50717fad7dee363428f 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -47,7 +47,8 @@
        ln -s $installPrefixThird thirdparty_install
 
        source creatools_install/share/creatools/Version.sh 
-       distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/
+#      distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/
+       distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.x.x/
 
        fileTGZ=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-`getDistrib`-`getDistribVersion`.tgz
        fileTGZstring=CreaTools-Bin-Release-\$creatoolsMajorVersion.\$creatoolsMinorVersion.\$creatoolsBuildVersion-\`getDistrib\`-\`getDistribVersion\`
@@ -66,7 +67,7 @@
          cat creatools_install/share/creatools/Version.sh >> $filename_BinVersion
          cat $scriptDir/LocalFunctions.sh >> $filename_BinVersion
 
-         echo "\`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.\$creatoolsMinorVersion.x/$fileTGZstring.tgz" >> $filename_BinVersion 
+         echo "\`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZstring.tgz" >> $filename_BinVersion 
          echo "tar -xvzf $fileTGZstring.tgz" >>  $filename_BinVersion
          echo "rm -f $fileTGZstring.tgz" >>  $filename_BinVersion
         
@@ -107,9 +108,9 @@
      cd $scriptsDir
      scp $scriptDir/Install-Creatools-Bin.sh $distanceAdress/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh
          
-         ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Bin-Release.sh;  ln -s v3.0.x/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh  Install-Creatools-Bin-Release.sh"
+         ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Bin-Release.sh;  ln -s v4.x.x/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh  Install-Creatools-Bin-Release.sh"
 
-         ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm creatools-Linux-Bin.sh;  ln -s v3.0.x/$filename_BinVersion  creatools-Linux-Bin.sh"
+         ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm creatools-Linux-Bin.sh;  ln -s v4.x.x/$filename_BinVersion  creatools-Linux-Bin.sh"
 
 
      echo ""

diff --git a/Linux/scripts/Install-Creatools-Bin.sh b/Linux/scripts/Install-Creatools-Bin.sh
index 3d569fdb2ef60277ff5550537526da22d05b9610..968e26e5dd4cfbe542cc1079dc5393c74512776b 100755 (executable)
--- a/Linux/scripts/Install-Creatools-Bin.sh
+++ b/Linux/scripts/Install-Creatools-Bin.sh
@@ -48,10 +48,13 @@ OperatingSystem=`getDistrib`
          downloadCommand=aria2c 
      ;;
   Fedora)
-     echo Root password:
-     su -c "yum install aria2 -y"
-         downloadCommand=aria2c
-     ;;
+       ARIA2EXIST=$(rpm -qa | grep aria2 | wc -l)      
+       if [ "$ARIA2EXIST" -eq '1' ]; then 
+       echo Root password:
+       su -c "dnf install aria2 -y"
+       fi
+       downloadCommand=aria2c
+    ;;
   Ubuntu)
      echo Root password:
      su -c "apt-get --yes install wget"

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 11725e913d8f302346ffc2dd2b7282c008cee0c7..12265a6dd987a684d088562b1f0819c35be5b65a 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -39,14 +39,6 @@
 fi
 
 source $PWD/scripts/CreaTools-configure.sh
-#EED 2017-03-24
-  source $PWD/scripts/LocalFunctions.sh
-  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
-  then
-       stdCompiler=c++98
-#  else
-#      stdCompiler=c++11
-  fi
 
 
    echo "------"
@@ -148,7 +140,14 @@ then
   cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
   cmake -D VTK_DIR:PATH=$VTK_DIR CMakeCache.txt
   cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
-  cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
+
+  #EED 2017-03-24
+  source $PWD/scripts/LocalFunctions.sh
+  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
+  then
+       cmake -D CMAKE_CXX_FLAGS:STRING=-std=c++98 CMakeCache.txt
+  fi
+
   make -j $corenumber
   make -j $corenumber install
   cd ..

diff --git a/Linux/scripts/bbtkVariables.sh b/Linux/scripts/bbtkVariables.sh
index b9fa9a51966d87fcf158f0b1c1c2d3177ed5c82c..daa397f115e9e24db4ace3f46e68ea759b2301f4 100644 (file)
--- a/Linux/scripts/bbtkVariables.sh
+++ b/Linux/scripts/bbtkVariables.sh
@@ -42,7 +42,7 @@ boolgdcm2=OFF
 boolgdcm1=ON
 fi
 
-cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt
+cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC -fopenmp -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt
 cmake -D --BUILD_ALL:BOOL=ON CMakeCache.txt
 echo =============================================================================================
 echo cmake -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=$3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=$3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=$3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=$3 CMakeCache.txt