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

diff --git a/Install_mingw64/Install_CreaTools/creatools.bat b/Install_mingw64/Install_CreaTools/creatools.bat
index c0d21dba6bbdf812674d46c9e7ec7023d2fc8196..1eb2ede8709a618613a3871aca0be97f788ca8d3 100644 (file)
--- a/Install_mingw64/Install_CreaTools/creatools.bat
+++ b/Install_mingw64/Install_CreaTools/creatools.bat
@@ -1,18 +1,9 @@
 @echo off
 
-
-set baseProject=C:\Eduardo\Creatis
-set ProgramFiles=C:\Program Files
-
-;::set baseProject=C:\Users\davila\Creatools
-::set ProgramFiles=C:\Program Files
-
-::set baseProject=E:\creatis\c_mingw
-::set ProgramFiles=C:\Program Files (x86)
+call ../config_win.bat
 
 set docGeneration=OFF
-set cmakeBin=%baseProject%\DevelopperTools\cmake-3.17.1-win64-x64\bin\cmake.exe
-set creatoolsGeneration=%baseProject%\C11\ct
+set creatoolsGeneration=%baseProject%\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

diff --git a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
index 94c4ac5318e9c02b13cd00d5c09c00897fc17c37..bf57c4be0597c4b73dd2c865292bcda0dd033d63 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
@@ -31,6 +31,9 @@ echo downloading creatools software
 ::goto SkipEED1
 :SkipEED1
 
+::set creatoolsBranch=vtk8itk5wx3-mingw64
+set creatoolsBranch=vtk8itk5wx3-macos
+
 
 echo echo tmp.sh > tmp.sh
 set creatoolsGeneration2=%creatoolsGeneration:\=/%
@@ -41,64 +44,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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> 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 vtk8itk5wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout %creatoolsBranch%                                                                                                            >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 

