From 104079aa0c3d17edadd5908e5b06cf68b059e333 Mon Sep 17 00:00:00 2001 From: Eduardo Enrique Davila Serrano Date: Fri, 19 Jan 2024 17:37:33 +0100 Subject: [PATCH] #3456 bug NSIS CPACK windows --- Install_mingw64/Install_CreaTools/scripts/All.bat | 9 +-------- Install_mingw64/Install_CreaTools/scripts/All2.bat | 1 + .../Install_CreaTools/scripts/creaMaracasVariables.bat | 2 -- .../cmake/crea_ThirdParty_dlls/install/CMakeLists.txt | 4 ++++ Install_mingw64/config_win.bat | 4 ++-- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Install_mingw64/Install_CreaTools/scripts/All.bat b/Install_mingw64/Install_CreaTools/scripts/All.bat index 3f1d9be..df270f3 100644 --- a/Install_mingw64/Install_CreaTools/scripts/All.bat +++ b/Install_mingw64/Install_CreaTools/scripts/All.bat @@ -27,21 +27,14 @@ set creatoolsGeneration=%1 set docGeneration=%2 set scriptsFolder=%cd% - - rmdir %logFolder% /s /q mkdir %logFolder% mkdir %creatoolsGeneration% - echo call configure variables call %scriptsFolder%\base\configureVariables.bat - echo call Clean and Download-Sources -start /B /wait %scriptsFolder%\base\downloadSources.bat - - + start /B /wait %scriptsFolder%\base\downloadSources.bat echo %cd% - cd %scriptsFolder% call All2.bat %creatoolsGeneration% %docGeneration% Release Win64 diff --git a/Install_mingw64/Install_CreaTools/scripts/All2.bat b/Install_mingw64/Install_CreaTools/scripts/All2.bat index bbbeec0..7139a5e 100644 --- a/Install_mingw64/Install_CreaTools/scripts/All2.bat +++ b/Install_mingw64/Install_CreaTools/scripts/All2.bat @@ -73,6 +73,7 @@ start /B /wait %scriptsFolder%\bbtkGEditorInstall.bat echo call compile creaMinitools start /B /wait %scriptsFolder%\creaMinitoolsInstall.bat + echo THIS HAS TO BE THE LAST STEP... echo call compile creaTools start /B /wait %scriptsFolder%\creaToolsInstall.bat diff --git a/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat index f6baa98..ade43d6 100644 --- a/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat +++ b/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat @@ -38,7 +38,6 @@ IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) - ::cmake -D CMAKE_CXX_FLAGS:STRING=/openmp ::cmake -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea CMakeCache.txt ::cmake -D BBTK_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\bbtk CMakeCache.txt @@ -46,7 +45,6 @@ IF %4==Debug ( ::cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt ::cmake CMakeCache.txt - ::%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=/openmp ::%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt ::%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt diff --git a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt index 1da72e8..19bc874 100644 --- a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt +++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt @@ -37,6 +37,10 @@ IF(WIN32 AND NOT UNIX) SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr") SET(CPACK_NSIS_MODIFY_PATH OFF) + +# EED 2024-01-18 +# SET(CPACK_SYSTEM_NAME ${CREATOOLS_PLATFORM}) +SET(CPACK_NSIS_INSTALL_ROOT $ENV{ProgramFiles}) set (CREA_BOOST_LYBRARY boost) set (CREA_GDCM_LYBRARY gdcm13 ) diff --git a/Install_mingw64/config_win.bat b/Install_mingw64/config_win.bat index dc013ef..261eb2f 100644 --- a/Install_mingw64/config_win.bat +++ b/Install_mingw64/config_win.bat @@ -3,7 +3,7 @@ ::--------- Cumputer 3 : Tour Cratools 2 ------------------------- set baseProject=C:\Users\davila\Creatis\C22 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 ProgramFiles=C:\Program Files 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 " @@ -13,7 +13,7 @@ set DirMingwDlls=C:\Users\davila\Creatis\ups\mingw64-8.5-posix\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 ------------------------- +::--------- Cumputer 1 : Tour Creatools ------------------------- ::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) -- 2.45.1