From 3e300ead715e5196dbe7d27100776183e182608b Mon Sep 17 00:00:00 2001 From: Eduardo Enrique Davila Serrano Date: Tue, 7 Jun 2022 13:53:40 +0200 Subject: [PATCH] #3448 vtk8itk5wx3-macos in Windows --- .../scripts/Tool-scpCreaToolsToTux.bat | 4 +++- .../Install_CreaTools/scripts/gitcall.bat | 4 ++-- .../scripts/download_ThirdPartySW.bat | 6 +++++- Install_mingw64/config_win.bat | 21 ++++++++++++++----- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat b/Install_mingw64/Install_CreaTools/scripts/Tool-scpCreaToolsToTux.bat index b145732..00edd88 100644 --- 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 4393cec..dabbc6c 100644 --- 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 7e4c8b9..d4484ae 100644 --- 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 eca72ba..c04ff77 100644 --- 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 ------------------------- -- 2.47.1