#3448 vtk8itk5wx3-macos in Windows

diff --git a/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat b/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat
index b145732b6b2b180b74a78645689a3136631ca1f8..00edd88c47225ad65fe4e0bc66f3103872dc57aa 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat
@@ -1,3 +1,5 @@
-"C:\Program Files (x86)\PuTTY\pscp.exe" CreaTools-Release-4.0.0-win64.exe  davila@tux.creatis.insa-lyon.fr:/var/www/html/software/public/creatools/creaTools/v4.x.x/
+ssh-add 
+scp crea_TPdlls--4.1.0-win64.exe davila@tux.creatis.insa-lyon.fr:/home/davila/creatools/crea_ThirdParty_dlls/v4.x.x/
+scp CreaTools-Release-4.1.0-win64.exe  davila@tux.creatis.insa-lyon.fr:/home/davila/creatools/creaTools/v4.x.x/
 
 pause

diff --git a/Install_mingw64/Install_CreaTools/scripts/gitcall.bat b/Install_mingw64/Install_CreaTools/scripts/gitcall.bat
index 4393cecea0aefc73dd8eaa942aa2963175f3b9f3..dabbc6cc4ffae9be39e7a317d7cf009211c7d0f7 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/gitcall.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/gitcall.bat
@@ -1,4 +1,4 @@
 echo gitcall
 rem if not exist %1 exit
-"%bash%"  --login -i -c "exec  "%1""
-::call %1%
+::"%bash%"  --login -i -c "exec  "%1""
+call %1%

diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index 7e4c8b9f0f24bdf3a2441e9d7b4f35fc90562d59..d4484ae3af6574346fa11dbc39ef1c6b1a2e16cf 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -68,9 +68,10 @@ set BOOSTFNAME=boost_1_69_0.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-5.10.0.zip
 :: set VTKFNAME=VTK-8.1.1-patch_mingw64.7z
 set VTKFNAME=VTK-8.1.1-Patch.7z
+:: set VTKFNAME=VTK-8.2.0-Patch-TDx.zip
 
 ::set GDCMFNAME=gdcm_05_Mai_2011.tar
 ::set GDCMFNAME=gdcm_11_Oct_2011.tar
@@ -244,7 +245,10 @@ rename qt-everywhere-opensource-src-4.8.2 qt
 rename wxWidgets_%WXVERSION% wxWidgets
 rename boost_1_69_0 boost
 rename InsightToolkit-5.0.1 itk
+
 rename VTK-8.1.1 vtk
+:: rename VTK-8.2.0-Patch-TDx vtk
+
 rename gdcm13_2018_05_28_vtk8 gdcm13
 rename tth_exe tth
 rename xerces-c-3.2.3 xerces

diff --git a/Install_mingw64/config_win.bat b/Install_mingw64/config_win.bat
index eca72ba27309893230c316c8d131c92bf8a20146..c04ff7755f8956823e6362ba737fb06e3911f6be 100644 (file)
--- a/Install_mingw64/config_win.bat
+++ b/Install_mingw64/config_win.bat
@@ -1,13 +1,24 @@
 
 
-::--------- 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
+::--------- Cumputer 3 : Tour Cratools 2 -------------------------
+set baseProject=C:\Users\davila\Creatis\C11
+set cmakeBin=C:\Users\davila\Creatis\crea_Developper_Tools\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 wgetPath="C:\Users\davila\Creatis\crea_Developper_Tools\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
+set DirMingwDlls=C:\Users\davila\Creatis\crea_Developper_Tools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
+
+
+
+::--------- 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 -------------------------