]> Creatis software - creaToolsTools.git/commitdiff
#3376 creaToolsTools Bug New Normal - vtk8itk5wx3-mingw64
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Thu, 16 Apr 2020 08:18:21 +0000 (10:18 +0200)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Thu, 16 Apr 2020 08:18:21 +0000 (10:18 +0200)
15 files changed:
Install_mingw64/Install_CreaTools/creatools.bat
Install_mingw64/Install_CreaTools/scripts/All.bat
Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat
Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat
Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat
Install_mingw64/Install_CreaTools/scripts/tmp.sh
Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt
Install_mingw64/Install_ThirdParty/install-All.bat
Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat
Install_mingw64/Readme_EED.txt

index e58100f846c17dc7dc327d74df746cecf2c44de5..9b0800befc1eabe5acc8a0abf93612f7f496716f 100644 (file)
@@ -1,5 +1,6 @@
 @echo off
 
+
 set baseProject=C:\Eduardo\Creatis
 set ProgramFiles=C:\Program Files (x86)
 
@@ -10,8 +11,8 @@ set ProgramFiles=C:\Program Files (x86)
 ::set ProgramFiles=C:\Program Files (x86)
 
 set docGeneration=OFF
-set cmakeBin=%baseProject%\DevelopperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
-set creatoolsGeneration=%baseProject%\C10\ct
+set cmakeBin=%baseProject%\DevelopperTools\cmake-3.17.1-win64-x64\bin\cmake.exe
+set creatoolsGeneration=%baseProject%\C11\ct
 set bash=%ProgramFiles%\Git\bin\bash.exe
 :: Some times you have to put this is comments
 :: If not in comments you need to activate de ppk key with the putty-agent
index 8cd0df2b1e3dafcaf34286cc192c5042450e2cf0..351239fd6270ffce430c372ae89737a73224838f 100644 (file)
@@ -37,7 +37,7 @@ echo call configure variables
 call %scriptsFolder%\base\configureVariables.bat
 
 echo call Clean and Download-Sources
-start /B /wait %scriptsFolder%\base\downloadSources.bat
+::start /B /wait %scriptsFolder%\base\downloadSources.bat
 
 echo %cd%
 
index d2fc6835b8dcfbee6d67e1338b5886719b3bdc27..db9ac20094adb8fa761c791931fd7843de85ac32 100644 (file)
@@ -41,64 +41,64 @@ echo cd %creatoolsGeneration2%/cs                                                                                                           >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creasource%                                    >> tmp.sh
 echo cd %creasource%                                                                                                                                           >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtksource%                                    >> tmp.sh
 echo cd %bbtksource%                                                                                                                                           >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creamaracassource%                     >> tmp.sh
 echo cd %creamaracassource%                                                                                                                    >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creavtksource%                                 >> tmp.sh
 echo cd %creavtksource%                                                                                                                                >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaenvironmentsource%                 >> tmp.sh
 echo cd %creaenvironmentsource%                                                                                                                >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creabrukersource%                              >> tmp.sh
 echo cd %creabrukersource%                                                                                                                     >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaimagesource%                               >> tmp.sh
 echo cd %creaimagesource%                                                                                                                      >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creacontourssource%            >> tmp.sh
 echo cd %creacontourssource%                                                                                                                           >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%crearigidregistrationssource%          >> tmp.sh
 echo cd %crearigidregistrationssource%                                                                                                 >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtkgeditorsource%                     >> tmp.sh
 echo cd %bbtkgeditorsource%                                                                                                                    >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaminitoolssource%                   >> tmp.sh
 echo cd %creaminitoolssource%                                                                                                                  >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creatoolssource%                               >> tmp.sh
 echo cd %creatoolssource%                                                                                                                      >> tmp.sh
-echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 
index 52fed20126b4c13eeb7de94e568ac531e3973d7a..17b394f3933eb61d45f89c3d7ae19e4f4e7a7032 100644 (file)
@@ -52,7 +52,7 @@ IF %4==Debug (
 
 %cmakeBin% -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_DOC:BOOL=%3 -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
-%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive -std=c++11" CMakeCache.txt
+%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 
 exit /B
index 243be20af3a633d46844d2631a2c7811205b922e..7e2febb2a7f06e790ecf2c964ce2b5ff22e186f5 100644 (file)
@@ -52,7 +52,6 @@ echo %1=creabrukersource% %2=docgeneration
 
 %cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaEnvironment_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaMaracasVisu_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaImageIO_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
-%cmakeBin% -D BUILD_BBTK_PACKAGE_creaContours:BOOL=ON      CMakeCache.txt
 %cmakeBin% -D creaContours_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 
index 23aab2b5a9c376d0823080f29bcd46ef964216d6..44f47a495504a9f42bcdf48c5a9e6ccb4c591e72 100644 (file)
@@ -54,7 +54,7 @@ IF %4==Debug (
 ::%cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 ::%cmakeBin%  CMakeCache.txt
 
-%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=-openmp
+%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=/openmp
 %cmakeBin%  -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin%  -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt
index 8e85bbb315d5a1d058354ccc7ccdb8c148284827..b650848db009f7ad5adc926200c87d72abed0fdb 100644 (file)
@@ -47,7 +47,6 @@ cd %binfolder%
 ::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 ::%cmakeBin% CMakeCache.txt
 
-%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=-openmp
 %cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON -D creaVtk_DOC:BOOL=%3 CMakeCache.txt
@@ -56,4 +55,4 @@ cd %binfolder%
 
 
 
-exit /B
+exit /B
\ No newline at end of file
index 14d4f8c563abe239da349e8abee9bbc4c196d78a..abeb6fdaa8182d665bf992219e53e5d49cb42687 100644 (file)
@@ -1,52 +1,52 @@
 echo tmp.sh 
-mkdir C:/Eduardo/Creatis/C10/ct                                                                                                                
-mkdir C:/Eduardo/Creatis/C10/ct/cs                                                                                                     
-cd C:/Eduardo/Creatis/C10/ct/cs                                                                                                        
+mkdir C:/Eduardo/Creatis/C11/ct                                                                                                                
+mkdir C:/Eduardo/Creatis/C11/ct/cs                                                                                                     
+cd C:/Eduardo/Creatis/C11/ct/cs                                                                                                        
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea                                         
 cd crea                                                                                                                                        
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtk                                         
 cd bbtk                                                                                                                                        
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMaracasVisu                      
 cd creaMaracasVisu                                                                                                                     
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaVtk                              
 cd creaVtk                                                                                                                             
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaEnvironment              
 cd creaEnvironment                                                                                                             
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaBruker                           
 cd creaBruker                                                                                                                          
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaImageIO                                  
 cd creaImageIO                                                                                                                         
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaContours                 
 cd creaContours                                                                                                                        
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaRigidRegistration        
 cd creaRigidRegistration                                                                                               
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtkGEditor                          
 cd bbtkGEditor                                                                                                                         
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMiniTools                        
 cd creaMiniTools                                                                                                               
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaTools                            
 cd creaTools                                                                                                                           
-git checkout vtk8itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk5wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
index 0df5dfffd7af084ff7070e746cb25876fb324e01..2853daec4b7f729f54559fb1dc6d259ee0422243 100644 (file)
@@ -3,7 +3,7 @@ PROJECT(crea_TPdlls)
 cmake_minimum_required(VERSION 2.6)
 
 SET(PROJECT_MAJOR_VERSION 4)
-SET(PROJECT_MINOR_VERSION 0)
+SET(PROJECT_MINOR_VERSION 1)
 SET(PROJECT_BUILD_VERSION 0)
 
 SET(CREA_VERBOSE_CMAKE TRUE)
index b753986073c865dffb3a319a0fa42f8e8cd66d28..1da72e878d19f9b8c164651434f07fb35abd3665 100644 (file)
@@ -131,7 +131,7 @@ IF(WIN32)
 
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'BOOST_ROOT' '$INSTDIR\\\\' 
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'GDCM_DIR' '$INSTDIR\\\\lib\\\\gdcm\\\\' 
-               WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'ITK_DIR' '$INSTDIR\\\\lib\\\\cmake\\\\ITK-4.12\\\\' 
+               WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'ITK_DIR' '$INSTDIR\\\\lib\\\\cmake\\\\ITK-5.0\\\\' 
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'QTDIR' '$INSTDIR\\\\' 
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'VTK_DIR' '$INSTDIR\\\\lib\\\\cmake\\\\vtk-8.1\\\\' 
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'WXWIN' '$INSTDIR\\\\' 
index 80f36ed45f128a013f72bc72c8633e8621b9250f..6c030bf5757f96ce5758fffc0609113b4ce96883 100644 (file)
@@ -1,16 +1,22 @@
 
-set thirdpartyGenerationBase=C:\Eduardo\Creatis\C10\tpl\
-set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
+set thirdpartyGenerationBase=C:\Eduardo\Creatis\C11\tpl\
+
+set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.17.1-win64-x64\bin\cmake.exe
+
 set wgetPath="C:\Eduardo\Creatis\DevelopperTools\wget-1.19.4-win32\wget.exe"
+
 set zipPath="C:\Program Files\7-Zip\7z.exe"
 ::set zipPath="peazip -ext2here "
+
 set DirMingwDlls=C:\Eduardo\Creatis\DevelopperTools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
+
 set PATH=C:\Windows\system32;C:\Eduardo\Creatis\DevelopperTools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;
 
+
 start /wait install_generate_thirdparty-x64Release.bat
 
 ::REM start /wait install_generate_thirdparty-x64Debug.bat
 ::REM start /wait install_generate_thirdparty-x86Release.bat
 ::     REM start /wait install_generate_thirdparty-x86Debug.bat
 
-::pause
+::pause
\ No newline at end of file
index f4bdad19b2dd1b3509ba470da3d45730ddf64267..8fea02d05370f9235056f5464999162d3dd7533e 100644 (file)
@@ -49,25 +49,34 @@ set sourcepath=%thirdpartyGeneration%\tps
 set LogFolder=%thirdpartyGeneration%\installLog
 
 set QTFNAME=qt-everywhere-opensource-src-4.8.2.zip
+
 ::set ITKFNAME=InsightToolkit-3.20.1.zip
-set ITKFNAME=InsightToolkit-4.12.1.tar
+::set ITKFNAME=InsightToolkit-4.12.1.tar
+set ITKFNAME=InsightToolkit-5.0.1-patchCreatis.zip
+
 ::set WXFNAME=wxWidgets-2.8.12.zip
 ::set WXVERSION=2.8.12
 set WXFNAME=wxWidgets-3.0.4.7z
 set WXVERSION=3.0.4
+
 :: set BOOSTFNAME=boost_1_49_0.7z
 :: set BOOSTFNAME=boost_1_52_0.7z
-set BOOSTFNAME=boost_1_64_0.7z
+::set BOOSTFNAME=boost_1_64_0.7z
+set BOOSTFNAME=boost_1_69_0.zip
+
 ::set XERCESFNAME=xerces-c-3.1.1.zip
 ::set XERCESFNAME=xerces-c-3.1.4.zip
 set XERCESFNAME=xerces-c-3.2.3.zip
+
 ::set VTKFNAME=vtk-5.10.0.zip
 :: set VTKFNAME=VTK-8.1.1-patch_mingw64.7z
 set VTKFNAME=VTK-8.1.1-Patch.7z
+
 ::set GDCMFNAME=gdcm_05_Mai_2011.tar
 ::set GDCMFNAME=gdcm_11_Oct_2011.tar
 ::set GDCMFNAME=gdcm_10_Mars_2017-vtk7.tar
-set GDCMFNAME=gdcm13_2019_06_17_vtk8.zip
+set GDCMFNAME=gdcm13_2018_05_28_vtk8.zip
+
 set TTHFNAME=tth_exe.zip
 set SQLITEFNAME=sqlite_v3.6.23.1.zip
 set JOMFNAME=jom.zip
@@ -114,12 +123,11 @@ if %EEDdownloadQT%==FALSE GOTO SKIPDOWNLOADQT
 
   
 if %EEDdownloadITK%==FALSE GOTO SKIPDOWNLOADITK
-  %wgetPath% --no-check-certificate "%urlCreatisSource%/%ITKFNAME%.gz"  
+  %wgetPath% --no-check-certificate "%urlCreatisSource%/%ITKFNAME%"  
   echo -----------------------------------
   echo -------------ITK-------------------
   echo -----------------------------------
   cd %sourcepath%
-  %zipPath% x %ITKFNAME%.gz
   %zipPath% x %ITKFNAME%
 ::  del %ITKFNAME%
 ::  del %ITKFNAME%.gz
@@ -234,8 +242,8 @@ echo -----------------------------------
 cd %sourcepath%
 rename qt-everywhere-opensource-src-4.8.2 qt
 rename wxWidgets_%WXVERSION% wxWidgets
-rename boost_1_64_0 boost
-rename InsightToolkit-4.12.1 itk
+rename boost_1_69_0 boost
+rename InsightToolkit-5.0.1 itk
 rename VTK-8.1.1 vtk
 rename gdcm13_2018_05_28_vtk8 gdcm13
 rename tth_exe tth
index 5894d9cf4981d2c4d313edee0d5bb49bcaf167a3..bf1a395af2741b7310c8bd5bc67fe07e7600c7e4 100644 (file)
@@ -183,7 +183,8 @@ echo %PATH%   >> %LogFolder%\boostInstall.log 2>&1
 cd %sourcepath%\%boost%\
 
 :: --with-system --with-signals
-b2 --build-dir=%binpath%\%boost%Bin\build --prefix=%installpath%\ toolset=gcc cxxflags="-std=c++98" variant=%buildType% link=shared runtime-link=shared -j %NUMBER_OF_PROCESSORS% install      >> %LogFolder%\boostInstall.log 2>&1 
+:: cxxflags="-std=c++98"
+b2 --build-dir=%binpath%\%boost%Bin\build --prefix=%installpath%\ toolset=gcc variant=%buildType% link=shared runtime-link=shared -j %NUMBER_OF_PROCESSORS% install      >> %LogFolder%\boostInstall.log 2>&1 
 
 
 :: cd %sourcepath%\%boost%
@@ -298,12 +299,13 @@ cd %itk%Bin
 ::     )
 ::)
 
