#3133 creaToolsTools Feature New Normal - branch vtk7itk4wx3

diff --git a/Install/scripts/All2.bat b/Install/scripts/All2.bat
index 3beee4bad607b0e0715056fcbd646553ee6f1a43..1266cc95f415d2fd5d43875ae3300b6b11037005 100644 (file)
--- a/Install/scripts/All2.bat
+++ b/Install/scripts/All2.bat
@@ -56,7 +56,7 @@ start /B /wait %scriptsFolder%\bbtk\bbtkInstall.bat
 echo call compile creaMaracasVisu
 start /B /wait %scriptsFolder%\creaMaracasVisu\creaMaracasVisuInstall.bat
 echo call compile creaVtk
-start /B /wait %scriptsFolder%\creaMaracasVisu\creaVtkInstall.bat
+start /B /wait %scriptsFolder%\creaVtk\creaVtkInstall.bat
 echo call compile creaEnvironment
 start /B /wait %scriptsFolder%\creaEnvironment\creaEnvironmentInstall.bat
 echo call compile creaBruker

diff --git a/Install/scripts/base/downloadSources.bat b/Install/scripts/base/downloadSources.bat
index 62167c0bd5926ea53d03ebc701f577d70eb67a1c..2eba76d3575f8642ae814cf519de804f351c821c 100644 (file)
--- a/Install/scripts/base/downloadSources.bat
+++ b/Install/scripts/base/downloadSources.bat
@@ -36,7 +36,7 @@ echo cd %creatoolsGeneration2%/creatools_sources    >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creasource%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtksource%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creamaracassource%  >> tmp.sh
-echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaVtk%  >> tmp.sh
+echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creavtksource%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaenvironmentsource%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creabrukersource%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaimagesource%  >> tmp.sh

diff --git a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat
index c42dbeae9f2ae43406d937e62c21dce37b2ce74f..ad81e80a83db97dde37225382156f3e295da4c1a 100644 (file)
--- a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat
+++ b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat
@@ -38,10 +38,11 @@ IF %4==Debug (
        cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt
 )
 
+cmake -D CMAKE_CXX_FLAGS:STRING=/openmp
 cmake -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea CMakeCache.txt
 cmake -D BBTK_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\bbtk CMakeCache.txt
-cmake  -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 cmake CMakeCache.txt
 
-exit /B
\ No newline at end of file
+exit /B

diff --git a/Install/scripts/creaVtk/creaVtkInstall.bat b/Install/scripts/creaVtk/creaVtkInstall.bat
index 890f89d7273a64f4eec66fbb8b6fc1230556e9c8..d2026669ddcd082350140ed539f392212e94c077 100644 (file)
--- a/Install/scripts/creaVtk/creaVtkInstall.bat
+++ b/Install/scripts/creaVtk/creaVtkInstall.bat
@@ -26,11 +26,11 @@ REM ------------------------------------------------------------------------
 set currentdir=%~dp0
 
 echo compile creaVtk  %buildtype% %platforme%
-call %baseFolder%\cleanmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
-call %baseFolder%\cmakemod.bat %creamaracassource%  %installPrefix% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
-call %currentdir%\creaVtkVariables.bat %creatoolsGeneration% %creamaracassource% %docgeneration% %buildtype% >> %logFolder%\creaVtkInstall.log 2>&1
-call %baseFolder%\compilemod.bat %buildtype% %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
-call %baseFolder%\ctestmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaVtkVisuInstall.log 2>&1
+call %baseFolder%\cleanmod.bat %creavtksource% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
+call %baseFolder%\cmakemod.bat %creavtksource%  %installPrefix% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
+call %currentdir%\creaVtkVariables.bat %creatoolsGeneration% %creavtksource% %docgeneration% %buildtype% >> %logFolder%\creaVtkInstall.log 2>&1
+call %baseFolder%\compilemod.bat %buildtype% %creavtksource% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
+call %baseFolder%\ctestmod.bat %creavtksource% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
 echo end of creaVtk compilation
 
 exit