diff --git a/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat b/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
index 61b487c641437b6c09f85af3627df87b0d4ec900..c1470c5d1bbf19ddee667f5bfbc5e8e2e50824ba 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
@@ -50,7 +50,7 @@ IF %4==Debug (
 ::%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
 ::%cmakeBin% CMakeCache.txt
 
-%cmakeBin% -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin% -D 0-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 -fopenmp" CMakeCache.txt
 %cmakeBin% CMakeCache.txt

diff --git a/Install_mingw64/Install_CreaTools/scripts/tmp.sh b/Install_mingw64/Install_CreaTools/scripts/tmp.sh
deleted file mode 100644 (file)
index abeb6fd..0000000
--- a/Install_mingw64/Install_CreaTools/scripts/tmp.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-echo tmp.sh 
-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 vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtk                                         
-cd bbtk                                                                                                                                        
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMaracasVisu                      
-cd creaMaracasVisu                                                                                                                     
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaVtk                              
-cd creaVtk                                                                                                                             
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaEnvironment              
-cd creaEnvironment                                                                                                             
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaBruker                           
-cd creaBruker                                                                                                                          
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaImageIO                                  
-cd creaImageIO                                                                                                                         
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaContours                 
-cd creaContours                                                                                                                        
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaRigidRegistration        
-cd creaRigidRegistration                                                                                               
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtkGEditor                          
-cd bbtkGEditor                                                                                                                         
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMiniTools                        
-cd creaMiniTools                                                                                                               
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          
-git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaTools                            
-cd creaTools                                                                                                                           
-git checkout vtk8itk5wx3-mingw64                                                                                                       
-cd ..                                                                                                                                                          

diff --git a/Install_mingw64/Install_ThirdParty/install-All.bat b/Install_mingw64/Install_ThirdParty/install-All.bat
index 6c030bf5757f96ce5758fffc0609113b4ce96883..b8cfe22b85cc33420834173a5d7290b67cc3fcee 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/install-All.bat
+++ b/Install_mingw64/Install_ThirdParty/install-All.bat
@@ -1,22 +1,10 @@
 
-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;
-
+call ../config_win.bat
 
+set thirdpartyGenerationBase=%baseProject%\tpl\
+set PATH=C:\Windows\system32;%DirMingwDlls%; 
 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
\ No newline at end of file
+::pause

diff --git a/Install_mingw64/Readme_EED.txt b/Install_mingw64/Readme_EED.txt
index 9d9baf96a11d065295d4f5bd64d46de1836305c7..74869ab710ab5417847b860c743e5339efdc6bab 100644 (file)
--- a/Install_mingw64/Readme_EED.txt
+++ b/Install_mingw64/Readme_EED.txt
@@ -1,6 +1,7 @@
 =============================  Third Part Library  ==========================
 
 1. Install from /home/davila/public_html/creatools_back_site/crea_Developer_Tools/v4 
+       - 7z
        - mingw-64  V7.3  Version x86_64  
                Add int the sytem PATH:
                        <..InstalationPath..>\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
@@ -9,7 +10,6 @@
        - basic-miktex-2.9.6753-x64.exe
        - nsis-3.03-setup.exe
 
-       - 7z
 
         - git Install Options
                -No GUI
@@ -19,11 +19,13 @@
        - git (ssh-agent ssh-add) configuration :
                Move the scripts/bashrc  to .bashrc in Windows-User-Home
 
+        - putty-0.73-installer.msi
         - key ssh: copy the id_rsa version 2 in <Users>\.ssh  (see mail ups rsa 2)
 
+
 2. Clone creaToolsTools 
-     -Cambiar la branch  (mingw64)
-     -En creaToolsTools\Install_mingw64\Install_ThirdParty\install_All.bat ajustar el path de:
+     -Cambiar la branch  (vtk8itk5wx3-macos)
+     -En creaToolsTools\creaToolsTools\Install_mingw64\config_win.bat  ajustar el path de:
                        cmakeBin
                        thirdpartyGenerationBase
                        wget
@@ -51,11 +53,27 @@ opcion de clean y download se renombran los source automatidacmente  (OJO con wx
 
 1. Install  crea_TPdlls--4.1.0-win64.exe
 
-2. creatools.bat 
+2. creaToolsTools\Install_mingw64\config_win.bat 
   Configurar el directorio de salida
   
+  
 3. ??????????
    scripts/gitcall.bat
    configurar bien la variable, que depende donde esta instalado git
    set bash=C:\Program Files\Git\bin\bash.exe
    
+4. Copiar    
+   .......\C11\creaToolsTools\Install_mingw64\Install_CreaTools\scripts\Tool-scpCreaToolsToTux.bat
+   A la altura de la .......\C11
+   
+   
+=================================================================
+
+Changing computer configuration paths...
+
+creaToolsTools\Install_mingw64\config_win.bat                        <<<< general configuration 
+creaToolsTools\Install_CreaTools\scripts\base\downloadSources.bat    <<<< creatools sources git Branch
+creaToolsTools\Install_ThirdParty\scripts\tpl_variables.bat          <<<< modules (TRUE/FALSE) TPL
+
+
+

diff --git a/Install_mingw64/config_win.bat b/Install_mingw64/config_win.bat
new file mode 100644 (file)
index 0000000..eca72ba
--- /dev/null
+++ b/Install_mingw64/config_win.bat
@@ -0,0 +1,21 @@
+
+
+::--------- Cumputer 1 : Tour Cratools -------------------------
+set baseProject=E:\Creatis\C11
+set cmakeBin=E:\creatis\crea_Developer_Tools\v4\cmake-3.17.1-win64-x64\bin\cmake.exe
+set ProgramFiles=C:\Program Files (x86)
+set wgetPath="E:\creatis\crea_Developer_Tools\v4\wget\wget.exe"
+set zipPath="C:\Program Files\7-Zip\7z.exe"
+::set zipPath="peazip -ext2here "
+set DirMingwDlls=E:\creatis\crea_Developer_Tools\v4\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
+
+
+::--------- Cumputer 2 : Portable Mac2 -------------------------
+::set baseProject=C:\Eduardo\Creatis\C11
+::set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.17.1-win64-x64\bin\cmake.exe
+::set ProgramFiles=C:\Program Files
+::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
+

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index b35b8bfe30742aa9a44e1b84964fb9e36ca25c39..244119c6494e43d6df05528dc679e2bb54255069 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -73,6 +73,7 @@ source $PWD/scripts/CreaTools-configure.sh
        stdCompiler=c++98
   else
        stdCompiler=c++11
+       # -std=c++11
   fi
 
 
@@ -135,8 +136,9 @@ fi
 #    libname=InsightToolkit-4.13.1
 #  fi
 
-    itkfile=InsightToolkit-5.0.1.zip
-    libname=InsightToolkit-5.0.1
+#    itkfile=InsightToolkit-5.0.1-patchCreatis.zip
+    itkfile=InsightToolkit-5.2.1.zip
+    libname=InsightToolkit-5.2.1
 
 
 ##  if [ $OperatingSystem = "MacOS" ]

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index fb97632963a0e26a12a7f8ca75508c52596fe72c..2f511c824d4ce4b9e81fab61f96343a6c65458bb 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -125,7 +125,7 @@ fi
 ##  fi
 
 
-cxxFlags='  '
+cxxFlags='-std=c++11   '
 if [ $TDx == "ON" ]
 then
     cxxFlags=$cxxFlags'-F/Library/Frameworks -DVTK_USE_TDX '

diff --git a/Linux/scripts/bbtkGEditorVariables.sh b/Linux/scripts/bbtkGEditorVariables.sh
index 42938fa32c8dfbd59a4c19f4da915cd42c4faec7..53c72d7ddfa66761dac052193c800b0f0719001f 100644 (file)
--- a/Linux/scripts/bbtkGEditorVariables.sh
+++ b/Linux/scripts/bbtkGEditorVariables.sh
@@ -32,7 +32,7 @@ cd $binfolder
 
 
 TDx=$4
-cxxFlags='-fPIC '
+cxxFlags='-fPIC -std=c++11  '
 # TDx is declared in: CreaTools-configure.sh
 if [ "$TDx" == "ON" ]; then
   cxxFlags=$cxxFlags'-F/Library/Frameworks '

diff --git a/Linux/scripts/bbtkVariables.sh b/Linux/scripts/bbtkVariables.sh
index 68b124e5953665bdb7a6ca2b5b7c9f8688cc99f1..86c4f34fa313a3c71048cecdb013cd75ef872ff9 100644 (file)
--- a/Linux/scripts/bbtkVariables.sh
+++ b/Linux/scripts/bbtkVariables.sh
@@ -46,7 +46,7 @@ fi
 
 #This line es not working in MacOs
 #cxxFlags='-fPIC -fopenmp '
-cxxFlags='-fPIC '
+cxxFlags='-fPIC -std=c++11 '
 TDx=$5
 # TDx is declared in: CreaTools-configure.sh
 if [ "$TDx" == "ON" ]; then

diff --git a/Linux/scripts/creaContoursVariables.sh b/Linux/scripts/creaContoursVariables.sh
index 6a5a75f3499622aaa504317cdd3567d32c5fd2f9..c61c8db47711fd0c5b40d5c85f7d102ab1d2e8a2 100644 (file)
--- a/Linux/scripts/creaContoursVariables.sh
+++ b/Linux/scripts/creaContoursVariables.sh
@@ -30,7 +30,7 @@ binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
 TDx=$4
-cxxFlags='-fPIC '
+cxxFlags='-fPIC -std=c++11 '
 # TDx is declared in: CreaTools-configure.sh
 if [ "$TDx" == "ON" ]; then
   cxxFlags=$cxxFlags'-F/Library/Frameworks '

diff --git a/Linux/scripts/creaImageIOVariables.sh b/Linux/scripts/creaImageIOVariables.sh
index 720091e3eadfbf2434646019337c89624390871c..81b7e85f50a7cf9c8905d979e22e001b6ab509bf 100644 (file)
--- a/Linux/scripts/creaImageIOVariables.sh
+++ b/Linux/scripts/creaImageIOVariables.sh
@@ -45,7 +45,7 @@ boolgdcm1=ON
 fi
 
 TDx=$5
-cxxFlags='-fPIC '
+cxxFlags='-fPIC -std=c++11  '
 # TDx is declared in: CreaTools-configure.sh
 if [ "$TDx" == "ON" ]; then
   cxxFlags=$cxxFlags'-F/Library/Frameworks '

diff --git a/Linux/scripts/creaMaracasVariables.sh b/Linux/scripts/creaMaracasVariables.sh
index b21641218247fbcc3e1fcee3b91ac105692ca970..853d5d448834fe1acbc12c9b6cda06138b7e6655 100644 (file)
--- a/Linux/scripts/creaMaracasVariables.sh
+++ b/Linux/scripts/creaMaracasVariables.sh
@@ -44,7 +44,7 @@ TDx=$4
 
 # this line is not working in MacOs
 #cxxFlags='-fPIC -fopenmp '
-cxxFlags='-fPIC  '
+cxxFlags='-fPIC  -std=c++11 '
 
 # TDx is declared in: CreaTools-configure.sh
 if [ "$TDx" == "ON" ]; then