From e524068923662bbcdd62b752e6c5409190a2c693 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 4 Jul 2014 16:42:15 +0200 Subject: [PATCH] 2424 creaToolsTools Feature New Normal Add creaVtk Library in Windows version --- Install/scripts/All.bat | 5 +-- Install/scripts/All2.bat | 9 ++-- Install/scripts/base/configureVariables.bat | 3 ++ Install/scripts/base/downloadSources.bat | 1 + Install/scripts/creaVtk/creaVtkInstall.bat | 36 ++++++++++++++++ Install/scripts/creaVtk/creaVtkVariables.bat | 44 ++++++++++++++++++++ 6 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 Install/scripts/creaVtk/creaVtkInstall.bat create mode 100644 Install/scripts/creaVtk/creaVtkVariables.bat diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat index 3bf17f7..766a750 100644 --- a/Install/scripts/All.bat +++ b/Install/scripts/All.bat @@ -44,15 +44,14 @@ cd %scriptsFolder% call All2.bat %creatoolsGeneration% %docGeneration% Release Win64 cd %scriptsFolder% -call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64 +call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 cd %scriptsFolder% -call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 +call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64 cd %scriptsFolder% call All2.bat %creatoolsGeneration% %docGeneration% Debug Win32 - echo ..End.. cd %scriptsFolder% diff --git a/Install/scripts/All2.bat b/Install/scripts/All2.bat index 7462105..3beee4b 100644 --- a/Install/scripts/All2.bat +++ b/Install/scripts/All2.bat @@ -46,17 +46,17 @@ mkdir creatools_%buildtype%%platforme%\installLog echo call configure variables call %scriptsFolder%\base\configureVariables.bat -REM goto skypToEED -REM :skypToEED - +REM goto skypToEED +REM :skypToEED echo call compile crea -echo start /B /wait %scriptsFolder%\crea\creaInstall.bat start /B /wait %scriptsFolder%\crea\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%\creaMaracasVisu\creaVtkInstall.bat echo call compile creaEnvironment start /B /wait %scriptsFolder%\creaEnvironment\creaEnvironmentInstall.bat echo call compile creaBruker @@ -73,6 +73,7 @@ echo call compile creaMinitools start /B /wait %scriptsFolder%\creaTools\creaMinitoolsInstall.bat + echo THIS HAS TO BE THE LAST STEP... echo call compile creaTools start /B /wait %scriptsFolder%\creaTools\creaToolsInstall.bat diff --git a/Install/scripts/base/configureVariables.bat b/Install/scripts/base/configureVariables.bat index 15a115a..9898039 100644 --- a/Install/scripts/base/configureVariables.bat +++ b/Install/scripts/base/configureVariables.bat @@ -28,6 +28,7 @@ echo setting variables set creasource=crea set bbtksource=bbtk set creamaracassource=creaMaracasVisu +set creavtksource=creaVtk set creaenvironmentsource=creaEnvironment set creabrukersource=creaBruker set creaimagesource=creaImageIO @@ -44,6 +45,8 @@ set bbtkdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin set PATH=%bbtkdll%;%PATH% set creamaracasdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creamaracassource%Bin\%buildtype% set PATH=%creamaracasdll%;%PATH% +set creavtkdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creavtkssource%Bin\%buildtype% +set PATH=%creavtkdll%;%PATH% set creaenvironmentdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% set PATH=%creaenvironmentdll%;%PATH% set creabrukerdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creabrukersource%Bin\%buildtype% diff --git a/Install/scripts/base/downloadSources.bat b/Install/scripts/base/downloadSources.bat index ed5b1ca..62167c0 100644 --- a/Install/scripts/base/downloadSources.bat +++ b/Install/scripts/base/downloadSources.bat @@ -36,6 +36,7 @@ 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/%creaVtk% >> 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 diff --git a/Install/scripts/creaVtk/creaVtkInstall.bat b/Install/scripts/creaVtk/creaVtkInstall.bat new file mode 100644 index 0000000..890f89d --- /dev/null +++ b/Install/scripts/creaVtk/creaVtkInstall.bat @@ -0,0 +1,36 @@ +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 creaVtk %buildtype% %platforme% +call %baseFolder%\cleanmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1 +call %baseFolder%\cmakemod.bat %creamaracassource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1 +call %currentdir%\creaVtkVariables.bat %creatoolsGeneration% %creamaracassource% %docgeneration% %buildtype% >> %logFolder%\creaVtkInstall.log 2>&1 +call %baseFolder%\compilemod.bat %buildtype% %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1 +call %baseFolder%\ctestmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaVtkVisuInstall.log 2>&1 +echo end of creaVtk compilation + +exit \ No newline at end of file diff --git a/Install/scripts/creaVtk/creaVtkVariables.bat b/Install/scripts/creaVtk/creaVtkVariables.bat new file mode 100644 index 0000000..cdc3e9d --- /dev/null +++ b/Install/scripts/creaVtk/creaVtkVariables.bat @@ -0,0 +1,44 @@ +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 --creaVtkVariables.bat-- +echo ---------------------------- + +echo creatoolsGeneration = %1 +echo creavtksourcefolder = %2 +echo docgeneration = %3 +echo buildType = %4 + +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin +cd %binfolder% + + +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 +cmake -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON -D creaVtk_DOC:BOOL=%3 CMakeCache.txt +cmake -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt +cmake CMakeCache.txt + +exit /B \ No newline at end of file -- 2.47.1