From: Eduardo DAVILA Date: Tue, 30 Apr 2013 14:24:31 +0000 (+0200) Subject: Feature 2004 Windows generation creatools installer. Merging in one proces Debug... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d2694504db1df749aaf7647fb5ddc69c5dbe0c52;p=creaToolsTools.git Feature 2004 Windows generation creatools installer. Merging in one proces Debug/Release/Win32/win64 versions --- diff --git a/Install/creatools.bat_TEMPLATE b/Install/creatools.bat_TEMPLATE index 4f0c6af..78e0e96 100644 --- a/Install/creatools.bat_TEMPLATE +++ b/Install/creatools.bat_TEMPLATE @@ -23,14 +23,10 @@ REM ------------------------------------------------------------------------ @echo off set creatoolsGeneration= -set installPrefix=%creatoolsGeneration%\creatools_install -set buildType= set docGeneration= let it to OFF! -::Set the following line ON if you want to force x86 compilation -set forcex86=OFF cd scripts -call All.bat %creatoolsGeneration% %docGeneration% %installPrefix% %buildType% %forcex86% +call All.bat %creatoolsGeneration% %docGeneration% cd .. pause exit diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat index 4e38a61..6d3cbb6 100644 --- a/Install/scripts/All.bat +++ b/Install/scripts/All.bat @@ -24,13 +24,9 @@ REM ------------------------------------------------------------------------ @echo off set creatoolsGeneration=%1 -set docgeneration=%2 -set installPrefix=%3 -set buildtype=%4 -set forcex86=%5 +set docGeneration=%2 set scriptsFolder=%cd% -set logFolder=%creatoolsGeneration%\installLog rmdir %logFolder% /s /q @@ -39,40 +35,21 @@ mkdir %logFolder% echo call configure variables call %scriptsFolder%\base\configureVariables.bat -REM goto skypeEED +::echo call Download Sources +::start /B /wait %scriptsFolder%\base\downloadSources.bat -echo call Download Sources -start /B /wait %scriptsFolder%\base\downloadSources.bat -echo call compile crea -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 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 +cd %scriptsFolder% +echo %cd% +call All2.bat %creatoolsGeneration% %docGeneration% Debug Win32 +cd %scriptsFolder% +call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64 +cd %scriptsFolder% +call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 +cd %scriptsFolder% +call All2.bat %creatoolsGeneration% %docGeneration% Release Win64 +echo ..End.. +cd %scriptsFolder% -REM :skypeEED - -echo THIS HAS TO BE THE LAST STEP... -echo call compile creaTools -start /B /wait %scriptsFolder%\creaTools\creaToolsInstall.bat -echo To see the log files of this install please go to %LogFolder% - -exit /B - diff --git a/Install/scripts/base/cleangeneral.bat b/Install/scripts/base/cleangeneral.bat index a67f424..6c3d560 100644 --- a/Install/scripts/base/cleangeneral.bat +++ b/Install/scripts/base/cleangeneral.bat @@ -31,10 +31,10 @@ echo creatoolsGeneration = %1 echo installPrefix = %2 rmdir %2 /s /q -rmdir %1\creatools_bin /s /q rmdir %1\creatools_sources /s /q -rmdir %1\creatools_install /s /q -rmdir %1\Result_Installers /s /q -mkdir %1\Result_Installers +rmdir %1\creatools_DebugWin32 /s /q +rmdir %1\creatools_DebugWin64 /s /q +rmdir %1\creatools_ReleaseWin32 /s /q +rmdir %1\creatools_ReleaseWin64 /s /q exit /B \ No newline at end of file diff --git a/Install/scripts/base/cleanmod.bat b/Install/scripts/base/cleanmod.bat index 86f1ef0..d76adcf 100644 --- a/Install/scripts/base/cleanmod.bat +++ b/Install/scripts/base/cleanmod.bat @@ -31,7 +31,7 @@ echo creasourcefolder = %1 echo creatoolsGeneration = %2 -set binfolder=%2\creatools_bin\%1Bin +set binfolder=%2\creatools_%buildtype%%platforme%\creatools_bin\%1Bin mkdir %binfolder% cd %binfolder% del CMakeCache.txt diff --git a/Install/scripts/base/cmakemod.bat b/Install/scripts/base/cmakemod.bat index 8024115..370f66f 100644 --- a/Install/scripts/base/cmakemod.bat +++ b/Install/scripts/base/cmakemod.bat @@ -26,7 +26,7 @@ echo ---------------------------- echo -------cmakemod.bat--------- echo ---------------------------- -echo buildtype = %1 +echo creasource = %1 echo installPrefix = %2 echo creatoolsGeneration = %3 @@ -46,7 +46,7 @@ if not exist %vcvarsall% ( exit ) -if %forcex86%==ON ( +if %platforme%==Win32 ( call %vcvarsall% set "compilerVersion=Visual Studio 10" echo "Compilation forced x86" @@ -58,10 +58,10 @@ if %forcex86%==ON ( ) ) -set binfolder=%3\creatools_bin\%1Bin +set binfolder=%3\creatools_%buildtype%%platforme%\creatools_bin\%1Bin cd %binfolder% -cmake -G"%compilerVersion%" -H%3\creatools_sources\%1 -B%3\creatools_bin\%1Bin +cmake -G"%compilerVersion%" -H%3\creatools_sources\%1 -B%3\creatools_%buildtype%%platforme%\creatools_bin\%1Bin cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt exit /B \ No newline at end of file diff --git a/Install/scripts/base/compilemod.bat b/Install/scripts/base/compilemod.bat index 1ae7c02..73bbe4c 100644 --- a/Install/scripts/base/compilemod.bat +++ b/Install/scripts/base/compilemod.bat @@ -46,7 +46,7 @@ if not exist %vcvarsall% ( exit ) -if %forcex86%==ON ( +if %platforme%==Win32 ( call %vcvarsall% set "compilerVersion=Visual Studio 10" echo "Compilation forced x86" @@ -58,12 +58,11 @@ if %forcex86%==ON ( ) ) - -set binfolder=%3\creatools_bin\%2Bin +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 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\Result_Installers\ +copy %2*.exe %3\creatools_%buildtype%%platforme%\Result_Installers\ exit /B \ No newline at end of file diff --git a/Install/scripts/base/configureVariables.bat b/Install/scripts/base/configureVariables.bat index 6ac7fbd..15a115a 100644 --- a/Install/scripts/base/configureVariables.bat +++ b/Install/scripts/base/configureVariables.bat @@ -38,29 +38,28 @@ set creatoolssource=creaTools set creaminitoolssource=creaMiniTools set baseFolder=%scriptsFolder%\base -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% +set creadll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creasource%Bin\%buildtype% set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% +set bbtkdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%bbtksource%Bin\%buildtype% set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% +set creamaracasdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creamaracassource%Bin\%buildtype% set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% +set creaenvironmentdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% +set creabrukerdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creabrukersource%Bin\%buildtype% set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% +set creaimagedll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creaimagesource%Bin\%buildtype% set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% +set creacontourdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creacontourssource%Bin\%buildtype% set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% +set crearigidregistrationdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% +set bbtkgeditordll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% +set creaminitoolsdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creaminitoolssource%Bin\%buildtype% set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% +set creatoolsdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creatoolssource%Bin\%buildtype% set PATH=%creatoolssdll%;%PATH% echo End setting variables -exit /B diff --git a/Install/scripts/base/ctestmod.bat b/Install/scripts/base/ctestmod.bat index 748bfec..3f155e8 100644 --- a/Install/scripts/base/ctestmod.bat +++ b/Install/scripts/base/ctestmod.bat @@ -28,7 +28,7 @@ echo ---------------------------- echo Module Sources = %1 echo creatoolsGeneration = %2 -set binfolder=%2\creatools_bin\%1Bin +set binfolder=%2\creatools_%buildtype%%platforme%\creatools_bin\%1Bin cd %binfolder% diff --git a/Install/scripts/base/downloadSources.bat b/Install/scripts/base/downloadSources.bat index 2fc4f56..ed5b1ca 100644 --- a/Install/scripts/base/downloadSources.bat +++ b/Install/scripts/base/downloadSources.bat @@ -28,29 +28,23 @@ echo cleaning prefix echo downloading creatools software -:: call %baseFolder%\cvscheckout.bat %creasource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %bbtksource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %creamaracassource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %creaenvironmentsource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %creabrukersource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %creaimagesource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %creacontourssource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %crearigidregistrationssource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %bbtkgeditorsource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %creatoolssource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 -:: call %baseFolder%\cvscheckout.bat %creaminitoolssource% %cvsUser% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - - call %baseFolder%\gitclone.bat %creasource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %bbtksource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creaenvironmentsource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creabrukersource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creaimagesource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creacontourssource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %crearigidregistrationssource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %bbtkgeditorsource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 - call %baseFolder%\gitclone.bat %creaminitoolssource% %creatoolsGeneration% >> %logFolder%\downloadSources.log 2>&1 +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/%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 +call gitcall.bat "%cd%\tmp.sh" echo end of downloading creatools software diff --git a/Install/scripts/bbtk/bbtkInstall.bat b/Install/scripts/bbtk/bbtkInstall.bat index a74fc37..52ff6c1 100644 --- a/Install/scripts/bbtk/bbtkInstall.bat +++ b/Install/scripts/bbtk/bbtkInstall.bat @@ -25,8 +25,7 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 - -echo compile bbtk +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 diff --git a/Install/scripts/bbtk/bbtkVariables.bat b/Install/scripts/bbtk/bbtkVariables.bat index 4cc1e3f..c1cac65 100644 --- a/Install/scripts/bbtk/bbtkVariables.bat +++ b/Install/scripts/bbtk/bbtkVariables.bat @@ -31,14 +31,14 @@ echo bbtksourcefolder = %2 echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt +cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\creatools_%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 diff --git a/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat b/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat index 421b5d9..78d7e18 100644 --- a/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat +++ b/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat @@ -25,7 +25,7 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 -echo compile bbtkGEditor +echo compile bbtkGEditor %buildType% %platforme% call %baseFolder%\cleanmod.bat %bbtkgeditorsource% %creatoolsGeneration% >> %logFolder%\bbtkGEditorInstall.log 2>&1 call %baseFolder%\cmakemod.bat %bbtkgeditorsource% %installPrefix% %creatoolsGeneration% >> %logFolder%\bbtkGEditorInstall.log 2>&1 call %currentdir%\bbtkGEditorVariables.bat %creatoolsGeneration% %bbtkgeditorsource% %docgeneration% %buildtype% >> %logFolder%\bbtkGEditorInstall.log 2>&1 diff --git a/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat b/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat index 89808bb..3737ce2 100644 --- a/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat +++ b/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat @@ -31,16 +31,16 @@ echo bbtkgeditorsource = %2 echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt -cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt -cmake -D creaMaracasVisu_DIR:PATH=%1\creatools_install\creaMaracasVisu 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 creaMaracasVisu_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\creaMaracasVisu CMakeCache.txt cmake -D BUILD_bbtkGEditor_DOC:BOOL=%3 CMakeCache.txt cmake CMakeCache.txt diff --git a/Install/scripts/crea/creaInstall.bat b/Install/scripts/crea/creaInstall.bat index 8afd7b2..1b345e2 100644 --- a/Install/scripts/crea/creaInstall.bat +++ b/Install/scripts/crea/creaInstall.bat @@ -21,11 +21,11 @@ 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 +REM @echo off set currentdir=%~dp0 -echo Compile crea +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 diff --git a/Install/scripts/crea/creaVariables.bat b/Install/scripts/crea/creaVariables.bat index 9f18d62..04218f5 100644 --- a/Install/scripts/crea/creaVariables.bat +++ b/Install/scripts/crea/creaVariables.bat @@ -31,7 +31,7 @@ echo creasource = %2 echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( diff --git a/Install/scripts/creaBruker/creaBrukerInstall.bat b/Install/scripts/creaBruker/creaBrukerInstall.bat index 8ba11d6..5fcfac4 100644 --- a/Install/scripts/creaBruker/creaBrukerInstall.bat +++ b/Install/scripts/creaBruker/creaBrukerInstall.bat @@ -25,7 +25,7 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 -echo compile creaBruker +echo compile creaBruker %buildType% %platforme% call %baseFolder%\cleanmod.bat %creabrukersource% %creatoolsGeneration% >> %logFolder%\creaBrukerInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creabrukersource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaBrukerInstall.log 2>&1 call %currentdir%\creaBrukerVariables.bat %creatoolsGeneration% %creabrukersource% %docgeneration% %buildtype% >> %logFolder%\creaBrukerInstall.log 2>&1 diff --git a/Install/scripts/creaBruker/creaBrukerVariables.bat b/Install/scripts/creaBruker/creaBrukerVariables.bat index cf8b1d6..8f67955 100644 --- a/Install/scripts/creaBruker/creaBrukerVariables.bat +++ b/Install/scripts/creaBruker/creaBrukerVariables.bat @@ -31,13 +31,13 @@ echo creabrukersource = %2 echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D --BUILD_ALL:BOOL=OFF -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_creaBruker_DOC:BOOL=%3 CMakeCache.txt +cmake -D --BUILD_ALL:BOOL=OFF -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea -D BUILD_creaBruker_DOC:BOOL=%3 CMakeCache.txt exit /B \ No newline at end of file diff --git a/Install/scripts/creaContours/creaContoursInstall.bat b/Install/scripts/creaContours/creaContoursInstall.bat index 62cff40..5cc8479 100644 --- a/Install/scripts/creaContours/creaContoursInstall.bat +++ b/Install/scripts/creaContours/creaContoursInstall.bat @@ -25,7 +25,7 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 -echo compile creaContours +echo compile creaContours %buildType% %platforme% call %baseFolder%\cleanmod.bat %creacontourssource% %creatoolsGeneration% >> %logFolder%\creaContoursInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creacontourssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaContoursInstall.log 2>&1 call %currentdir%\creaContoursVariables.bat %creatoolsGeneration% %creacontourssource% %docgeneration% %buildtype% >> %logFolder%\creaContoursInstall.log 2>&1 diff --git a/Install/scripts/creaContours/creaContoursVariables.bat b/Install/scripts/creaContours/creaContoursVariables.bat index fdacd6f..896afdd 100644 --- a/Install/scripts/creaContours/creaContoursVariables.bat +++ b/Install/scripts/creaContours/creaContoursVariables.bat @@ -31,7 +31,7 @@ echo creacontourssource = %2 echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( @@ -39,8 +39,8 @@ IF %4==Debug ( ) echo %1=creabrukersource% %2=docgeneration -cmake -D crea_DIR:PATH=%1\creatools_install\crea -D creaEnvironment_DIR:PATH=%1\creatools_install\creaEnvironment -D creaMaracasVisu_DIR:PATH=%1\creatools_install\creaMaracasVisu -D creaImageIO_DIR:PATH=%1\creatools_install\creaImageIO CMakeCache.txt -cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt +cmake -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea -D creaEnvironment_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\creaEnvironment -D creaMaracasVisu_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\creaMaracasVisu -D creaImageIO_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\creaImageIO CMakeCache.txt +cmake -D BBTK_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\bbtk CMakeCache.txt cmake -D creaContours_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt cmake CMakeCache.txt diff --git a/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat b/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat index fdec51d..345fe0f 100644 --- a/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat +++ b/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat @@ -25,7 +25,7 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 -echo compile creaEnvironment +echo compile creaEnvironment %buildType% %platforme% call %baseFolder%\cleanmod.bat %creaenvironmentsource% %creatoolsGeneration% >> %logFolder%\creaEnvironmentInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creaenvironmentsource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaEnvironmentInstall.log 2>&1 call %currentdir%\creaenvironmentVariables.bat %creatoolsGeneration% %creaenvironmentsource% %docgeneration% %buildtype% >> %logFolder%\creaEnvironmentInstall.log 2>&1 diff --git a/Install/scripts/creaEnvironment/creaenvironmentVariables.bat b/Install/scripts/creaEnvironment/creaenvironmentVariables.bat index 6bc6ce3..b1dd4e3 100644 --- a/Install/scripts/creaEnvironment/creaenvironmentVariables.bat +++ b/Install/scripts/creaEnvironment/creaenvironmentVariables.bat @@ -31,13 +31,13 @@ echo creamaracassourcefolder = %2 echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt +cmake -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea CMakeCache.txt exit /B \ No newline at end of file diff --git a/Install/scripts/creaImageIO/creaImageIOInstall.bat b/Install/scripts/creaImageIO/creaImageIOInstall.bat index 93b358d..b9e01eb 100644 --- a/Install/scripts/creaImageIO/creaImageIOInstall.bat +++ b/Install/scripts/creaImageIO/creaImageIOInstall.bat @@ -25,7 +25,7 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 -echo compile creaImageIO +echo compile creaImageIO %buildtype% %platforme% call %baseFolder%\cleanmod.bat %creaimagesource% %creatoolsGeneration% >> %logFolder%\creaImageIOInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creaimagesource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaImageIOInstall.log 2>&1 call %currentdir%\creaImageIOVariables.bat %creatoolsGeneration% %creaimagesource% %docgeneration% %buildtype% >> %logFolder%\creaImageIOInstall.log 2>&1 diff --git a/Install/scripts/creaImageIO/creaImageIOVariables.bat b/Install/scripts/creaImageIO/creaImageIOVariables.bat index 72a4380..e02015b 100644 --- a/Install/scripts/creaImageIO/creaImageIOVariables.bat +++ b/Install/scripts/creaImageIO/creaImageIOVariables.bat @@ -31,15 +31,15 @@ echo creaimagesource = %2 echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt -cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%1\creatools_install\creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt +cmake -D BBTK_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\bbtk CMakeCache.txt +cmake -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt cmake -D BUILD_DOXYGEN_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt cmake CMakeCache.txt diff --git a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat index 7e5337d..70dd0c9 100644 --- a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat +++ b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat @@ -31,15 +31,15 @@ echo creamaracassourcefolder = %2 echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt -cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk 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 BBTK_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\bbtk CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt cmake CMakeCache.txt diff --git a/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat b/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat index ff7f724..f08485a 100644 --- a/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat +++ b/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat @@ -25,7 +25,7 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 -echo compile creaMaracasVisu +echo compile creaMaracasVisu %buildtype% %platforme% call %baseFolder%\cleanmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creamaracassource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 call %currentdir%\creaMaracasVariables.bat %creatoolsGeneration% %creamaracassource% %docgeneration% %buildtype% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 diff --git a/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat b/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat index f7282c1..3a901b9 100644 --- a/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat +++ b/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat @@ -25,7 +25,7 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 -echo compile creaRigidRegistration +echo compile creaRigidRegistration %buildtype% %platforme% call %baseFolder%\cleanmod.bat %crearigidregistrationssource% %creatoolsGeneration% >> %logFolder%\creaRigidRInstall.log 2>&1 call %baseFolder%\cmakemod.bat %crearigidregistrationssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaRigidRInstall.log 2>&1 call %currentdir%\creaRigidRegistrationVariables.bat %creatoolsGeneration% %crearigidregistrationssource% %docgeneration% %buildtype% >> %logFolder%\creaRigidRInstall.log 2>&1 diff --git a/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat b/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat index 2f29853..b350865 100644 --- a/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat +++ b/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat @@ -31,15 +31,15 @@ echo crearigidregistrationssource = %2 echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON CMakeCache.txt -cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk 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 BBTK_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\bbtk 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 diff --git a/Install/scripts/creaTools/compilemodCreaTools.bat b/Install/scripts/creaTools/compilemodCreaTools.bat index 262ee2f..4a27f03 100644 --- a/Install/scripts/creaTools/compilemodCreaTools.bat +++ b/Install/scripts/creaTools/compilemodCreaTools.bat @@ -43,7 +43,7 @@ if not exist %vcvarsall% ( exit ) -if %forcex86%==ON ( +if %platforme%==Win32 ( call %vcvarsall% set "compilerVersion=Visual Studio 10" echo "Compilation forced x86" @@ -55,8 +55,8 @@ if %forcex86%==ON ( ) ) -set binfolder=%3\creatools_bin\%1Bin +set binfolder=%3\creatools_%buildtype%%platforme%\creatools_bin\%1Bin cd %binfolder% FOR /R %%a IN (*.sln) DO msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 PACKAGE.vcxproj -copy %2*.exe %3\Result_Installers\ +copy %2*.exe %3\creatools_%buildtype%%platforme%\Result_Installers\ diff --git a/Install/scripts/creaTools/creaMiniToolsVariables.bat b/Install/scripts/creaTools/creaMiniToolsVariables.bat index 1fa67b6..3666199 100644 --- a/Install/scripts/creaTools/creaMiniToolsVariables.bat +++ b/Install/scripts/creaTools/creaMiniToolsVariables.bat @@ -32,15 +32,15 @@ echo docgeneration = %3 echo buildType = %4 -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt -cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk 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_creaMiniTools:BOOL=ON -D creaMiniTools_DOC:BOOL=%3 CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMiniTools_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt @@ -51,6 +51,5 @@ cmake -D BUILD_BBTK_PACKAGE_creaMiniToolsBase_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt ::cmake -D BUILD_BBTK_PACKAGE_creaMiniTools_BBS_APP:BOOL=ON CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMiniToolsBase_BBS_APP:BOOL=ON CMakeCache.txt - cmake CMakeCache.txt diff --git a/Install/scripts/creaTools/creaMinitoolsInstall.bat b/Install/scripts/creaTools/creaMinitoolsInstall.bat index a273aa7..62986da 100644 --- a/Install/scripts/creaTools/creaMinitoolsInstall.bat +++ b/Install/scripts/creaTools/creaMinitoolsInstall.bat @@ -25,7 +25,7 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 -echo Compile creaTools +echo Compile creaMiniTools %buildtype% %platforme% call %baseFolder%\cleanmod.bat %creaminitoolssource% %creatoolsGeneration% >> %logFolder%\creaMinitoolsInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creaminitoolssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaMinitoolsInstall.log 2>&1 call %currentdir%\creaMiniToolsVariables.bat %creatoolsGeneration% %creaminitoolssource% %docgeneration% %buildtype% >> %logFolder%\creaMinitoolsInstall.log 2>&1 diff --git a/Install/scripts/creaTools/creaToolsInstall.bat b/Install/scripts/creaTools/creaToolsInstall.bat index c945b28..630820b 100644 --- a/Install/scripts/creaTools/creaToolsInstall.bat +++ b/Install/scripts/creaTools/creaToolsInstall.bat @@ -25,12 +25,12 @@ REM ------------------------------------------------------------------------ set currentdir=%~dp0 -echo Compile creaTools +echo Compile creaTools %buildtype% %platforme% echo call %baseFolder%\cleanmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 call %baseFolder%\cleanmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creatoolssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 -call %currentdir%\creaToolsVariables.bat %creatoolsGeneration% %creatoolssource% %docgeneration% %buildtype% %forcex86% >> %logFolder%\creaToolsInstall.log 2>&1 +call %currentdir%\creaToolsVariables.bat %creatoolsGeneration% %creatoolssource% %docgeneration% %buildtype% %plateforme% >> %logFolder%\creaToolsInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 ::call %baseFolder%\ctestmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 echo end of creaTools compilation diff --git a/Install/scripts/creaTools/creaToolsVariables.bat b/Install/scripts/creaTools/creaToolsVariables.bat index cbe87d8..9d39674 100644 --- a/Install/scripts/creaTools/creaToolsVariables.bat +++ b/Install/scripts/creaTools/creaToolsVariables.bat @@ -30,24 +30,24 @@ set creatoolsGeneration=%1 set creatoolssource=%2 set docgeneration=%3 set buildType=%4 -set forcex86=%5 +set plateforme=%5 echo creatoolsGeneration = %creatoolsGeneration% echo creatoolssource = %creatoolssource% echo docgeneration = %docgeneration% echo buildType = %buildType% -echo forcex86 = %forcex86% +echo plateforme = %plateforme% -set binfolder=%1\creatools_bin\%2Bin +set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -if %forcex86%==ON ( +if %platforme%==Win32 ( set buildPlatform=win32 ) else ( if %PROCESSOR_ARCHITECTURE%==x86 ( @@ -58,4 +58,4 @@ if %forcex86%==ON ( ) cmake -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform% CMakeCache.txt -cmake -D CREATOOLS_SOURCE_PATH:PATH=%creatoolsGeneration%\creatools_install CMakeCache.txt +cmake -D CREATOOLS_SOURCE_PATH:PATH=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_install CMakeCache.txt diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/Version.txt.in b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/Version.txt.in index 22e823f..b116cc9 100644 --- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/Version.txt.in +++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/Version.txt.in @@ -22,7 +22,7 @@ # ------------------------------------------------------------------------ - Project: @CMAKE_PROJECT_NAME@ + Project: @CMAKE_PROJECT_NAME@ Version: @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_BUILD_VERSION@ Platform: @CREATOOLS_PLATFORM@ Build Type: @CREATOOLS_BUILDTYPE@