-%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin                                           >> %LogFolder%\ITKInstall.log 2>&1
-%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
-%cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt        >> %LogFolder%\ITKInstall.log 2>&1
-%cmakeBin% -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview::BOOL=ON CMakeCache.txt                              >> %LogFolder%\ITKInstall.log 2>&1
-mingw32-make.exe -j%NUMBER_OF_PROCESSORS%                                                                          >> %LogFolder%\ITKInstall.log 2>&1
-mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install                                                                  >> %LogFolder%\ITKInstall.log 2>&1
+%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin                                                                               >> %LogFolder%\ITKInstall.log 2>&1
+%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt   >> %LogFolder%\ITKInstall.log 2>&1
+%cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt            >> %LogFolder%\ITKInstall.log 2>&1
+::%cmakeBin% -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview::BOOL=ON CMakeCache.txt                                >> %LogFolder%\ITKInstall.log 2>&1
+%cmakeBin%  -D Module_ITKReview::BOOL=ON CMakeCache.txt                                                                                                >> %LogFolder%\ITKInstall.log 2>&1
+mingw32-make.exe -j%NUMBER_OF_PROCESSORS%                                                                                                                                              >> %LogFolder%\ITKInstall.log 2>&1
+mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install                                                                                                                              >> %LogFolder%\ITKInstall.log 2>&1
        
 ::cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
 ::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 >> %LogFolder%\ITKInstall.log 2>&1
