From 4390fb2959acbad281c129f3c0e2fbed71fcd3b9 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Tue, 7 Aug 2018 12:43:19 +0200 Subject: [PATCH] #3200 creaToolsTools Feature New Normal - branch mingw64 --- .../Install_ThirdParty/scripts/download_ThirdPartySW.bat | 5 +++-- .../scripts/install_thirdparty_dlls_cmake.bat | 2 +- Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat index e96c1b0..ce1d0f2 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat @@ -214,14 +214,15 @@ if %EEDdownloadDLFCN%==FALSE GOTO SKIPDOWNLOADDLFCN %zipPath% x %DLFCNFNAME% :: del %DLFCNFNAME% :SKIPDOWNLOADDLFCN - +pause if %EEDdownloadOPENGLMESA%==FALSE GOTO SKIPDOWNLOADOPENGLMESA - %wgetPath% --no-check-certificate "%urlCreatisSource%/../../crea_Developer_Tools/v4/%OPENGLMESANAME%" + %wgetPath% --no-check-certificate "%urlCreatisSource%/../../../crea_Developer_Tools/v4/%OPENGLMESANAME%" echo ------------------------------------------------ echo --------------OPENGL MESA (creatis)------------------ echo ------------------------------------------------ cd %sourcepath% %zipPath% x %OPENGLMESANAME% +pause :: del %OPENGLMESANAME% :SKIPDOWNLOADOPENGLMESA diff --git a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat index 84896e6..62191ab 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat @@ -81,6 +81,6 @@ cd %binpath% %cmakeBin% -D CREA_LIBRARY_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt >> %LogFolder%\dlls_cmake.log 2>&1 mingw32-make.exe package >> %LogFolder%\dlls_cmake.log 2>&1 -move /Y *.exe ..\..\..\ +move /Y *.exe ..\..\..\..\ exit /B \ No newline at end of file diff --git a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat index 79d4dae..1ce5ffd 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat @@ -1,6 +1,6 @@ set EEDclean=TRUE -set EEDcleanSOURCES=FALSE +set EEDcleanSOURCES=TRUE set EEDcleanBIN=TRUE set EEDcleanINSTALL=TRUE set EEDcleanLOGS=TRUE -- 2.47.1