From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr> Date: Wed, 14 Aug 2013 09:47:53 +0000 (+0200) Subject: 1708 Feature Clean the installation script. X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3e1fe2cc17634ebb2ad535a71ac331ec3c6faa02;p=creaToolsTools.git 1708 Feature Clean the installation script. --- diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat index 54d1318..3bf17f7 100644 --- a/Install/scripts/All.bat +++ b/Install/scripts/All.bat @@ -43,14 +43,14 @@ echo %cd% cd %scriptsFolder% call All2.bat %creatoolsGeneration% %docGeneration% Release Win64 -REM cd %scriptsFolder% -REM call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64 +cd %scriptsFolder% +call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64 -REM cd %scriptsFolder% -REM call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 +cd %scriptsFolder% +call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 -REM cd %scriptsFolder% -REM call All2.bat %creatoolsGeneration% %docGeneration% Debug Win32 +cd %scriptsFolder% +call All2.bat %creatoolsGeneration% %docGeneration% Debug Win32 echo ..End.. diff --git a/Install/scripts/All2.bat b/Install/scripts/All2.bat index cff2fd7..7462105 100644 --- a/Install/scripts/All2.bat +++ b/Install/scripts/All2.bat @@ -46,8 +46,9 @@ 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 diff --git a/Install/scripts/base/compilemod.bat b/Install/scripts/base/compilemod.bat index 73bbe4c..c7a3c83 100644 --- a/Install/scripts/base/compilemod.bat +++ b/Install/scripts/base/compilemod.bat @@ -60,8 +60,8 @@ if %platforme%==Win32 ( set binfolder=%3\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% -FOR /R %%a IN (*.sln) DO msbuild %%a /p:UseEnv=true;BuildInParallel=true;Configuration=%1 -msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 ALL_BUILD.vcxproj +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 copy %2*.exe %3\creatools_%buildtype%%platforme%\Result_Installers\ diff --git a/Install/scripts/base/ctestmod.bat b/Install/scripts/base/ctestmod.bat index 3f155e8..6f63beb 100644 --- a/Install/scripts/base/ctestmod.bat +++ b/Install/scripts/base/ctestmod.bat @@ -32,7 +32,7 @@ set binfolder=%2\creatools_%buildtype%%platforme%\creatools_bin\%1Bin cd %binfolder% -cmake -D BUILD_TESTING:BOOL=OFF -D INCLUDE_CTEST:BOOL=OFF CMakeCache.txt +:: 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 diff --git a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat index 70dd0c9..c42dbea 100644 --- a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat +++ b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat @@ -38,8 +38,9 @@ IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt +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_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt cmake CMakeCache.txt diff --git a/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat b/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat index b350865..a3cace2 100644 --- a/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat +++ b/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat @@ -38,8 +38,9 @@ IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON CMakeCache.txt +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_PackRecalage:BOOL=ON CMakeCache.txt cmake -D BUILD_creaRigidRegistration_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_PackRecalage_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt cmake CMakeCache.txt cmake CMakeCache.txt