From e98af58b0e0f5fab3f1b19da243905b2733dceda Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Sun, 12 Dec 2021 10:25:19 +0100 Subject: [PATCH] #3448 vtk8itk5wx3-macos in Windows --- .../Install_CreaTools/creatools.bat | 10 +-------- .../Install_ThirdParty/install-All.bat | 20 ++---------------- Install_mingw64/Readme_EED.txt | 12 +++++------ Install_mingw64/config_win.bat | 21 +++++++++++++++++++ 4 files changed, 30 insertions(+), 33 deletions(-) create mode 100644 Install_mingw64/config_win.bat diff --git a/Install_mingw64/Install_CreaTools/creatools.bat b/Install_mingw64/Install_CreaTools/creatools.bat index 6ba070a..1eb2ede 100644 --- a/Install_mingw64/Install_CreaTools/creatools.bat +++ b/Install_mingw64/Install_CreaTools/creatools.bat @@ -1,14 +1,6 @@ @echo off - -::set baseProject=C:\Eduardo\Creatis -::set ProgramFiles=C:\Program Files -::set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.17.1-win64-x64\bin\cmake.exe - - -set baseProject=E:\creatis\C11 -set ProgramFiles=C:\Program Files (x86) -set cmakeBin=E:\creatis\crea_Developer_Tools\v4\cmake-3.17.1-win64-x64\bin\cmake.exe +call ../config_win.bat set docGeneration=OFF set creatoolsGeneration=%baseProject%\ct diff --git a/Install_mingw64/Install_ThirdParty/install-All.bat b/Install_mingw64/Install_ThirdParty/install-All.bat index a02e8df..b8cfe22 100644 --- a/Install_mingw64/Install_ThirdParty/install-All.bat +++ b/Install_mingw64/Install_ThirdParty/install-All.bat @@ -1,23 +1,7 @@ -:: Computer EED : Tour Cratools -set thirdpartyGenerationBase=E:\Creatis\C11\tpl\ -set cmakeBin=E:\creatis\crea_Developer_Tools\v4\cmake-3.17.1-win64-x64\bin\cmake.exe -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 - - -:: Computer EED : Portable Mac2 -::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 - - +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 diff --git a/Install_mingw64/Readme_EED.txt b/Install_mingw64/Readme_EED.txt index add5519..20e3f34 100644 --- a/Install_mingw64/Readme_EED.txt +++ b/Install_mingw64/Readme_EED.txt @@ -23,7 +23,7 @@ 2. Clone creaToolsTools -Cambiar la branch (vtk8itk5wx3-macos) - -En creaToolsTools\Install_mingw64\Install_ThirdParty\install_All.bat ajustar el path de: + -En creaToolsTools\creaToolsTools\Install_mingw64\config_win.bat ajustar el path de: cmakeBin thirdpartyGenerationBase wget @@ -51,9 +51,10 @@ 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 @@ -63,10 +64,9 @@ opcion de clean y download se renombran los source automatidacmente (OJO con wx Changing computer configuration paths... -# modified: Install_mingw64/Install_CreaTools/creatools.bat -# modified: Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat -# modified: Install_mingw64/Install_ThirdParty/install-All.bat -# modified: Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat +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 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 + -- 2.45.1