@@ -333,19 +335,14 @@ cd %xercesc%Bin
 mingw32-make.exe -j%NUMBER_OF_PROCESSORS%                                                                              >> %LogFolder%\wercesInstall.log 2>&1
 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install                                                                      >> %LogFolder%\wercesInstall.log 2>&1
 
-
 :SKIPINSTALLXERCES
 
 
 
-echo ----------------------------------------
-echo -------- SQLite Installation------------
-echo ----------------------------------------
-
 if %EEDinstallSQLite%==FALSE GOTO SKIPINSTALLSQLite
-echo -----------------------------------
-echo -------SQLite Installation------------
-echo -----------------------------------
+echo ---------------------------------------
+echo -------SQLite Installation-------------
+echo ---------------------------------------
 cd  %binpath%
 mkdir %SQLite%Bin
 cd %SQLite%Bin
@@ -375,9 +372,9 @@ mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install
 
 
 if %EEDinstallDLFCN%==FALSE GOTO SKIPINSTALLDLFCN
-echo -----------------------------------
-echo -------SKIPINSTALLDLFCN Installation------------
-echo -----------------------------------
+echo ------------------------------------------------
+echo -------DLFCN Installation-----------------------
+echo ------------------------------------------------
 cd  %binpath%
 mkdir %DLFCN%Bin
 cd %DLFCN%Bin
