loginGroupName=`groups | awk '{print $1}'`
buildType=Release
gdcmVersion=GDCM1
-ITKVersion=ITK3
+ITKVersion=ITK4
export ETC_BASHRC=`getbashrc`
checkDistrib $OperatingSystem
# complete default install prefix
-if [ -z "$installPrefix" ] ; then installPrefix=$generationdir/creatools_install; fi
-if [ -z "$installPrefixThird" ] ; then installPrefixThird=$generationdir/thirdparty_install; fi
+if [ -z "$installPrefix" ] ; then installPrefix=$generationdir/ci; fi
+if [ -z "$installPrefixThird" ] ; then installPrefixThird=$generationdir/tpli; fi
# check build type
if [ `checkVal $buildType Release Debug RelWithDebug` == "false" ] ; then
#
if [ $sourcesFrom = GIT ] || [ $sourcesFrom = GIT-READ-ONLY ];
then
- ssh-add
+ ssh-add
bash $scriptDir/gitclone.sh $creasource $generationdir $sourcesFrom
bash $scriptDir/gitclone.sh $bbtksource $generationdir $sourcesFrom
bash $scriptDir/gitclone.sh $creavtksource $generationdir $sourcesFrom
bash $scriptDir/gitclone.sh $creaminitoolssource $generationdir $sourcesFrom
bash $scriptDir/gitclone.sh $creatoolstoolssource $generationdir $sourcesFrom
# bash $scriptDir/cvscheckout.sh $libidosource-ESRF $generationdir $cvsUserName
- # mv $libidosource-ESRF $libidosource
+ # mv $libidosource-ESRF $libidosource
+
+ cd $generationdir/creatools_source/$creasource
+ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$bbtksource
+ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creavtksource
+ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creamaracassource
+ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creaimagesource
+ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creacontourssource
+ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$crearigidregistrationssource
+ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$bbtkgeditorsource
+ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creatoolssource
+ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creabrukersource
+ git checkout vtk7itk4wx3
fi
if [ $sourcesFrom = HTML ]
yum install graphviz -y
yum install texlive -y
yum install latex2html -y
- yum install wxGTK-devel wxBase -y
+ yum install wxGTK3-devel wxBase3 -y
yum install boost-devel -y
yum install sqlite-devel -y
yum install qt-devel -y
# /// \TODO move theese ones upper in the process! JPR
export GDCM_DIR=$installPrefixThird/lib/gdcm/
-export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
-export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
+export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
+export ITK_DIR=$installPrefixThird/lib
export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
baseLibraryThirdPartyDir=$installPrefixThird/share/creatools
touch $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
chmod 755 $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo installPrefixThird='$1' >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export PATH='$'PATH:'$'installPrefixThird/bin >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export VTK_DIR='$'installPrefixThird/lib/vtk-5.10 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export ITK_DIR='$'installPrefixThird/lib/InsightToolkit >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export GDK_BACKEND=x11 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export MESA_GL_VERSION_OVERRIDE=3.2 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo installPrefixThird='$1' >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export PATH='$'PATH:'$'installPrefixThird/bin >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+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 TTH='$'installPrefixThird/bin/tth >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'GDCM_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'ITK_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'VTK_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
- echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+ echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
else
- echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
- echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
- echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
- echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+ echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+ echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+ echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+ echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
fi
cd $PWD/scripts
then
stdCompiler=c++98
else
- stdCompiler=c++03
+ stdCompiler=c++11
fi
else
# deal with ITK4
- itkfile=ITK4.0.tgz
- libname=ITK
+ itkfile=InsightToolkit-4.12.1.tar.gz
+ libname=InsightToolkit-4.12.1
fi
if [ $OperatingSystem = "MacOS" ]
##EED19mai2015 wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile
wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
fi
+
tar -xzvf $itkfile
+
#fi # JPR ------------1
cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
cmake -D CMAKE_BUILD_TYPE:STRING=$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 ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
+
+ cmake -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt
+ if [ $ITKVersion = ITK3 ]
+ then
+ cmake -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
+ fi
+
if [ $ITKVersion = ITK4 ]
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
+
+##EED ITK4.0
+# 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
+
+##EED ITK4.12
+# -D ITK_USE_SYSTEM_GDCM=ON
+ cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview:BOOL=ON CMakeCache.txt
+
fi
cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
## EED 2013-10-29
## wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
## tar -xzvf VTK-5.6.1.patchCreatis.tar.gz
- wget http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip
-echo unzip vtk-5.10.1.zip
-pwd
- unzip vtk-5.10.1.zip
-
- cd VTK5.10.1/Rendering
-##EED19mai2015 wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
- wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
- patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
-
- cd ../CMake
- wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
- patch < vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
+## EED 2016-12-28
+## wget http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip
+## echo unzip vtk-5.10.1.zip
+## pwd
+## unzip vtk-5.10.1.zip
+## cd VTK5.10.1/Rendering
+####EED19mai2015 wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+## wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+## patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+## cd ../CMake
+## wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
+## patch < vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
+
+ wget http://www.vtk.org/files/release/7.1/VTK-7.1.0.zip
+ unzip VTK-7.1.0.zip
fi
# debug="OFF"
#fi
+### the following stupid test is used at debug time; Please don't remove!
+###if [ true = false ]
+##if [ true = true ]
+##then
+## libname=VTK5.10.1
+## dirInstall=$binDir/$libname-Bin
+#### export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+## export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+##
+## mkdir -p $dirInstall
+## echo "we prepare directories dirInstall " $dirInstall " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
+## cd $dirInstall
+##
+### See EED why we have to do this
+## if [ $OperatingSystem = "MacOS" ]
+## then
+## cmake -D CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
+## fi
+## cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
+## ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
+## cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
+##
+## if [ $OperatingSystem = "MacOS" ]
+## then
+## cmake -D BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=ON -D VTK_USE_COCOA:BOOL=OFF CMakeCache.txt
+## cmake -D VTK_USE_TCL:BOOL=OFF CMakeCache.txt
+## CMakeCache.txt
+## fi
+##
+## 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
+## cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+##
+####EED 2016-12-22 make -j $corenumber
+## make -j $corenumber
+## make -j $corenumber install
+## cd ..
+##fi
+
+
# the following stupid test is used at debug time; Please don't remove!
#if [ true = false ]
if [ true = true ]
then
- libname=VTK5.10.1
+ libname=VTK-7.1.0
dirInstall=$binDir/$libname-Bin
## export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
- export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+ export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
mkdir -p $dirInstall
- echo "we prepare directories dirInstall " $dirInstall " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
+ echo "we prepare directories dirInstall " $dirInstall " VTK_DIR " $installPrefixThird/lib/vtk-7.1/
cd $dirInstall
# See EED why we have to do this
then
cmake -D CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
fi
+
cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
CMakeCache.txt
fi
- 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
- cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
+ 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
##EED 2016-12-22 make -j $corenumber
make -j $corenumber
make -j $corenumber install
cd ..
+
fi
+
+
+
+
+
tar -xvf gdcm_05_Mai_2011.tar.gz
else
##19mai2015 wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
- wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
- tar -xvzf gdcm_05_Mai_2011.tar.gz
+
+##VTK-5
+# wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+# tar -xvzf gdcm_05_Mai_2011.tar.gz
+
+ wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_10_Mars_2017-vtk7.tar.gz
+ tar -xvzf gdcm_10_Mars_2017-vtk7.tar.gz
+
fi
if [ $buildType = "Debug" ]
--- /dev/null
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+# pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+# This software is governed by the CeCILL-B license under French law and
+# abiding by the rules of distribution of free software. You can use,
+# modify and/ or redistribute the software under the terms of the CeCILL-B
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+# or in the file LICENSE.txt.
+#
+# As a counterpart to the access to the source code and rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty and the software's author, the holder of the
+# economic rights, and the successive licensors have only limited
+# liability.
+#
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+
+
+#!/bin/bash
+
+ if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
+ then
+ echo
+ echo "..ERROR.."
+ echo "==================================================="
+ echo "REMEMBER !"
+ echo ""
+ echo "YOU NEED TO RUN 'Configure' (0) First !"
+ echo "==================================================="
+ echo
+ echo
+ exit 0
+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
+ echo --generationdir--
+ echo $generationdir
+ echo --docgeneration--
+ echo $docgeneration
+ echo --installPrefix--
+ echo $installPrefix
+ echo --installPrefixThird--
+ echo $installPrefixThird
+ echo --buildType--
+ echo $buildType
+ echo --gdcmVersion--
+ echo $gdcmVersion
+# echo --sourcesFrom--
+# echo $sourcesFrom
+# echo --scriptDir--
+# echo $scriptDir
+# echo --start_point--
+# echo $start_point
+ echo "------"
+
+
+scriptDir=$PWD
+sourcesDir=$generationdir/thirdparty_sources
+binDir=$generationdir/thirdparty_bin
+
+if [ ! -e $generationdir ]
+then
+ mkdir -p $generationdir
+ chown -R $loginUserName $generationdir
+ chgrp -R $loginGroupName $generationdir
+
+fi
+if [ ! -e $sourcesDir ]
+then
+ mkdir -p $sourcesDir
+ #was : (pb on MacOS?)
+ #chown -R $loginUserName:$loginGroupName $sourcesDir
+ chown -R $loginUserName $sourcesDir
+ chgrp -R $loginGroupName $sourcesDir
+fi
+
+if [ ! -e $binDir ]
+then
+ mkdir -p $binDir
+ chown -R $loginUserName $binDir
+ chgrp -R $loginGroupName $binDir
+fi
+
+ echo "we remove old stuff"
+ rm -rf $sourcesDir/gdcm*
+ rm -rf $binDir/gdcm*
+
+ cd $sourcesDir
+
+ echo "we download new stuff"
+ if [ $OperatingSystem = "MacOS" ]
+ then
+ curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+ # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+ tar -xvf gdcm_05_Mai_2011.tar.gz
+ else
+##19mai2015
+# wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+#EED 2017-08-29 itk3toitk4
+# wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+# tar -xvzf gdcm_05_Mai_2011.tar.gz
+
+ wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm-2.8.2.tar.gz
+ tar -xvzf gdcm-2.8.2.tar.gz
+
+ fi
+
+if [ $buildType = "Debug" ]
+then
+ debug="ON"
+else
+ debug="OFF"
+fi
+
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
+if [ true = true ]
+then
+ libname=gdcm-2.8.2
+ dirInstall=$binDir/$libname-Bin
+ export GDCM_DIR=$installPrefixThird/lib/gdcm/
+ mkdir -p $dirInstall
+ cd $dirInstall
+
+ cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
+ ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
+
+ 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_USE_VTK:BOOL=ON CMakeCache.txt
+ cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
+
+ make -j $corenumber
+ make -j $corenumber install
+ cd ..
+fi
+
+#if [ true = false ]
+if [ true = true ]
+then
+ cd $sourcesDir
+ cp tth $installPrefixThird/bin
+fi
+
+
+# deal with create creatools_third_party_libraries_config.sh
+# is now done in ThirdParty-install-Finalize.sh
+
git://git.creatis.insa-lyon.fr / creaToolsTools.git / commitdiff