From: Eduardo DAVILA Date: Sun, 12 Apr 2020 12:01:30 +0000 (+0200) Subject: #3376 creaToolsTools Bug New Normal - vtk8itk5wx3-mingw64 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=de31510131343b5bf37eb6504d319165178b4bac;p=creaToolsTools.git #3376 creaToolsTools Bug New Normal - vtk8itk5wx3-mingw64 --- de31510131343b5bf37eb6504d319165178b4bac diff --cc Install_mingw64/Install_CreaTools/creatools.bat index 4af30d8,c5e8739..e58100f --- a/Install_mingw64/Install_CreaTools/creatools.bat +++ b/Install_mingw64/Install_CreaTools/creatools.bat @@@ -1,11 -1,25 +1,21 @@@ @echo off - call config.bat - + set baseProject=C:\Eduardo\Creatis + set ProgramFiles=C:\Program Files (x86) + + ;::set baseProject=C:\Users\davila\Creatools + ::set ProgramFiles=C:\Program Files + + ::set baseProject=E:\creatis\c_mingw + ::set ProgramFiles=C:\Program Files (x86) - - - set docGeneration=OFF - set cmakeBin=%baseProject%\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe - set creatoolsGeneration=%baseProject%\C5\ct + set cmakeBin=%baseProject%\DevelopperTools\cmake-3.11.2-win64-x64\bin\cmake.exe + set creatoolsGeneration=%baseProject%\C10\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 + :: set GIT_SSH=%ProgramFiles%\PuTTY\plink.exe cd scripts call All.bat %creatoolsGeneration% %docGeneration% diff --cc Install_mingw64/Install_CreaTools/scripts/tmp.sh index 4183a49,e17e65e..14d4f8c --- a/Install_mingw64/Install_CreaTools/scripts/tmp.sh +++ b/Install_mingw64/Install_CreaTools/scripts/tmp.sh @@@ -1,10 -1,10 +1,10 @@@ echo tmp.sh - mkdir E:/creatis/c_mingw/C5/ct - mkdir E:/creatis/c_mingw/C5/ct/cs - cd E:/creatis/c_mingw/C5/ct/cs + mkdir C:/Eduardo/Creatis/C10/ct + mkdir C:/Eduardo/Creatis/C10/ct/cs + cd C:/Eduardo/Creatis/C10/ct/cs git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea cd crea -git checkout vtk7itk4wx3-mingw64 +git checkout vtk8itk4wx3-mingw64 cd .. git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtk cd bbtk diff --cc Install_mingw64/Install_ThirdParty/install-All.bat index 402adc8,cdcf484..80f36ed --- a/Install_mingw64/Install_ThirdParty/install-All.bat +++ b/Install_mingw64/Install_ThirdParty/install-All.bat @@@ -1,14 -1,22 +1,16 @@@ - set thirdpartyGenerationBase=E:\creatis\c_mingw\C5\tpl\ - set cmakeBin=E:\creatis\c_mingw\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe - set wgetPath="E:\creatis\c_mingw\For_mingw64\DeveloperTools\wget-1.19.4-win32\wget.exe" - set DirMingwDlls=E:\creatis\c_mingw\For_mingw64\DeveloperTools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin + set thirdpartyGenerationBase=C:\Eduardo\Creatis\C10\tpl\ - + set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.11.2-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 + ::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