\ No newline at end of file

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index 0a96182d0daf1fd04b2b83fc7086ce90038bcfa7..a0bd36d91cf034e6c89a5186d1dfea9fdc1c7e72 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -37,16 +37,24 @@
   if [ -e $generationdir ]
   then
 
-         cd $generationdir
-         source creatools_install/share/creatools/Version.sh 
-         distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/
-echo distanceAdress:
-echo $distanceAdress
+       echo generationdir:
+       echo $generationdir
+       cd $generationdir
+       mkdir GenerateBinTGZ
+    cd GenerateBinTGZ
+
+       ln -s $installPrefix creatools_install
+       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/
+
+       fileTGZ=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-`getDistrib`-`getDistribVersion`.tgz
+       fileTGZstring=CreaTools-Bin-Release-\$creatoolsMajorVersion.\$creatoolsMinorVersion.\$creatoolsBuildVersion-\`getDistrib\`-\`getDistribVersion\`
+
+     tar -cvzf $fileTGZ creatools_install/* thirdparty_install/*
 
-     fileTGZ=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-`getDistrib`-`getDistribVersion`.tgz
-         fileTGZstring=CreaTools-Bin-Release-\$creatoolsMajorVersion.\$creatoolsMinorVersion.\$creatoolsBuildVersion-\`getDistrib\`-\`getDistribVersion\`
 
-     tar -cvzf $fileTGZ creatools_install thirdparty_install
          scp $fileTGZ $distanceAdress/$fileTGZ 
 
          filename_BinVersion=creatools-Linux-Bin-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh
@@ -92,6 +100,10 @@ echo $distanceAdress
      echo "read -p 'Press [Enter] key to continue...'" >>  $filename_BinVersion
      scp $filename_BinVersion $distanceAdress/. 
 
+      rm creatools_install
+      rm thirdparty_install
+
+
      cd $scriptsDir
      scp $scriptDir/Install-Creatools-Bin.sh $distanceAdress/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh
          
@@ -99,6 +111,7 @@ echo $distanceAdress
 
          ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm creatools-Linux-Bin.sh;  ln -s v2.6.x/$filename_BinVersion  creatools-Linux-Bin.sh"
 
+
      echo ""
      echo ""
      echo ""

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 35954280f144e278e9ebe3bf7709d77d138dd4ba..bf64e01171cadafab069f68351d859a470732059 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -124,24 +124,23 @@ then
  #          mv $libidosource-ESRF $libidosource                 
           
          cd $generationdir/creatools_source/$creasource
-                git checkout vtk7itk4
+                git checkout vtk7itk4wx3
          cd $generationdir/creatools_source/$bbtksource
-                git checkout vtk7itk4
+                git checkout vtk7itk4wx3
          cd $generationdir/creatools_source/$creavtksource
-                git checkout vtk7itk4
+                git checkout vtk7itk4wx3
          cd $generationdir/creatools_source/$creamaracassource
-                git checkout vtk7itk4
+                git checkout vtk7itk4wx3
          cd $generationdir/creatools_source/$creaimagesource
-                git checkout vtk7itk4
+                git checkout vtk7itk4wx3
          cd $generationdir/creatools_source/$creacontourssource
-                git checkout vtk7itk4
+                git checkout vtk7itk4wx3
          cd $generationdir/creatools_source/$crearigidregistrationssource
-                git checkout vtk7itk4
+                git checkout vtk7itk4wx3
          cd $generationdir/creatools_source/$bbtkgeditorsource
-                git checkout vtk7itk4
+                git checkout vtk7itk4wx3
          cd $generationdir/creatools_source/$creatoolssource
-                git checkout vtk7itk4
-
+                git checkout vtk7itk4wx3
       fi
 
       if [ $sourcesFrom = HTML ]

diff --git a/Linux/scripts/LocalFunctions.sh b/Linux/scripts/LocalFunctions.sh
index 90624a24f2901c36625ebf4fe142fc741f9113bf..084c2a19c4dc790a5280f2023c8dd2aff79722a3 100644 (file)
--- a/Linux/scripts/LocalFunctions.sh
+++ b/Linux/scripts/LocalFunctions.sh
@@ -51,7 +51,7 @@ function bigDisplay {
 ###########################################
 function checkDistrib {
     local OS=$1
-    if [ "`checkVal $OS MacOS Fedora Ubuntu Mandriva`" == "false" ] ; then
+    if [ "`checkVal $OS MacOS Fedora Ubuntu Mandriva CentOS`" == "false" ] ; then
         echo "Operating System not supported: $OS"
         echo "Currently supported system: Fedora Ubuntu MacOS"
         exit 1
@@ -65,7 +65,11 @@ function getDistrib {
        if [ "$OS" == Darwin ] ; then OS=MacOS;
 ##EED2016-10-15    
 ##    elif [ "$OS" == Linux  ] ; then OS=$(lsb_release -i | awk '{print $3}')
-       elif [ "$OS" == Linux  ] ; then OS=`awk 'NR==1{print $1}' /etc/system-release`
+       elif [ "$OS" == Linux  ] ; then 
+               OS=`awk 'NR==1{print $1}' /etc/system-release`
+               if [ "$OS" == "" ] ; then 
+                       OS=$(lsb_release -i | awk '{print $3}')
+               fi
     else OS=""
     fi
 # checkDistrib $OS
@@ -79,17 +83,35 @@ function getDistribVersion {
       if [ "$DISTRIB" == MacOS ] ; then OSVesion=VOID_Darwin_EED;
     elif [ "$DISTRIB" == Fedora  ] ; then OSVersion=`awk 'NR==1{print $3}' /etc/system-release`
     elif [ "$DISTRIB" == Ubuntu  ] ; then OSVersion=`awk 'NR==1{print $2}' /etc/issue`
+    elif [ "$DISTRIB" == CentOS  ] ; then OSVersion=`awk 'NR==1{print $3}' /etc/issue`
     else OSVersion="VOID_EED"
     fi
     echo $OSVersion
 }
 
+###########################################
+function getKernelVersion {
+    local DISTRIB=`getDistrib`
+
+      if [ "$DISTRIB" == MacOS ] ; then KernelVesion=VOID_Darwin_EED;
+    elif [ "$DISTRIB" == Fedora  ] ; then KernelVersion=$(uname -a | awk '{print $3}')
+    elif [ "$DISTRIB" == Ubuntu  ] ; then KernelVersion=$(uname -a | awk '{print $3}')
+    elif [ "$DISTRIB" == CentOS  ] ; then KernelVersion=$(uname -a | awk '{print $3}')
+    else KernelVersion="VOID_EED"
+    fi
+    echo $KernelVersion
+}
+
+
+
+
 ###########################################
 function getDownloadCommand {
     local DISTRIB=`getDistrib`
 
       if [ "$DISTRIB" == MacOS ] ; then downloadCommand=curl;
     elif [ "$DISTRIB" == Fedora  ] ; then downloadCommand='aria2c -x 16'
+    elif [ "$DISTRIB" == CentOs  ] ; then downloadCommand='aria2c -x 16'
     elif [ "$DISTRIB" == Ubuntu  ] ; then downloadCommand=wget
     else downloadCommand="VOID_EED"
     fi

diff --git a/Linux/scripts/ThirdParty-install-Base-rpm.sh b/Linux/scripts/ThirdParty-install-Base-rpm.sh
index 022fcbe6fddd2ea2b254ffbeac86984ee500879a..4439ccbd176a70a07039d606f993d7f1828dc7be 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-rpm.sh
+++ b/Linux/scripts/ThirdParty-install-Base-rpm.sh
@@ -89,6 +89,32 @@ then
      yum install fcgi                 -y
      yum install fcgi-devel           -y
 
+     ;;
+  CentOS)
+     yum install aria2                -y
+     yum install wget                 -y
+     yum install unzip                -y
+     yum install cmake                -y
+     yum install cmake-gui            -y
+     yum install doxygen              -y
+     yum install graphviz             -y
+     yum install texlive              -y
+     yum install latex2html           -y
+     yum install wxGTK-devel wxBase   -y
+     yum install boost-devel          -y
+     yum install sqlite-devel         -y
+     yum install qt-devel             -y
+     yum install mesa-libOSMesa-devel -y
+     yum install gcc                  -y
+     yum install gcc-c++              -y
+     yum install redhat-rpm-config    -y
+     yum install xerces-c-devel       -y
+     yum install git                  -y
+     yum install qtwebkit-devel       -y
+     yum install patch                -y
+     yum install fcgi                 -y
+     yum install fcgi-devel           -y
+
      ;;
   Ubuntu)
      apt-get --yes install aria2

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index e6aaafa92738b467ee4c2892ca3140894595def0..91e06a75958320ed91ead68b4dd6a283bac59dda 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -69,6 +69,17 @@ source $PWD/scripts/CreaTools-configure.sh
    echo "------"
 
 
+#EED 2017-03-24
+  source $PWD/scripts/LocalFunctions.sh
+  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
+  then
+       stdCompiler=c++98
+  else
+       stdCompiler=c++03
+  fi
+
+
+
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
@@ -164,7 +175,7 @@ then
   then
      cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D ITKGroup_Nonunit:BOOL=ON -D  ITKGroup_IO:BOOL=ON  -D Module_ITK-Deprecated:BOOL=ON -D Module_ITK-Review:BOOL=ON  CMakeCache.txt        
   fi
-  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+  cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
 
   #uncomment following line if you want to use the bleeding edge of GDCM2!
   #cmake -D ITK_USE_SYSTEM_GDCM:BOOL=ON CMakeCache.txt

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 1364d587586f4b5e035159af44253554aaacb54f..efe7f32e086929b70d1346afe35186002628b3c4 100644 (file)
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -64,6 +64,17 @@ source $PWD/scripts/CreaTools-configure.sh
    echo "------"
 
 
+#EED 2017-03-24
+  source $PWD/scripts/LocalFunctions.sh
+  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
+  then
+       stdCompiler=c++98
+  else
+       stdCompiler=c++03
+  fi
+
+
+
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
@@ -218,7 +229,6 @@ then
 
   cmake -D VTK_Group_Views:BOOL=ON  -D VTK_Group_Qt:BOOL=ON   CMakeCache.txt
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt
-##??  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
 
 ##EED 2016-12-22  make -j $corenumber
   make -j $corenumber

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index c2afbaefaa8115b528eefd4afa26c6fb856dccde..3563f6fba9bd4c28ea1e2e4e7410559f9e5951fb 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -39,6 +39,15 @@
 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++03
+  fi
+
 
    echo "------"
    echo $PWD/scripts/CreaTools-configure.sh
@@ -136,7 +145,7 @@ 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=c++03' CMakeCache.txt
+  cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
   make -j $corenumber
   make -j $corenumber install
   cd ..

diff --git a/Linux/scripts/creaMaracasVariables.sh b/Linux/scripts/creaMaracasVariables.sh
index 8ed795309df50755b7ff0c84f5ca129781f0964c..26da6307e09fec71b58f66d208578e2a5a5f29e0 100644 (file)
--- a/Linux/scripts/creaMaracasVariables.sh
+++ b/Linux/scripts/creaMaracasVariables.sh
@@ -33,12 +33,12 @@ binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
 
-cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC                            CMakeCache.txt
-cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin         CMakeCache.txt
-cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin         CMakeCache.txt
-cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON              CMakeCache.txt
-cmake -D creaMaracasVisu_DOC:BOOL=$3                             CMakeCache.txt
-cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=$3  CMakeCache.txt
+cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC -D CMAKE_CXX_FLAGS:STRING=-fopenmp       CMakeCache.txt
+cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin                               CMakeCache.txt
+cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin                               CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON                                    CMakeCache.txt
+cmake -D creaMaracasVisu_DOC:BOOL=$3                                                   CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=$3                        CMakeCache.txt
 
 cmake CMakeCache.txt
 cmake CMakeCache.txt