@@ -390,8 +387,17 @@ mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install
 
 :SKIPINSTALLDLFCN
 
+
+
+echo -------------------------------------------------------
+echo -------PATCH  Moving dlls -----------------------------
+echo -------------------------------------------------------
+
 ::boost
 move /Y %installpath%\lib\*.dll %installpath%\bin
+:: PATCH ITK (after boost patch)
+:: EED2020-04-14       
+copy /Y %installpath%\bin\libitkminc2-5.0.dll  %installpath%\lib\libitkminc2-5.0.dll
 ::wxWidgets
 move /Y %installpath%\lib\gcc_dll\*.dll %installpath%\bin
 :: dlls mingw
index 1ce5ffd9c22cdb78357eb23873392d131e7a2d3c..e8c2cdb3f21cbefc87fd29759f1e9d49a4a403c9 100644 (file)
@@ -1,11 +1,11 @@
 
-set  EEDclean=TRUE
+set  EEDclean=FALSE
 set  EEDcleanSOURCES=TRUE
 set  EEDcleanBIN=TRUE
 set  EEDcleanINSTALL=TRUE
 set  EEDcleanLOGS=TRUE
 
-set  EEDdownload=TRUE
+set  EEDdownload=FALSE
 set  EEDdownloadQT=FALSE
 set  EEDdownloadWXWINDOWS=TRUE
 set  EEDdownloadBOOST=TRUE
@@ -18,7 +18,7 @@ set  EEDdownloadDLFCN=TRUE
 set  EEDdownloadTTH=TRUE
 set  EEDdownloadOPENGLMESA=TRUE
 
-set  EEDinstall=TRUE
+set  EEDinstall=FALSE
 set  EEDinstallQT=FALSE
 set  EEDinstallWXWIDGETS=TRUE
 set  EEDinstallBOOST=TRUE
index 749c8ce831d2bf07c3f5104605ad83892442f5e2..e50fa1abe883f54e5867922f275057849620f724 100644 (file)
@@ -23,7 +23,8 @@
      -En creaToolsTools\Install_mingw64\Install_ThirdParty\scripts\tpl_variables.bat
         - Verificar que es TRUE y FALSE
 
-3. Compile Third Party Library  (tpl)
+3. 
+Compile Third Party Library  (tpl)
      install-All.bat
 
 ::Nota, correr todo para bajar los fuentes, el ( unzip 7z ) no lo enuentra en la segunda corrida cuando se quite la 
@@ -40,10 +41,13 @@ opcion de clean y download se renombran los source automatidacmente  (OJO con wx
                B. set bash=C:\Program Files\Git\bin\bash.exe
     -ssh: Exportar la llave generada en linux en formato ppk.  cargar la llave con pagent. (doble click en el archivo ppk)
 
-1. creatools.bat 
+1. Install  crea_TPdlls--4.1.0-win64.exe
+
+2. creatools.bat 
   Configurar el directorio de salida
   
-2. scripts/gitcall.bat
+3. ??????????
+   scripts/gitcall.bat
    configurar bien la variable, que depende donde esta instalado git
    set bash=C:\Program Files\Git\bin\bash.exe