From: Eduardo DAVILA Date: Tue, 17 Jul 2018 11:43:42 +0000 (+0200) Subject: #3200 creaToolsTools Feature New Normal branch mingw64 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=534450b5f8fee74bb88363e5da24aa35dd21766a;p=creaToolsTools.git #3200 creaToolsTools Feature New Normal branch mingw64 --- diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt index a10c231..66b8855 100644 --- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt @@ -24,20 +24,11 @@ SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION}) SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION}) SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION}) - - - - - SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") IF(WIN32) SET(CMAKE_INSTALL_PREFIX C:/CreaTools/${PROJECT_NAME}) ENDIF(WIN32) - - - - IF(WIN32 AND NOT UNIX) # There is a bug in NSI that does not handle full unix paths properly. Make # sure there is at least one set of four (4) backlasshes. @@ -49,7 +40,6 @@ IF(WIN32 AND NOT UNIX) SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr") SET(CPACK_NSIS_MODIFY_PATH OFF) - set (CREA_BOOST_LYBRARY boost) set (CREA_GDCM_LYBRARY gdcm13 ) set (CREA_ITK_LYBRARY itk ) @@ -66,25 +56,19 @@ IF(WIN32 AND NOT UNIX) set (CREA_LIBRARY_SOURCE_PATH "" CACHE PATH ${MessageLibraryPath} ) set (CREA_LIBRARY_DESTINATION_PATH "Library") set (CREA_BIN_DESTINATION_PATH "bin") - IF(NOT CREA_LIBRARY_SOURCE_PATH) MESSAGE(FATAL_ERROR "${MessageLibraryPath} not found") ENDIF(NOT CREA_LIBRARY_SOURCE_PATH) - - ELSE(WIN32 AND NOT UNIX) # SET(CPACK_STRIP_FILES "bin/bbi") SET(CPACK_SOURCE_STRIP_FILES "") ENDIF(WIN32 AND NOT UNIX) #SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!") - - # Aditional INSTALL for CPACK mecanism. IF (WIN32) - # tth FILE(GLOB LST_FILE_TTH "${CREA_LIBRARY_SOURCE_PATH}/tth/*.*") FOREACH( iLST ${LST_FILE_TTH} ) @@ -93,7 +77,6 @@ IF (WIN32) DESTINATION bin/tth/ ) ENDFOREACH(iLST) - #DFCH -- INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_MIKATEX_LYBRARY} DESTINATION ${CREA_BIN_DESTINATION_PATH} ) INSTALL(FILES ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/Version.txt DESTINATION . ) INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_BOOST_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) @@ -105,7 +88,6 @@ IF (WIN32) INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_XERCES_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) INSTALL(DIRECTORY ${CREA_LIBRARY_SOURCE_PATH}\\\\${CREA_SQLITE_LYBRARY} DESTINATION ${CREA_LIBRARY_DESTINATION_PATH} ) - #DFCH -- SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin") #DFCH -- SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";${MIKTEX_INSTALL_DIR}") SET(CREATPL_DIRBIN "$INSTDIR") @@ -141,8 +123,7 @@ IF (WIN32) SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 ") - - + SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP @@ -155,10 +136,7 @@ IF (WIN32) WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'CREATIS_THIRDPARTYLIBRARIES_DIRS' '' SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 ") - - INCLUDE(CPack) - - + INCLUDE(CPack) ENDIF (WIN32) diff --git a/Install_mingw64/Install_CreaTools/creatools.bat b/Install_mingw64/Install_CreaTools/creatools.bat index 0c0ff67..7ca2ef3 100644 --- a/Install_mingw64/Install_CreaTools/creatools.bat +++ b/Install_mingw64/Install_CreaTools/creatools.bat @@ -2,6 +2,8 @@ set creatoolsGeneration=C:\Users\davila\Creatools\C5\ct set docGeneration=OFF +set cmakeBin=C:\Users\davila\Creatools\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe + cd scripts call All.bat %creatoolsGeneration% %docGeneration% cd .. diff --git a/Install_mingw64/Install_CreaTools/scripts/All.bat b/Install_mingw64/Install_CreaTools/scripts/All.bat index a0b08ca..220211a 100644 --- a/Install_mingw64/Install_CreaTools/scripts/All.bat +++ b/Install_mingw64/Install_CreaTools/scripts/All.bat @@ -36,13 +36,13 @@ mkdir %creatoolsGeneration% echo call configure variables call %scriptsFolder%\base\configureVariables.bat -echo call Clean and Download-Sources +::echo call Clean and Download-Sources ::start /B /wait %scriptsFolder%\base\downloadSources.bat echo %cd% -::cd %scriptsFolder% -::call All2.bat %creatoolsGeneration% %docGeneration% Release Win64 +cd %scriptsFolder% +call All2.bat %creatoolsGeneration% %docGeneration% Release Win64 ::cd %scriptsFolder% ::call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 diff --git a/Install_mingw64/Install_CreaTools/scripts/All2.bat b/Install_mingw64/Install_CreaTools/scripts/All2.bat index 1266cc9..a49f7c9 100644 --- a/Install_mingw64/Install_CreaTools/scripts/All2.bat +++ b/Install_mingw64/Install_CreaTools/scripts/All2.bat @@ -28,20 +28,20 @@ set docgeneration=%2 set buildtype=%3 set platforme=%4 -set logFolder=%creatoolsGeneration%\creatools_%buildtype%%platforme%\installLog -set installPrefix=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_install +set logFolder=%creatoolsGeneration%\c_%buildtype%%platforme%\log +set installPrefix=%creatoolsGeneration%\c_%buildtype%%platforme%\ci echo --Change ThirdParty directories (CSI/act)-- set homedir=%cd% -cd E:\creatis\CSI -call act\rename_dir.bat -rename act_%buildtype%-%platforme% act +::cd E:\creatis\CSI +::call act\rename_dir.bat +::rename act_%buildtype%-%platforme% act cd %creatoolsGeneration% -mkdir creatools_%buildtype%%platforme% -mkdir creatools_%buildtype%%platforme%\Result_Installers -mkdir creatools_%buildtype%%platforme%\installLog +mkdir c_%buildtype%%platforme% +mkdir c_%buildtype%%platforme%\ri +mkdir c_%buildtype%%platforme%\log echo call configure variables call %scriptsFolder%\base\configureVariables.bat @@ -49,28 +49,29 @@ call %scriptsFolder%\base\configureVariables.bat REM goto skypToEED REM :skypToEED -echo call compile crea -start /B /wait %scriptsFolder%\crea\creaInstall.bat +::echo call compile crea +::start /B /wait %scriptsFolder%\creaInstall.bat echo call compile bbtk -start /B /wait %scriptsFolder%\bbtk\bbtkInstall.bat -echo call compile creaMaracasVisu -start /B /wait %scriptsFolder%\creaMaracasVisu\creaMaracasVisuInstall.bat -echo call compile creaVtk -start /B /wait %scriptsFolder%\creaVtk\creaVtkInstall.bat -echo call compile creaEnvironment -start /B /wait %scriptsFolder%\creaEnvironment\creaEnvironmentInstall.bat -echo call compile creaBruker -start /B /wait %scriptsFolder%\creaBruker\creaBrukerInstall.bat -echo call compile creaImageIO -start /B /wait %scriptsFolder%\creaImageIO\creaImageIOInstall.bat -echo call compile creaContours -start /B /wait %scriptsFolder%\creaContours\creaContoursInstall.bat -echo call compile creaRigidRegistration -start /B /wait %scriptsFolder%\creaRigidRegistration\creaRigidRInstall.bat -echo call compile bbtkGEditor -start /B /wait %scriptsFolder%\bbtkGEditor\bbtkGEditorInstall.bat -echo call compile creaMinitools -start /B /wait %scriptsFolder%\creaTools\creaMinitoolsInstall.bat +start /B /wait %scriptsFolder%\bbtkInstall.bat + +::echo call compile creaMaracasVisu +::start /B /wait %scriptsFolder%\creaMaracasVisuInstall.bat +::echo call compile creaVtk +::start /B /wait %scriptsFolder%\creaVtkInstall.bat +::echo call compile creaEnvironment +::start /B /wait %scriptsFolder%\creaEnvironmentInstall.bat +::echo call compile creaBruker +::start /B /wait %scriptsFolder%\creaBrukerInstall.bat +::echo call compile creaImageIO +::start /B /wait %scriptsFolder%\creaImageIOInstall.bat +::echo call compile creaContours +::start /B /wait %scriptsFolder%\creaContoursInstall.bat +::echo call compile creaRigidRegistration +::start /B /wait %scriptsFolder%\creaRigidRInstall.bat +::echo call compile bbtkGEditor +::start /B /wait %scriptsFolder%\bbtkGEditorInstall.bat +::echo call compile creaMinitools +::start /B /wait %scriptsFolder%\creaMinitoolsInstall.bat diff --git a/Install_mingw64/Install_CreaTools/scripts/base/cleanmod.bat b/Install_mingw64/Install_CreaTools/scripts/base/cleanmod.bat new file mode 100644 index 0000000..7e8b708 --- /dev/null +++ b/Install_mingw64/Install_CreaTools/scripts/base/cleanmod.bat @@ -0,0 +1,47 @@ +REM --------------------------------------------------------------------- +REM +REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +REM pour la Santé) +REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +REM +REM This software is governed by the CeCILL-B license under French law and +REM abiding by the rules of distribution of free software. You can use, +REM modify and/ or redistribute the software under the terms of the CeCILL-B +REM license as circulated by CEA, CNRS and INRIA at the following URL +REM http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +REM or in the file LICENSE.txt. +REM +REM As a counterpart to the access to the source code and rights to copy, +REM modify and redistribute granted by the license, users are provided only +REM with a limited warranty and the software's author, the holder of the +REM economic rights, and the successive licensors have only limited +REM liability. +REM +REM The fact that you are presently reading this means that you have had +REM knowledge of the CeCILL-B license and that you accept its terms. +REM ------------------------------------------------------------------------ + +@echo off + +echo ---------------------------- +echo -------cleanmod.bat--------- +echo ---------------------------- + +echo creasourcefolder = %1 +echo creatoolsGeneration = %2 + + +set binfolder=%2\c_%buildtype%%platforme%\cb\%1Bin +mkdir %binfolder% +cd %binfolder% +del CMakeCache.txt +del *.exe +del *.dll +del Debug\*.exe +del Debug\*.dll +del Release\*.exe +del Release\*.dll +del RelWithDebInfo\*.exe +del RelWithDebInfo\*.dll + +exit /B \ No newline at end of file diff --git a/Install_mingw64/Install_CreaTools/scripts/base/cmakemod.bat b/Install_mingw64/Install_CreaTools/scripts/base/cmakemod.bat new file mode 100644 index 0000000..2af51f0 --- /dev/null +++ b/Install_mingw64/Install_CreaTools/scripts/base/cmakemod.bat @@ -0,0 +1,71 @@ +REM --------------------------------------------------------------------- +REM +REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +REM pour la Santé) +REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +REM +REM This software is governed by the CeCILL-B license under French law and +REM abiding by the rules of distribution of free software. You can use, +REM modify and/ or redistribute the software under the terms of the CeCILL-B +REM license as circulated by CEA, CNRS and INRIA at the following URL +REM http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +REM or in the file LICENSE.txt. +REM +REM As a counterpart to the access to the source code and rights to copy, +REM modify and redistribute granted by the license, users are provided only +REM with a limited warranty and the software's author, the holder of the +REM economic rights, and the successive licensors have only limited +REM liability. +REM +REM The fact that you are presently reading this means that you have had +REM knowledge of the CeCILL-B license and that you accept its terms. +REM ------------------------------------------------------------------------ + +@echo off +echo ---------------------------- +echo -------cmakemod.bat--------- +echo ---------------------------- + +echo creasource = %1 +echo installPrefix = %2 +echo creatoolsGeneration = %3 + +echo Architecture found = %PROCESSOR_ARCHITECTURE% + +::if %PROCESSOR_ARCHITECTURE%==x86 ( +:: set ProgramFilesPath_x86=%ProgramFiles% +:: set "compilerVersion=Visual Studio 10" +::) else ( +:: set "ProgramFilesPath_x64=%ProgramFiles%" +:: set "ProgramFilesPath_x86=%ProgramFiles(x86)%" +:: set "compilerVersion=Visual Studio 10 Win64" +::) +::set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +::if not exist %vcvarsall% set vcvarsall="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +::if not exist %vcvarsall% ( +:: echo ERROR!!! Visual Studio has not been found in the system +:: exit +::) + +::if %platforme%==Win32 ( +:: call %vcvarsall% +:: set "compilerVersion=Visual Studio 10" +:: echo "Compilation forced x86" +::) else ( +:: if %PROCESSOR_ARCHITECTURE%==x86 ( +:: call %vcvarsall% +:: ) else ( +:: call %vcvarsall% amd64 +:: ) +::) + +set binfolder=%3\creatools_%buildtype%%platforme%\cb\%1Bin +cd %binfolder% + +echo cmake -G"%compilerVersion%" -H%3\creatools_sources\%1 -B%3\c_%buildtype%%platforme%\cb\%1Bin +echo cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt + +%cmakeBin% -G"MinGW Makefiles" -H%3\cs\%1 -B%3\c_%buildtype%%platforme%\cb\%1Bin +%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt + +exit /B \ No newline at end of file diff --git a/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat new file mode 100644 index 0000000..cf49c8c --- /dev/null +++ b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat @@ -0,0 +1,75 @@ +REM --------------------------------------------------------------------- +REM +REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +REM pour la Santé) +REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +REM +REM This software is governed by the CeCILL-B license under French law and +REM abiding by the rules of distribution of free software. You can use, +REM modify and/ or redistribute the software under the terms of the CeCILL-B +REM license as circulated by CEA, CNRS and INRIA at the following URL +REM http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +REM or in the file LICENSE.txt. +REM +REM As a counterpart to the access to the source code and rights to copy, +REM modify and redistribute granted by the license, users are provided only +REM with a limited warranty and the software's author, the holder of the +REM economic rights, and the successive licensors have only limited +REM liability. +REM +REM The fact that you are presently reading this means that you have had +REM knowledge of the CeCILL-B license and that you accept its terms. +REM ------------------------------------------------------------------------ + +@echo off +echo ---------------------------- +echo -------compilemod.bat------- +echo ---------------------------- + +echo buildtype = %1 +echo Module Sources = %2 +echo creatoolsGeneration = %3 + +echo Architecture found = %PROCESSOR_ARCHITECTURE% +::if %PROCESSOR_ARCHITECTURE%==x86 ( +:: set ProgramFilesPath_x86=%ProgramFiles% +: set "compilerVersion=Visual Studio 10" +::) else ( +:: set "ProgramFilesPath_x64=%ProgramFiles%" +:: set "ProgramFilesPath_x86=%ProgramFiles(x86)%" +:: set "compilerVersion=Visual Studio 10 Win64" +::) +::set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +::if not exist %vcvarsall% set vcvarsall="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +::if not exist %vcvarsall% ( +:: echo ERROR!!! Visual Studio has not been found in the system +:: exit +::) + +::if %platforme%==Win32 ( +:: call %vcvarsall% +:: set "compilerVersion=Visual Studio 10" +:: echo "Compilation forced x86" +::) else ( +:: if %PROCESSOR_ARCHITECTURE%==x86 ( +:: call %vcvarsall% +:: ) else ( +:: call %vcvarsall% amd64 +:: ) +::) + +set binfolder=%3\creatools_%buildtype%%platforme%\cb\%2Bin +cd %binfolder% +REM FOR /R %%a IN (*.sln) DO msbuild %%a /p:UseEnv=true;BuildInParallel=true;Configuration=%1 +REM msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 ALL_BUILD.vcxproj + +::msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 INSTALL.vcxproj +::msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 PACKAGE.vcxproj + +mingw32-make.exe -j%NUMBER_OF_PROCESSORS% +mingw32-make.exe install + +copy %2*.exe %3\c_%buildtype%%platforme%\ri\ + + +exit /B \ No newline at end of file diff --git a/Install_mingw64/Install_CreaTools/scripts/base/configureVariables.bat b/Install_mingw64/Install_CreaTools/scripts/base/configureVariables.bat index 9898039..eea7bbe 100644 --- a/Install_mingw64/Install_CreaTools/scripts/base/configureVariables.bat +++ b/Install_mingw64/Install_CreaTools/scripts/base/configureVariables.bat @@ -39,29 +39,29 @@ set creatoolssource=creaTools set creaminitoolssource=creaMiniTools set baseFolder=%scriptsFolder%\base -set creadll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creasource%Bin\%buildtype% +set creadll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%creasource%Bin\%buildtype% set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%bbtksource%Bin\%buildtype% +set bbtkdll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%bbtksource%Bin\%buildtype% set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creamaracassource%Bin\%buildtype% +set creamaracasdll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%creamaracassource%Bin\%buildtype% set PATH=%creamaracasdll%;%PATH% -set creavtkdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creavtkssource%Bin\%buildtype% +set creavtkdll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%creavtkssource%Bin\%buildtype% set PATH=%creavtkdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% +set creaenvironmentdll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%creaenvironmentsource%Bin\%buildtype% set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creabrukersource%Bin\%buildtype% +set creabrukerdll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%creabrukersource%Bin\%buildtype% set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creaimagesource%Bin\%buildtype% +set creaimagedll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%creaimagesource%Bin\%buildtype% set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creacontourssource%Bin\%buildtype% +set creacontourdll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%creacontourssource%Bin\%buildtype% set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% +set crearigidregistrationdll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%crearigidregistrationssource%Bin\%buildtype% set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% +set bbtkgeditordll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%bbtkgeditorsource%Bin\%buildtype% set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creaminitoolssource%Bin\%buildtype% +set creaminitoolsdll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%creaminitoolssource%Bin\%buildtype% set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creatoolssource%Bin\%buildtype% +set creatoolsdll=%creatoolsGeneration%\c_%buildtype%%platforme%\cb\%creatoolssource%Bin\%buildtype% set PATH=%creatoolssdll%;%PATH% echo End setting variables diff --git a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat index 033e8a7..9e751b5 100644 --- a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat +++ b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat @@ -28,30 +28,80 @@ echo cleaning prefix echo downloading creatools software +set GIT_SSH=C:\Program Files\PuTTY\plink.exe + echo echo tmp.sh > tmp.sh set creatoolsGeneration2=%creatoolsGeneration:\=/% -echo mkdir %creatoolsGeneration2% >> tmp.sh -echo mkdir %creatoolsGeneration2%/creatools_sources >> tmp.sh -echo cd %creatoolsGeneration2%/creatools_sources >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creasource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtksource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creamaracassource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creavtksource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaenvironmentsource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creabrukersource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaimagesource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creacontourssource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%crearigidregistrationssource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtkgeditorsource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creatoolssource% >> tmp.sh -echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaminitoolssource% >> tmp.sh +echo mkdir %creatoolsGeneration2% >> tmp.sh +echo mkdir %creatoolsGeneration2%/cs >> tmp.sh +echo cd %creatoolsGeneration2%/cs >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creasource% >> tmp.sh +echo cd %creasource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtksource% >> tmp.sh +echo cd %bbtksource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creamaracassource% >> tmp.sh +echo cd %creamaracassource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creavtksource% >> tmp.sh +echo cd %creavtksource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaenvironmentsource% >> tmp.sh +echo cd %creaenvironmentsource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creabrukersource% >> tmp.sh +echo cd %creabrukersource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaimagesource% >> tmp.sh +echo cd %creaimagesource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creacontourssource% >> tmp.sh +echo cd %creacontourssource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%crearigidregistrationssource% >> tmp.sh +echo cd %crearigidregistrationssource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtkgeditorsource% >> tmp.sh +echo cd %bbtkgeditorsource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creatoolssource% >> tmp.sh +echo cd %creatoolssource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh + +echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaminitoolssource% >> tmp.sh +echo cd %creaminitoolssource% >> tmp.sh +echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo cd .. >> tmp.sh echo call gitcall.bat "%cd%\tmp.sh" dir call gitcall.bat "%cd%\tmp.sh" - echo end of downloading creatools software +echo end of downloading creatools software exit diff --git a/Install_mingw64/Install_CreaTools/scripts/bbtkInstall.bat b/Install_mingw64/Install_CreaTools/scripts/bbtkInstall.bat new file mode 100644 index 0000000..84a9db8 --- /dev/null +++ b/Install_mingw64/Install_CreaTools/scripts/bbtkInstall.bat @@ -0,0 +1,35 @@ +REM --------------------------------------------------------------------- +REM +REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +REM pour la Santé) +REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +REM +REM This software is governed by the CeCILL-B license under French law and +REM abiding by the rules of distribution of free software. You can use, +REM modify and/ or redistribute the software under the terms of the CeCILL-B +REM license as circulated by CEA, CNRS and INRIA at the following URL +REM http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +REM or in the file LICENSE.txt. +REM +REM As a counterpart to the access to the source code and rights to copy, +REM modify and redistribute granted by the license, users are provided only +REM with a limited warranty and the software's author, the holder of the +REM economic rights, and the successive licensors have only limited +REM liability. +REM +REM The fact that you are presently reading this means that you have had +REM knowledge of the CeCILL-B license and that you accept its terms. +REM ------------------------------------------------------------------------ + +@echo off + +set currentdir=%~dp0 + +echo compile bbtk %buildType% %platforme% +call %baseFolder%\cleanmod.bat %bbtksource% %creatoolsGeneration% >> %logFolder%\bbtkInstall.log 2>&1 +call %baseFolder%\cmakemod.bat %bbtksource% %installPrefix% %creatoolsGeneration% >> %logFolder%\bbtkInstall.log 2>&1 +call %currentdir%\bbtkVariables.bat %creatoolsGeneration% %bbtksource% %docgeneration% %buildtype% >> %logFolder%\bbtkInstall.log 2>&1 +call %baseFolder%\compilemod.bat %buildtype% %bbtksource% %creatoolsGeneration% >> %logFolder%\bbtkInstall.log 2>&1 +call %baseFolder%\ctestmod.bat %bbtksource% %creatoolsGeneration% >> %logFolder%\bbtkInstall.log 2>&1 +echo end bbtk compilation +exit \ No newline at end of file diff --git a/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat b/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat new file mode 100644 index 0000000..fab3872 --- /dev/null +++ b/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat @@ -0,0 +1,54 @@ +REM --------------------------------------------------------------------- +REM +REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +REM pour la Santé) +REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +REM +REM This software is governed by the CeCILL-B license under French law and +REM abiding by the rules of distribution of free software. You can use, +REM modify and/ or redistribute the software under the terms of the CeCILL-B +REM license as circulated by CEA, CNRS and INRIA at the following URL +REM http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +REM or in the file LICENSE.txt. +REM +REM As a counterpart to the access to the source code and rights to copy, +REM modify and redistribute granted by the license, users are provided only +REM with a limited warranty and the software's author, the holder of the +REM economic rights, and the successive licensors have only limited +REM liability. +REM +REM The fact that you are presently reading this means that you have had +REM knowledge of the CeCILL-B license and that you accept its terms. +REM ------------------------------------------------------------------------ + +@echo off +echo ---------------------------- +echo -----bbtkVariables.bat------ +echo ---------------------------- + +echo creatoolsGeneration = %1 +echo bbtksourcefolder = %2 +echo docgeneration = %3 +echo buildType = %4 + +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin +cd %binfolder% + +IF %4==Debug ( +:: cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +%cmakeBin% cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + +::cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\cr_%buildtype%%platforme%\creatools_install\crea CMakeCache.txt +::cmake -D BUILD_BBTK_DOC:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=%3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=%3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=%3 CMakeCache.txt +::cmake CMakeCache.txt +::cmake CMakeCache.txt +::cmake CMakeCache.txt + +%cmakeBin% -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt +%cmakeBin% -D BUILD_BBTK_DOC:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=%3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=%3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=%3 CMakeCache.txt +%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt +%cmakeBin% CMakeCache.txt + + +exit /B diff --git a/Install_mingw64/Install_CreaTools/scripts/creaInstall.bat b/Install_mingw64/Install_CreaTools/scripts/creaInstall.bat new file mode 100644 index 0000000..7d97b56 --- /dev/null +++ b/Install_mingw64/Install_CreaTools/scripts/creaInstall.bat @@ -0,0 +1,37 @@ +REM --------------------------------------------------------------------- +REM +REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +REM pour la Santé) +REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +REM +REM This software is governed by the CeCILL-B license under French law and +REM abiding by the rules of distribution of free software. You can use, +REM modify and/ or redistribute the software under the terms of the CeCILL-B +REM license as circulated by CEA, CNRS and INRIA at the following URL +REM http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +REM or in the file LICENSE.txt. +REM +REM As a counterpart to the access to the source code and rights to copy, +REM modify and redistribute granted by the license, users are provided only +REM with a limited warranty and the software's author, the holder of the +REM economic rights, and the successive licensors have only limited +REM liability. +REM +REM The fact that you are presently reading this means that you have had +REM knowledge of the CeCILL-B license and that you accept its terms. +REM ------------------------------------------------------------------------ + +REM @echo off + +set currentdir=%~dp0 + +echo Compile crea %buildType% %platforme% +call %baseFolder%\cleanmod.bat %creasource% %creatoolsGeneration% >> %logFolder%\creaInstall.log 2>&1 +call %baseFolder%\cmakemod.bat %creasource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaInstall.log 2>&1 +call %currentdir%\creaVariables.bat %creatoolsGeneration% %creasource% %docgeneration% %buildType% >> %logFolder%\creaInstall.log 2>&1 +call %baseFolder%\compilemod.bat %buildtype% %creasource% %creatoolsGeneration% >> %logFolder%\creaInstall.log 2>&1 +call %baseFolder%\ctestmod.bat %creasource% %creatoolsGeneration% >> %logFolder%\creaInstall.log 2>&1 + +echo end of crea compilation + +exit \ No newline at end of file diff --git a/Install_mingw64/Install_CreaTools/scripts/creaVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaVariables.bat new file mode 100644 index 0000000..ace0ff0 --- /dev/null +++ b/Install_mingw64/Install_CreaTools/scripts/creaVariables.bat @@ -0,0 +1,52 @@ +REM --------------------------------------------------------------------- +REM +REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +REM pour la Santé) +REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +REM +REM This software is governed by the CeCILL-B license under French law and +REM abiding by the rules of distribution of free software. You can use, +REM modify and/ or redistribute the software under the terms of the CeCILL-B +REM license as circulated by CEA, CNRS and INRIA at the following URL +REM http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +REM or in the file LICENSE.txt. +REM +REM As a counterpart to the access to the source code and rights to copy, +REM modify and redistribute granted by the license, users are provided only +REM with a limited warranty and the software's author, the holder of the +REM economic rights, and the successive licensors have only limited +REM liability. +REM +REM The fact that you are presently reading this means that you have had +REM knowledge of the CeCILL-B license and that you accept its terms. +REM ------------------------------------------------------------------------ + +@echo off +echo ---------------------------- +echo -----creaVariables.bat------ +echo ---------------------------- + +echo creatoolsGeneration = %1 +echo creasource = %2 +echo docgeneration = %3 +echo buildType = %4 + +set binfolder=%1\creatools_%buildtype%%platforme%\cb\%2Bin +cd %binfolder% + +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + +::IF %PROCESSOR_ARCHITECTURE%==x86 ( +:: cmake -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt +::) ELSE ( +:: cmake -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CREA_BUILD_WX_X64:BOOL=ON CMakeCache.txt +::) + +%cmakeBin% -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CREA_BUILD_WX_X64:BOOL=ON CMakeCache.txt +%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=-fpermissive CMakeCache.txt +::%cmakeBin% -D WXWIDGETS_ROOT_DIR:PATH='%WXWIN%' CMakeCache.txt +::%cmakeBin% -D WXWIDGETS_ROOT_DIR="uno dos tres" CMakeCache.txt + +exit /B \ No newline at end of file diff --git a/Install_mingw64/Install_CreaTools/scripts/tmp.sh b/Install_mingw64/Install_CreaTools/scripts/tmp.sh index f542fa0..409d9ab 100644 --- a/Install_mingw64/Install_CreaTools/scripts/tmp.sh +++ b/Install_mingw64/Install_CreaTools/scripts/tmp.sh @@ -1,16 +1,52 @@ echo tmp.sh -mkdir C:/Users/davila/Creatools/C5/ct -mkdir C:/Users/davila/Creatools/C5/ct/creatools_sources -cd C:/Users/davila/Creatools/C5/ct/creatools_sources -git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea -git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtk -git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMaracasVisu -git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaVtk -git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaEnvironment -git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaBruker -git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaImageIO -git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaContours -git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaRigidRegistration -git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtkGEditor -git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaTools -git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMiniTools +mkdir C:/Users/davila/Creatools/C5/ct +mkdir C:/Users/davila/Creatools/C5/ct/cs +cd C:/Users/davila/Creatools/C5/ct/cs +git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea +cd crea +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtk +cd bbtk +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMaracasVisu +cd creaMaracasVisu +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaVtk +cd creaVtk +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaEnvironment +cd creaEnvironment +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaBruker +cd creaBruker +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaImageIO +cd creaImageIO +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaContours +cd creaContours +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaRigidRegistration +cd creaRigidRegistration +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtkGEditor +cd bbtkGEditor +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaTools +cd creaTools +git checkout vtk7itk4wx3-mingw64 +cd .. +git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMiniTools +cd creaMiniTools +git checkout vtk7itk4wx3-mingw64 +cd .. diff --git a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt new file mode 100644 index 0000000..0df5dff --- /dev/null +++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt @@ -0,0 +1,40 @@ +PROJECT(crea_TPdlls) + +cmake_minimum_required(VERSION 2.6) + +SET(PROJECT_MAJOR_VERSION 4) +SET(PROJECT_MINOR_VERSION 0) +SET(PROJECT_BUILD_VERSION 0) + +SET(CREA_VERBOSE_CMAKE TRUE) + + +MACRO (TODAY RESULT) + IF (WIN32) + EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT}) + string(REGEX REPLACE "(..)/(..)/..(..).*" "\\1/\\2/\\3" ${RESULT} ${${RESULT}}) + ELSEIF(UNIX) + EXECUTE_PROCESS(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE ${RESULT}) + string(REGEX REPLACE "(..)/(..)/..(..).*" "\\1/\\2/\\3" ${RESULT} ${${RESULT}}) + ELSE (WIN32) + MESSAGE(SEND_ERROR "date not implemented") + SET(${RESULT} 000000) + ENDIF (WIN32) +ENDMACRO (TODAY) + + +TODAY(CREATOOLS_COMPILATION_DATE) + + +## Project: @CMAKE_PROJECT_NAME@ +## Version: @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_BUILD_VERSION@ +## Platform: @CREATOOLS_PLATFORM@ +## Build Type: @CREATOOLS_BUILDTYPE@ +##Compilation date: @CREATOOLS_COMPILATION_DATE@ + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/Version.txt.in + ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/Version.txt + @ONLY IMMEDIATE + ) + +SUBDIRS(install) diff --git a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt new file mode 100644 index 0000000..276a7e7 --- /dev/null +++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt @@ -0,0 +1 @@ +Please refer to each software license. \ No newline at end of file diff --git a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt new file mode 100644 index 0000000..a818d32 --- /dev/null +++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt @@ -0,0 +1,19 @@ +To build creaThird party dlls 2 mechanisms are proposed + +The first one involves the installation directories where you compiled the libraries +wxWidgets, GDCM, VTK, ITK, boost and QT + +This will recurse into the directories finding the corresponding dlls, and creating the +installer with them. + +The second mechanism will ask for a directory where all the dlls must be placed before hand. +This mechanism will be easier if you have compiled and install each library and you have created +the creaThirdPartyLibraries installer. + +Launch the CMakeLists.txt file and Give the directory where all the dlls are located. +Add the tth directory as this was added in previous releases. + +End + + +(c) CREATIS 2009 \ No newline at end of file diff --git a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/Version.txt.in b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/Version.txt.in new file mode 100644 index 0000000..b116cc9 --- /dev/null +++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/Version.txt.in @@ -0,0 +1,31 @@ +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Santé) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ + + + Project: @CMAKE_PROJECT_NAME@ + Version: @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_BUILD_VERSION@ + Platform: @CREATOOLS_PLATFORM@ + Build Type: @CREATOOLS_BUILDTYPE@ +Compilation date: @CREATOOLS_COMPILATION_DATE@ + + \ No newline at end of file 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 new file mode 100644 index 0000000..b753986 --- /dev/null +++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt @@ -0,0 +1,177 @@ + +#----------------------------------------------------------------------------- +# CPACK+NSIS PACKAGING +#----------------------------------------------------------------------------- + +#---Documentation------------- +#http://www.cmake.org/Wiki/CMake:Packaging_With_CPack +#http://www.cmake.org/Wiki/CMake:CPackConfiguration +#http://www.cmake.org/Wiki/CMake:Install_Commands + + +INCLUDE(InstallRequiredSystemLibraries) + +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME} - CREATIS") +SET(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-${CREATOOLS_BUILDTYPE}") +SET(CPACK_PACKAGE_VENDOR "CREATIS") +SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt") +SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt") +SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION}) +SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION}) +SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION}) + + +SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + IF(WIN32) + SET(CMAKE_INSTALL_PREFIX C:/CreaTools/crea_dlls_extern) + ENDIF(WIN32) + + +IF(WIN32 AND NOT UNIX) + # There is a bug in NSI that does not handle full unix paths properly. Make + # sure there is at least one set of four (4) backlasshes. +#EED SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp") +# SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe") + SET(CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME}") + SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") + 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) + + set (CREA_BOOST_LYBRARY boost) + set (CREA_GDCM_LYBRARY gdcm13 ) + set (CREA_ITK_LYBRARY itk ) + set (CREA_QT_LYBRARY qt ) + set (CREA_VTK_LYBRARY vtk ) + set (CREA_WXWIN_LYBRARY wxWidgets) + set (CREA_XERCES_LYBRARY xerces) + set (CREA_SQLITE_LYBRARY sqlite) + set (CREA_SQLITE_LYBRARY tth) + +ELSE(WIN32 AND NOT UNIX) +# SET(CPACK_STRIP_FILES "bin/bbi") + SET(CPACK_SOURCE_STRIP_FILES "") +ENDIF(WIN32 AND NOT UNIX) +#SET(CPACK_PACKAGE_EXECUTABLES "TestWxGimmickDialog" "Gimmick!") + +# Aditional INSTALL for CPACK mecanism. +IF(WIN32) + set (MessageLibraryPath "CREA_LIBRARY_DLL_PATH (itk,vtk,gdcm,wx,qt,tth)") + set (CREA_LIBRARY_DLL_PATH "" CACHE PATH ${MessageLibraryPath} ) + IF(NOT CREA_LIBRARY_DLL_PATH) + MESSAGE(FATAL_ERROR "${MessageLibraryPath} not found") + ENDIF(NOT CREA_LIBRARY_DLL_PATH) +## INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.dll DESTINATION bin ) + STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}") + # INSTALL( FILES ${WINDIR}/system32/msvcp71d.dll DESTINATION bin/ ) + # INSTALL( FILES ${WINDIR}/system32/msvcr71d.dll DESTINATION bin/ ) + + + INSTALL(FILES ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/Version.txt DESTINATION . ) + INSTALL(DIRECTORY ${CREA_LIBRARY_DLL_PATH}/ DESTINATION . ) + +#EED 19-11-2009 +# FILE(GLOB LST_FILE_DLL "${CREA_LIBRARY_DLL_PATH}/*.dll") +# FOREACH( iLST ${LST_FILE_DLL} ) +# INSTALL( +# FILES ${iLST} +# DESTINATION bin/ +# ) +# ENDFOREACH(iLST) + +#EED 19-11-2009 +# FILE(GLOB LST_FILE_TTH "${CREA_LIBRARY_DLL_PATH}/tth/*.*") +# FOREACH( iLST ${LST_FILE_TTH} ) +# INSTALL( +# FILES ${iLST} +# DESTINATION bin/tth/ +# ) +# ENDFOREACH(iLST) + +#EED 19-11-2009 +# SET(MIKTEXDIR "${CREA_LIBRARY_DLL_PATH}/MikTex-2.7/") +# INSTALL( +# DIRECTORY ${MIKTEXDIR} +# DESTINATION bin/MikTex-2.7 +# ) + +#EED-08oct2009 STRING(REGEX REPLACE "\\\\" "/" ENVPATH "$ENV{Path}") + +#EED 19-11-2009 +# SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin") + + SET(CREA_DLLS_DIR "$INSTDIR\\\\bin") + SET(CREATPDLLS_DIRBIN "$INSTDIR") + +#EED 19-11-2009 +# SET(CREATIS_ENVIRONMENT_DIRS ";${CREA_DLLS_DIR};${MIKTEX_INSTALL_DIR}") + SET(CREATIS_THIRDPARTYDLLS_DIRS ";${CREA_DLLS_DIR}") + + + SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " + + +#EED 19-11-2009 +# WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' + + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'CREATIS_THIRDPARTYDLLS_DIRS' '${CREATIS_THIRDPARTYDLLS_DIRS}' + + !define Install_ReadEnvStr_RegKey 'HKCU \\\"Environment\\\"' + ReadRegStr $0 \\\${Install_ReadEnvStr_RegKey} 'PATH' + + Push '$0;' + Push '%CREATIS_THIRDPARTYDLLS_DIRS%' + Call StrStr + Pop $2 + StrCmp $2 '' '' AddToPath_doneEED + StrCpy $0 \\\"$0;%CREATIS_THIRDPARTYDLLS_DIRS%\\\" + WriteRegExpandStr \\\${Install_ReadEnvStr_RegKey} 'PATH' $0 + + AddToPath_doneEED: + + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'BOOST_ROOT' '$INSTDIR\\\\' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'GDCM_DIR' '$INSTDIR\\\\lib\\\\gdcm\\\\' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'ITK_DIR' '$INSTDIR\\\\lib\\\\cmake\\\\ITK-4.12\\\\' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'QTDIR' '$INSTDIR\\\\' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'VTK_DIR' '$INSTDIR\\\\lib\\\\cmake\\\\vtk-8.1\\\\' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'WXWIN' '$INSTDIR\\\\' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'XERCES_DIR' '$INSTDIR\\\\cmake' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'SQLITE_DIR' '$INSTDIR\\\\' + WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\' + + CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Version.txt.lnk' '${CREATPDLLS_DIRBIN}\\\\Version.txt' + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 + + + ") + + SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " + !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP + Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Version.txt.lnk' + + StrCpy $MUI_TEMP '$SMPROGRAMS\\\\$MUI_TEMP' + RMDir /r $MUI_TEMP + + !define Uninstall_EnvStr_RegKey 'HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'CREATIS_THIRDPARTYDLLS_DIRS' '' + + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'BOOST_ROOT' '' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'GDCM_DIR' '' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'ITK_DIR' '' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'QTDIR' '' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'VTK_DIR' '' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'WXWIN' '' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'XERCES_DIR' '' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'SQLITE_DIR' '' + WriteRegExpandStr \\\${Uninstall_EnvStr_RegKey} 'TTH' '' + + SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 + + ") + + + + +ENDIF(WIN32) + +INCLUDE(CPack) \ No newline at end of file diff --git a/Install_mingw64/Install_ThirdParty/scripts/ctestmod.bat b/Install_mingw64/Install_ThirdParty/scripts/ctestmod.bat new file mode 100644 index 0000000..6f63beb --- /dev/null +++ b/Install_mingw64/Install_ThirdParty/scripts/ctestmod.bat @@ -0,0 +1,47 @@ +REM --------------------------------------------------------------------- +REM +REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +REM pour la Santé) +REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +REM +REM This software is governed by the CeCILL-B license under French law and +REM abiding by the rules of distribution of free software. You can use, +REM modify and/ or redistribute the software under the terms of the CeCILL-B +REM license as circulated by CEA, CNRS and INRIA at the following URL +REM http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +REM or in the file LICENSE.txt. +REM +REM As a counterpart to the access to the source code and rights to copy, +REM modify and redistribute granted by the license, users are provided only +REM with a limited warranty and the software's author, the holder of the +REM economic rights, and the successive licensors have only limited +REM liability. +REM +REM The fact that you are presently reading this means that you have had +REM knowledge of the CeCILL-B license and that you accept its terms. +REM ------------------------------------------------------------------------ + +@echo off +echo ---------------------------- +echo -------ctestmod.bat--------- +echo ---------------------------- +echo Module Sources = %1 +echo creatoolsGeneration = %2 + +set binfolder=%2\creatools_%buildtype%%platforme%\creatools_bin\%1Bin + +cd %binfolder% + +:: EED>> cmake -D BUILD_TESTING:BOOL=OFF -D INCLUDE_CTEST:BOOL=OFF CMakeCache.txt + +:: EED>> ctest -D ContinuousStart -D ContinuousUpdate -D ContinuousConfigure -D ContinuousBuild -D ContinuousTest -D ContinuousSubmit +:: EED>> ctest -D ContinuousMemCheck -D ContinuousSubmit +:: EED>> ctest -D ExperimentalStart -D ExperimentalUpdate -D ExperimentalConfigure -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit +:: EED>> ctest -D ExperimentalMemCheck -D ExperimentalSubmit + +:: EED-12mai2011>> ctest -D ExperimentalConfigure -D ExperimentalBuild + +:: EED>> ctest -D NightlyStart -D NightlyUpdate -D NightlyConfigure -D NightlyBuild -D NightlyTest -D NightlySubmit +:: EED>> ctest -D NightlyMemCheck -D NightlySubmit + +exit /B \ No newline at end of file diff --git a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat index 834d273..6cd3fcf 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat @@ -63,7 +63,7 @@ set WXFNAME=wxWidgets-3.1.1.7z set WXVERSION=3.1.1 :: set BOOSTFNAME=boost_1_49_0.7z :: set BOOSTFNAME=boost_1_52_0.7z -set BOOSTFNAME=boost_1_64_0.7z +set BOOSTFNAME=boost_1_63_0.7z ::set XERCESFNAME=xerces-c-3.1.1.zip ::set XERCESFNAME=xerces-c-3.1.4.zip set XERCESFNAME=xerces-c-3.2.1.zip diff --git a/Install_mingw64/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat b/Install_mingw64/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat new file mode 100644 index 0000000..7f5ab6e --- /dev/null +++ b/Install_mingw64/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat @@ -0,0 +1,15 @@ +@echo off + +set thirdpartyGeneration=%1 +set buildType=%2 +set x86Comp=%3 + +set LogFolder=%thirdpartyGeneration%\installLog + +::echo Calling move_thirdparty_dlls.bat +::call move_thirdparty_dlls.bat %thirdpartyGeneration% %buildType% %x86Comp% >> %LogFolder%\generateThirdpartydllsExe.log 2>&1 + +echo Calling install_thirdparty_dlls_cmake.bat +call install_thirdparty_dlls_cmake.bat %thirdpartyGeneration% %buildType% %x86Comp% >> %LogFolder%\generateThirdpartydllsExe.log 2>&1 + +::exit \ No newline at end of file diff --git a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat index 17b4444..4493e80 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -7,8 +7,6 @@ echo ----------------------------------- echo ---Setting Environment Variables--- echo ----------------------------------- -set cmakeBin=C:\Users\davila\Creatools\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe - set thirdpartyGeneration=%1 set buildType=%2 ::The following line is to force x86 or x64 compilation @@ -132,12 +130,12 @@ cd %wxWidgets%Bin ::) ::cd C:\ -%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%wxWidgets% -B%binpath%\%wxWidgets%Bin >> %LogFolder%\wxWidgetsInstall.log 2>&1 -%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%wxWidgets%\ CMakeCache.txt >> %LogFolder%\wxWidgetsInstall.log 2>&1 -::cmake -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt >> %LogFolder%\wxWidgetsInstall.log 2>&1 -::cmake -D VTK_Group_Views:BOOL=ON CMakeCache.txt >> %LogFolder%\wxWidgetsInstall.log 2>&1 -mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\wxWidgetsInstall.log 2>&1 -mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install >> %LogFolder%\wxWidgetsInstall.log 2>&1 +%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%wxWidgets% -B%binpath%\%wxWidgets%Bin >> %LogFolder%\wxWidgetsInstall.log 2>&1 +%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\wxWidgetsInstall.log 2>&1 +::cmake -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt >> %LogFolder%\wxWidgetsInstall.log 2>&1 +::cmake -D VTK_Group_Views:BOOL=ON CMakeCache.txt >> %LogFolder%\wxWidgetsInstall.log 2>&1 +mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\wxWidgetsInstall.log 2>&1 +mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install >> %LogFolder%\wxWidgetsInstall.log 2>&1 :SKIPINSTALLWXWIDGETS @@ -154,7 +152,7 @@ mkdir %binpath%\%boost%Bin mkdir %binpath%\%boost%Bin\boost-build mkdir %binpath%\%boost%Bin\build :: mkdir %binpath%\%boost%Bin\boost -mkdir %installpath%\%boost% +:: mkdir %installpath%\%boost% cd %sourcepath%\%boost%\tools\build call bootstrap.bat gcc >> %LogFolder%\boostInstall.log 2>&1 @@ -164,7 +162,7 @@ echo %PATH% >> %LogFolder%\boostInstall.log 2>&1 cd %sourcepath%\%boost%\ :: --with-system --with-signals -b2 --build-dir=%binpath%\%boost%Bin\build --prefix=%installpath%\%boost% toolset=gcc variant=%buildType% link=shared runtime-link=shared -j %NUMBER_OF_PROCESSORS% install >> %LogFolder%\boostInstall.log 2>&1 +b2 --build-dir=%binpath%\%boost%Bin\build --prefix=%installpath%\ toolset=gcc cxxflags="-std=c++98" variant=%buildType% link=shared runtime-link=shared -j %NUMBER_OF_PROCESSORS% install >> %LogFolder%\boostInstall.log 2>&1 :: cd %sourcepath%\%boost% @@ -220,7 +218,7 @@ cd %vtk%Bin ::cd c:\ %cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin >> %LogFolder%\VTKInstall.log 2>&1 -%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%vtk%\ CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 +%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 %cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 %cmakeBin% -D VTK_Group_Views:BOOL=ON CMakeCache.txt >> %LogFolder%\VTKInstall.log 2>&1 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\VTKInstall.log 2>&1 @@ -254,7 +252,7 @@ cd %gdcm%Bin ::msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\GDCMInstall.log 2>&1 ::cd c:\ %cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin >> %LogFolder%\GDCMInstall.log 2>&1 -%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%gdcm%\ CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1 +%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1 %cmakeBin% -D VTK_DIR:PATH=%binpath%\%vtk%Bin\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1 %cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\GDCMInstall.log 2>&1 @@ -280,7 +278,7 @@ cd %itk%Bin ::) %cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin >> %LogFolder%\ITKInstall.log 2>&1 -%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 +%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 %cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 %cmakeBin% -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview::BOOL=ON CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\ITKInstall.log 2>&1 @@ -305,9 +303,11 @@ echo ----------------------------------- ::FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1 ::msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1 ::cd c:\ - +cd %binpath% +mkdir %xercesc%Bin +cd %xercesc%Bin %cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%xercesc% -B%binpath%\%xercesc%Bin >> %LogFolder%\wercesInstall.log 2>&1 -%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%xercesc%\ CMakeCache.txt >> %LogFolder%\wercesInstall.log 2>&1 +%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\wercesInstall.log 2>&1 ::%cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt >> %LogFolder%\wercesInstall.log 2>&1 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\wercesInstall.log 2>&1 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install >> %LogFolder%\wercesInstall.log 2>&1 @@ -343,11 +343,11 @@ cd %SQLite%Bin ::msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj >> %LogFolder%\SQLiteInstall.log 2>&1 ::cd c:\ -%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%SQLite% -B%binpath%\%SQLite%Bin >> %LogFolder%\SQLiteInstall.log 2>&1 -%cmakeBin% -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%SQLite%\ CMakeCache.txt >> %LogFolder%\SQLiteInstall.log 2>&1 -%cmakeBin% CMakeCache.txt >> %LogFolder%\SQLiteInstall.log 2>&1 -mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\GDCMInstall.log 2>&1 -mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install >> %LogFolder%\GDCMInstall.log 2>&1 +%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%SQLite% -B%binpath%\%SQLite%Bin >> %LogFolder%\SQLiteInstall.log 2>&1 +%cmakeBin% -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\SQLiteInstall.log 2>&1 +%cmakeBin% CMakeCache.txt >> %LogFolder%\SQLiteInstall.log 2>&1 +mingw32-make.exe -j%NUMBER_OF_PROCESSORS% >> %LogFolder%\GDCMInstall.log 2>&1 +mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install >> %LogFolder%\GDCMInstall.log 2>&1 :SKIPINSTALLSQLite diff --git a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat new file mode 100644 index 0000000..8d762aa --- /dev/null +++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat @@ -0,0 +1,85 @@ +@echo off +echo ----------------------------------- +echo -----Generating Installers of------ +echo -------creaThirdPartyDlls---------- +echo ----------------------------------- +echo ----------------------------------- +echo ------Asking Architecture---------- +echo ----------------------------------- + +::if %PROCESSOR_ARCHITECTURE%==x86 ( +:: set ProgramFilesPath_x86=%ProgramFiles% +:: echo "Architecture found = x86" +::) else ( +:: set "ProgramFilesPath_x86=%ProgramFiles(x86)%" +:: echo "Architecture found = x64" +::) + +echo ----End Asking Architecture-------- + +set thirdpartyGeneration=%1 +set buildType=%2 +::The following line is to force x86 or x64 compilation +set x86Comp=%3 + + +set thirdparty_cmake=%cd%\..\cmake + +::set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" + +set thirdpartydllspath=%thirdpartyGeneration%\tpi\ +set sourcepath=%thirdparty_cmake%\crea_ThirdParty_dlls +set binpath=%thirdpartyGeneration%\tpb\crea_ThirdParty_dlls_Bin +::set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls" + +::if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +::if not exist %vcvarsall% ( +:: echo ERROR!!! Visual Studio has not been found in the system +:: exit +::) + +::if %x86Comp%==ON ( +:: call %vcvarsall% +:: set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls" +:: echo "Compilation forced x86" +::) else ( +:: if %PROCESSOR_ARCHITECTURE%==x86 ( +:: call %vcvarsall% +:: set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls" +:: ) else ( +:: call %vcvarsall% amd64 +:: set installpath="%ProgramFiles%\creatools\crea_ThirdParty_dlls" +:: ) +::) + +rmdir /S /Q %binpath% +mkdir %binpath% +cd %binpath% + +::if %x86Comp%==ON ( +:: set buildPlatform=win32 +:: cmake -G"Visual Studio 10" -H%sourcepath% -B%binpath% +::) else ( +:: if %PROCESSOR_ARCHITECTURE%==x86 ( +:: set buildPlatform=win32 +:: cmake -G"Visual Studio 10" -H%sourcepath% -B%binpath% +:: ) else ( +:: set buildPlatform=win64 +:: cmake -G"Visual Studio 10 Win64" -H%sourcepath% -B%binpath% +:: ) +::) + +::cmake -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform% CMakeCache.txt +::cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt +::cmake -D CREA_LIBRARY_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt +::cmake CMakeCache.txt +::FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% +::msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% PACKAGE.vcxproj + +%cmakeBin% -G"MinGW Makefiles" -H%sourcepath% -B%binpath% >> %LogFolder%\dlls_cmake.log 2>&1 +%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt >> %LogFolder%\dlls_cmake.log 2>&1 +%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 + + +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 f3107f0..d471907 100644 --- a/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat +++ b/Install_mingw64/Install_ThirdParty/scripts/tpl_variables.bat @@ -1,10 +1,13 @@ -set EEDclean=TRUE + +set cmakeBin=C:\Users\davila\Creatools\For_mingw64\DeveloperTools\cmake-3.11.2-win64-x64\bin\cmake.exe + +set EEDclean=FALSE set EEDcleanSOURCES=FALSE set EEDcleanBIN=TRUE set EEDcleanINSTALL=TRUE set EEDcleanLOGS=TRUE -set EEDdownload=TRUE +set EEDdownload=FALSE set EEDdownloadQT=FALSE set EEDdownloadITK=FALSE set EEDdownloadWXWINDOWS=FALSE @@ -17,13 +20,13 @@ set EEDdownloadSQLite=FALSE set EEDinstall=TRUE set EEDinstallQT=FALSE -set EEDinstallWXWIDGETS=TRUE +set EEDinstallWXWIDGETS=FALSE set EEDinstallBOOST=TRUE -set EEEDinstallVTK=TRUE -set EEDinstallGDCM=TRUE -set EEDinstallITK=TRUE -set EEDinstallXERCES=TRUE -set EEDinstallSQLite=TRUE +set EEEDinstallVTK=FALSE +set EEDinstallGDCM=FALSE +set EEDinstallITK=FALSE +set EEDinstallXERCES=FALSE +set EEDinstallSQLite=FALSE set EEDinstallerDLL=FALSE -set EEDinstallerLibraries=TRUE +set EEDinstallerLibraries=FALSE diff --git a/Install_mingw64/Readme_EED.txt b/Install_mingw64/Readme_EED.txt index 1760ac9..9fac0d9 100644 --- a/Install_mingw64/Readme_EED.txt +++ b/Install_mingw64/Readme_EED.txt @@ -23,6 +23,10 @@ 3. Compile Third Party Library (tpl) install-All.bat 4. Compila Creatools + -Instalar basic-miktex-2.9.6753-x64.exe + -plink: configurar en creaToolsTools\Install_mingw64\Install_CreaTools/downloadSources.bat + set GIT_SSH=C:\Program Files\PuTTY\plink.exe + -ssh: Exportar la llave generada en linux en formato ppk. cargar la llave con pagent. (doble click en el archivo ppk) ::Nota, correr todo para bajar los fuentes, el ( unzip 7z ) no lo enuentra en la segunda corrida cuando se quite la opcion de clean y download se renombran los source automatidacmente (OJO con wxWindgets, hay que hacerlo a mano)