From 53f12f811558ae04061b2fbf98c9d1b3633cccec Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Thu, 2 Aug 2012 16:47:06 +0000 Subject: [PATCH] Feature #1530 --- creaTools win64 installers release version Feature #1531 --- creaTools win64 installers debug version DFCH: creaTools installers are now working in win64 release/debug version --- Install/creatools.bat_TEMPLATE | 6 ++- Install/scripts/All.bat | 29 ++++++------ Install/scripts/base/cleangeneral.bat | 4 +- Install/scripts/base/cmakemod.bat | 14 ++++-- Install/scripts/base/compilemod.bat | 17 +++++-- Install/scripts/base/configureVariables.bat | 43 +++++++++++++++++ Install/scripts/base/ctestmod.bat | 4 +- Install/scripts/base/cvscheckout.bat | 6 +-- Install/scripts/base/downloadSources.bat | 46 ------------------- Install/scripts/bbtk/bbtkInstall.bat | 45 ------------------ Install/scripts/bbtk/bbtkVariables.bat | 6 +-- .../bbtkGEditor/bbtkGEditorInstall.bat | 46 ------------------- .../bbtkGEditor/bbtkGEditorVariables.bat | 6 +-- Install/scripts/configureThirdParty.bat | 22 +++++++++ Install/scripts/crea/creaInstall.bat | 46 ------------------- Install/scripts/crea/creaVariables.bat | 6 +-- .../scripts/creaBruker/creaBrukerInstall.bat | 46 ------------------- .../creaBruker/creaBrukerVariables.bat | 6 +-- .../creaContours/creaContoursInstall.bat | 46 ------------------- .../creaContours/creaContoursVariables.bat | 6 +-- .../creaEnvironmentInstall.bat | 46 ------------------- .../creaenvironmentVariables.bat | 6 +-- .../creaImageIO/creaImageIOInstall.bat | 46 ------------------- .../creaImageIO/creaImageIOVariables.bat | 6 +-- .../creaMaracasVisu/creaMaracasVariables.bat | 7 ++- .../creaMaracasVisuInstall.bat | 46 ------------------- .../creaRigidRInstall.bat | 46 ------------------- .../creaRigidRegistrationVariables.bat | 6 +-- .../scripts/creaTools/compilemodCreaTools.bat | 16 +++++-- .../creaTools/creaMiniToolsVariables.bat | 7 +-- .../creaTools/creaMinitoolsInstall.bat | 46 ------------------- .../scripts/creaTools/creaToolsInstall.bat | 46 ------------------- .../scripts/creaTools/creaToolsVariables.bat | 6 +-- 33 files changed, 159 insertions(+), 621 deletions(-) create mode 100644 Install/scripts/base/configureVariables.bat create mode 100644 Install/scripts/configureThirdParty.bat diff --git a/Install/creatools.bat_TEMPLATE b/Install/creatools.bat_TEMPLATE index d9b4151..1335e87 100644 --- a/Install/creatools.bat_TEMPLATE +++ b/Install/creatools.bat_TEMPLATE @@ -1,12 +1,14 @@ @echo off set creatoolsGeneration= set installPrefix=%creatoolsGeneration%\creatools_install -set buildType= +set buildType= set cvsUser= 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% %cvsUser% %installPrefix% %buildType% +call All.bat %creatoolsGeneration% %docGeneration% %cvsUser% %installPrefix% %buildType% %forcex86% cd .. pause exit diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat index 2b84606..5f05606 100644 --- a/Install/scripts/All.bat +++ b/Install/scripts/All.bat @@ -5,39 +5,42 @@ set docgeneration=%2 set cvsUser=%3 set installPrefix=%4 set buildtype=%5 +set forcex86=%6 -set currentFolder=%cd% +set scriptsFolder=%cd% set logFolder=%creatoolsGeneration%\installLog rmdir %logFolder% /s /q mkdir %logFolder% +echo call configure variables +call %scriptsFolder%\base\configureVariables.bat echo call Download Sources -start /B /I /wait %currentFolder%\base\downloadSources.bat %creatoolsGeneration% %installPrefix% %cvsUser% %currentFolder% +start /B /wait %scriptsFolder%\base\downloadSources.bat echo call compile crea -start /B /I /wait %currentFolder%\crea\creaInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\crea\creaInstall.bat echo call compile bbtk -start /B /I /wait %currentFolder%\bbtk\bbtkInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\bbtk\bbtkInstall.bat echo call compile creaMaracasVisu -start /B /I /wait %currentFolder%\creaMaracasVisu\creaMaracasVisuInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\creaMaracasVisu\creaMaracasVisuInstall.bat echo call compile creaEnvironment -start /B /I /wait %currentFolder%\creaEnvironment\creaEnvironmentInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\creaEnvironment\creaEnvironmentInstall.bat echo call compile creaBruker -start /B /I /wait %currentFolder%\creaBruker\creaBrukerInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\creaBruker\creaBrukerInstall.bat echo call compile creaImageIO -start /B /I /wait %currentFolder%\creaImageIO\creaImageIOInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\creaImageIO\creaImageIOInstall.bat echo call compile creaContours -start /B /I /wait %currentFolder%\creaContours\creaContoursInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\creaContours\creaContoursInstall.bat echo call compile creaRigidRegistration -start /B /I /wait %currentFolder%\creaRigidRegistration\creaRigidRInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\creaRigidRegistration\creaRigidRInstall.bat echo call compile bbtkGEditor -start /B /I /wait %currentFolder%\bbtkGEditor\bbtkGEditorInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\bbtkGEditor\bbtkGEditorInstall.bat echo call compile creaMinitools -start /B /I /wait %currentFolder%\creaTools\creaMinitoolsInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /wait %scriptsFolder%\creaTools\creaMinitoolsInstall.bat echo THIS HAS TO BE THE LAST STEP... echo call compile creaTools -start /B /I /wait %currentFolder%\creaTools\creaToolsInstall.bat %creatoolsGeneration% %docgeneration% %cvsUser% %installPrefix% %buildtype% %currentFolder% +start /B /I /wait %scriptsFolder%\creaTools\creaToolsInstall.bat echo To see the log files of this install please go to %LogFolder% diff --git a/Install/scripts/base/cleangeneral.bat b/Install/scripts/base/cleangeneral.bat index 1a87b72..2e7e795 100644 --- a/Install/scripts/base/cleangeneral.bat +++ b/Install/scripts/base/cleangeneral.bat @@ -4,8 +4,8 @@ echo ---------------------------- echo ----cleangeneral.bat-------- echo ---------------------------- -echo creatoolsGeneration=%1 -echo installPrefix=%2 +echo creatoolsGeneration = %1 +echo installPrefix = %2 rmdir %2 /s /q rmdir %1\creatools_bin /s /q diff --git a/Install/scripts/base/cmakemod.bat b/Install/scripts/base/cmakemod.bat index d0880c9..e2da794 100644 --- a/Install/scripts/base/cmakemod.bat +++ b/Install/scripts/base/cmakemod.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo -------cmakemod.bat--------- echo ---------------------------- -echo Module Sources Ex. crea bbbtk creaMaracasVisu... = %1 +echo buildtype = %1 echo installPrefix = %2 -echo creatoolsGeneration %3 +echo creatoolsGeneration = %3 echo Architecture found = %PROCESSOR_ARCHITECTURE% if %PROCESSOR_ARCHITECTURE%==x86 ( @@ -23,10 +23,16 @@ if not exist %vcvarsall% ( exit ) -if %PROCESSOR_ARCHITECTURE%==x86 ( +if %forcex86%==ON ( call %vcvarsall% + set "compilerVersion=Visual Studio 10" + echo "Compilation forced x86" ) else ( - call %vcvarsall% amd64 + if %PROCESSOR_ARCHITECTURE%==x86 ( + call %vcvarsall% + ) else ( + call %vcvarsall% amd64 + ) ) set binfolder=%3\creatools_bin\%1Bin diff --git a/Install/scripts/base/compilemod.bat b/Install/scripts/base/compilemod.bat index 58fcc6f..689fd55 100644 --- a/Install/scripts/base/compilemod.bat +++ b/Install/scripts/base/compilemod.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo -------compilemod.bat------- echo ---------------------------- -echo %1 = buildtype -echo %2 = Module Sources Ex crea bbtk creaMaracasVisu ... -echo %3 = creatoolsGeneration +echo buildtype = %1 +echo Module Sources = %2 +echo creatoolsGeneration = %3 echo Architecture found = %PROCESSOR_ARCHITECTURE% if %PROCESSOR_ARCHITECTURE%==x86 ( @@ -23,12 +23,19 @@ if not exist %vcvarsall% ( exit ) -if %PROCESSOR_ARCHITECTURE%==x86 ( +if %forcex86%==ON ( call %vcvarsall% + set "compilerVersion=Visual Studio 10" + echo "Compilation forced x86" ) else ( - call %vcvarsall% amd64 + if %PROCESSOR_ARCHITECTURE%==x86 ( + call %vcvarsall% + ) else ( + call %vcvarsall% amd64 + ) ) + set binfolder=%3\creatools_bin\%2Bin cd %binfolder% FOR /R %%a IN (*.sln) DO msbuild %%a /p:UseEnv=true;BuildInParallel=true;Configuration=%1 diff --git a/Install/scripts/base/configureVariables.bat b/Install/scripts/base/configureVariables.bat new file mode 100644 index 0000000..66d789d --- /dev/null +++ b/Install/scripts/base/configureVariables.bat @@ -0,0 +1,43 @@ +@echo off + +echo setting variables + +set creasource=crea +set bbtksource=bbtk +set creamaracassource=creaMaracasVisu +set creaenvironmentsource=creaEnvironment +set creabrukersource=creaBruker +set creaimagesource=creaImageIO +set creacontourssource=creaContours +set crearigidregistrationssource=creaRigidRegistration +set bbtkgeditorsource=bbtkGEditor +set creatoolssource=creaTools +set creaminitoolssource=creaMiniTools + +set baseFolder=%scriptsFolder%\base +set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% +set PATH=%creadll%;%PATH% +set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% +set PATH=%bbtkdll%;%PATH% +set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% +set PATH=%creamaracasdll%;%PATH% +set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% +set PATH=%creaenvironmentdll%;%PATH% +set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% +set PATH=%creabrukerdll%;%PATH% +set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% +set PATH=%creaimagedll%;%PATH% +set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% +set PATH=%creacontoursdll%;%PATH% +set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% +set PATH=%crearigidregistrationdll%;%PATH% +set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% +set PATH=%bbtkgeditordll%;%PATH% +set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% +set PATH=%creaminitoolsdll%;%PATH% +set creatoolsdll=%creatoolsGeneration%\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 679286f..44e4156 100644 --- a/Install/scripts/base/ctestmod.bat +++ b/Install/scripts/base/ctestmod.bat @@ -2,8 +2,8 @@ echo ---------------------------- echo -------ctestmod.bat--------- echo ---------------------------- -echo %1 = Module Sources Ex. crea bbbtk creaMaracasVisu... -echo %2 = creatoolsGeneration +echo Module Sources = %1 +echo creatoolsGeneration = %2 set binfolder=%2\creatools_bin\%1Bin diff --git a/Install/scripts/base/cvscheckout.bat b/Install/scripts/base/cvscheckout.bat index 26b622b..ab6f2f9 100644 --- a/Install/scripts/base/cvscheckout.bat +++ b/Install/scripts/base/cvscheckout.bat @@ -4,9 +4,9 @@ echo ---------------------------- echo -----cvscheckout.bat-------- echo ---------------------------- -echo creasourcefolder=%1 -echo cvsUser=%2 -echo creatoolsGeneration=%3 +echo creasourcefolder = %1 +echo cvsUser = %2 +echo creatoolsGeneration = %3 mkdir %3\creatools_sources cd %3\creatools_sources diff --git a/Install/scripts/base/downloadSources.bat b/Install/scripts/base/downloadSources.bat index deb5780..f37af96 100644 --- a/Install/scripts/base/downloadSources.bat +++ b/Install/scripts/base/downloadSources.bat @@ -1,51 +1,5 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set installPrefix=%2 -set cvsUser=%3 -set baseFolder=%4\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% - -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables - echo cleaning prefix call %baseFolder%\cleangeneral.bat %creatoolsGeneration% %installPrefix% diff --git a/Install/scripts/bbtk/bbtkInstall.bat b/Install/scripts/bbtk/bbtkInstall.bat index 1e4438b..b03a933 100644 --- a/Install/scripts/bbtk/bbtkInstall.bat +++ b/Install/scripts/bbtk/bbtkInstall.bat @@ -1,52 +1,7 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog -echo end setting variables echo compile bbtk call %baseFolder%\cleanmod.bat %bbtksource% %creatoolsGeneration% >> %logFolder%\bbtkInstall.log 2>&1 diff --git a/Install/scripts/bbtk/bbtkVariables.bat b/Install/scripts/bbtk/bbtkVariables.bat index 90a5d30..583c3ed 100644 --- a/Install/scripts/bbtk/bbtkVariables.bat +++ b/Install/scripts/bbtk/bbtkVariables.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo -----bbtkVariables.bat------ echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = bbtksourcefolder -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo bbtksourcefolder = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin diff --git a/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat b/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat index a2cb234..a95a85e 100644 --- a/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat +++ b/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo compile bbtkGEditor call %baseFolder%\cleanmod.bat %bbtkgeditorsource% %creatoolsGeneration% >> %logFolder%\bbtkGEditorInstall.log 2>&1 diff --git a/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat b/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat index 5dc762b..d0ef6e7 100644 --- a/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat +++ b/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo --bbtkGEditorVariables.bat-- echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = bbtkgeditorsource -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo bbtkgeditorsource = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin diff --git a/Install/scripts/configureThirdParty.bat b/Install/scripts/configureThirdParty.bat new file mode 100644 index 0000000..bdbd041 --- /dev/null +++ b/Install/scripts/configureThirdParty.bat @@ -0,0 +1,22 @@ +@echo off + +set creaThirdPartyDll=%1 +set creaThirdPartyLib=%2 + +echo configure ThirdParty variables + +set BOOST_ROOT=%creaThirdPartyLib%\Library\boost +set CREATIS_THIRDPARTYDLLS_DIRS=%creaThirdPartyDll%\bin +set PATH=%PATH%;%CREATIS_THIRDPARTYDLLS_DIRS% +set CREATIS_THIRDPARTYLIBRARIES_DIRS=%creaThirdPartyLib% +set PATH=%PATH%;%CREATIS_THIRDPARTYLIBRARIES_DIRS% +set GDCM_DIR=%creaThirdPartyLib%\Library\gdcm13\lib\gdcm +set ITK_DIR=%creaThirdPartyLib%\Library\itk\lib\InsightToolkit +set QTDIR=%creaThirdPartyLib%\Library\qt +set TTH=%creaThirdPartyLib%\bin\tth +set VTK_DIR=%creaThirdPartyLib%\Library\vtk\lib\vtk-5.10 +set WXWIN=%creaThirdPartyLib%\Library\wxWidgets +set XERCES_DIR=%creaThirdPartyLib%\Library\xerces + +echo End ThirdParty variables configuration +echo %PATH% \ No newline at end of file diff --git a/Install/scripts/crea/creaInstall.bat b/Install/scripts/crea/creaInstall.bat index 839b4ba..4ceff1b 100644 --- a/Install/scripts/crea/creaInstall.bat +++ b/Install/scripts/crea/creaInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo Compile crea call %baseFolder%\cleanmod.bat %creasource% %creatoolsGeneration% >> %logFolder%\creaInstall.log 2>&1 diff --git a/Install/scripts/crea/creaVariables.bat b/Install/scripts/crea/creaVariables.bat index 0ba113c..33650ce 100644 --- a/Install/scripts/crea/creaVariables.bat +++ b/Install/scripts/crea/creaVariables.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo -----creaVariables.bat------ echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = creasource -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo creasource = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin diff --git a/Install/scripts/creaBruker/creaBrukerInstall.bat b/Install/scripts/creaBruker/creaBrukerInstall.bat index 07d9cb9..ace284e 100644 --- a/Install/scripts/creaBruker/creaBrukerInstall.bat +++ b/Install/scripts/creaBruker/creaBrukerInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo compile creaBruker call %baseFolder%\cleanmod.bat %creabrukersource% %creatoolsGeneration% >> %logFolder%\creaBrukerInstall.log 2>&1 diff --git a/Install/scripts/creaBruker/creaBrukerVariables.bat b/Install/scripts/creaBruker/creaBrukerVariables.bat index 634bc92..d816cdf 100644 --- a/Install/scripts/creaBruker/creaBrukerVariables.bat +++ b/Install/scripts/creaBruker/creaBrukerVariables.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo --creaBrukerVariables.bat--- echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = creabrukersource -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo creabrukersource = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin diff --git a/Install/scripts/creaContours/creaContoursInstall.bat b/Install/scripts/creaContours/creaContoursInstall.bat index 3b39c7e..2d848f5 100644 --- a/Install/scripts/creaContours/creaContoursInstall.bat +++ b/Install/scripts/creaContours/creaContoursInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo compile creaContours call %baseFolder%\cleanmod.bat %creacontourssource% %creatoolsGeneration% >> %logFolder%\creaContoursInstall.log 2>&1 diff --git a/Install/scripts/creaContours/creaContoursVariables.bat b/Install/scripts/creaContours/creaContoursVariables.bat index 59bcc74..b634090 100644 --- a/Install/scripts/creaContours/creaContoursVariables.bat +++ b/Install/scripts/creaContours/creaContoursVariables.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo --creaContourVariables.bat-- echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = creacontourssource -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo creacontourssource = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin diff --git a/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat b/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat index 26acb83..c0d843e 100644 --- a/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat +++ b/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo compile creaEnvironment call %baseFolder%\cleanmod.bat %creaenvironmentsource% %creatoolsGeneration% >> %logFolder%\creaEnvironmentInstall.log 2>&1 diff --git a/Install/scripts/creaEnvironment/creaenvironmentVariables.bat b/Install/scripts/creaEnvironment/creaenvironmentVariables.bat index f5b86f6..9fd1f88 100644 --- a/Install/scripts/creaEnvironment/creaenvironmentVariables.bat +++ b/Install/scripts/creaEnvironment/creaenvironmentVariables.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo creaenvironmentVariables.bat echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = creamaracassourcefolder -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo creamaracassourcefolder = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin diff --git a/Install/scripts/creaImageIO/creaImageIOInstall.bat b/Install/scripts/creaImageIO/creaImageIOInstall.bat index c2859e0..6222835 100644 --- a/Install/scripts/creaImageIO/creaImageIOInstall.bat +++ b/Install/scripts/creaImageIO/creaImageIOInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo compile creaImageIO call %baseFolder%\cleanmod.bat %creaimagesource% %creatoolsGeneration% >> %logFolder%\creaImageIOInstall.log 2>&1 diff --git a/Install/scripts/creaImageIO/creaImageIOVariables.bat b/Install/scripts/creaImageIO/creaImageIOVariables.bat index 401a12e..b98947b 100644 --- a/Install/scripts/creaImageIO/creaImageIOVariables.bat +++ b/Install/scripts/creaImageIO/creaImageIOVariables.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo ----creaIOVariable.bat------ echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = creaimagesource -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo creaimagesource = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin diff --git a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat index 9499182..46e3c73 100644 --- a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat +++ b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat @@ -3,16 +3,15 @@ echo ---------------------------- echo --creaMaracasVariables.bat-- echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = creamaracassourcefolder -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo creamaracassourcefolder = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% IF %4==Debug ( - echo pechaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaan cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) diff --git a/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat b/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat index 5993b68..4497515 100644 --- a/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat +++ b/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo compile creaMaracasVisu call %baseFolder%\cleanmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 diff --git a/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat b/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat index 8056162..0e8ab58 100644 --- a/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat +++ b/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo compile creaRigidRegistration call %baseFolder%\cleanmod.bat %crearigidregistrationssource% %creatoolsGeneration% >> %logFolder%\creaRigidRInstall.log 2>&1 diff --git a/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat b/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat index 641cfbe..5d9ea70 100644 --- a/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat +++ b/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo creaRigidRegistrationVariables.bat echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = crearigidregistrationssource -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo crearigidregistrationssource = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin diff --git a/Install/scripts/creaTools/compilemodCreaTools.bat b/Install/scripts/creaTools/compilemodCreaTools.bat index 0210fb7..1e7e5bd 100644 --- a/Install/scripts/creaTools/compilemodCreaTools.bat +++ b/Install/scripts/creaTools/compilemodCreaTools.bat @@ -1,8 +1,8 @@ @echo off -echo %1 = buildtype -echo %2 = Module Sources Ex crea bbtk creaMaracasVisu ... -echo %3 = creatoolsGeneration +echo buildtype = %1 +echo Module Sources = %2 +echo creatoolsGeneration = %3 echo Architecture found = %PROCESSOR_ARCHITECTURE% if %PROCESSOR_ARCHITECTURE%==x86 ( @@ -20,10 +20,16 @@ if not exist %vcvarsall% ( exit ) -if %PROCESSOR_ARCHITECTURE%==x86 ( +if %forcex86%==ON ( call %vcvarsall% + set "compilerVersion=Visual Studio 10" + echo "Compilation forced x86" ) else ( - call %vcvarsall% amd64 + if %PROCESSOR_ARCHITECTURE%==x86 ( + call %vcvarsall% + ) else ( + call %vcvarsall% amd64 + ) ) set binfolder=%3\creatools_bin\%1Bin diff --git a/Install/scripts/creaTools/creaMiniToolsVariables.bat b/Install/scripts/creaTools/creaMiniToolsVariables.bat index e024399..e101b9d 100644 --- a/Install/scripts/creaTools/creaMiniToolsVariables.bat +++ b/Install/scripts/creaTools/creaMiniToolsVariables.bat @@ -3,11 +3,12 @@ echo ---------------------------- echo -creaMiniToolsVariables.bat- echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = creaminitoolssource -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo creaminitoolssource = %2 +echo docgeneration = %3 echo buildType = %4 + set binfolder=%1\creatools_bin\%2Bin cd %binfolder% diff --git a/Install/scripts/creaTools/creaMinitoolsInstall.bat b/Install/scripts/creaTools/creaMinitoolsInstall.bat index 196bae3..4bc7061 100644 --- a/Install/scripts/creaTools/creaMinitoolsInstall.bat +++ b/Install/scripts/creaTools/creaMinitoolsInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo Compile creaTools call %baseFolder%\cleanmod.bat %creaminitoolssource% %creatoolsGeneration% >> %logFolder%\creaMinitoolsInstall.log 2>&1 diff --git a/Install/scripts/creaTools/creaToolsInstall.bat b/Install/scripts/creaTools/creaToolsInstall.bat index c62c98b..dfdda28 100644 --- a/Install/scripts/creaTools/creaToolsInstall.bat +++ b/Install/scripts/creaTools/creaToolsInstall.bat @@ -1,52 +1,6 @@ @echo off -echo setting variables - -set creatoolsGeneration=%1 -set docgeneration=%2 -set cvsUser=%3 -set installPrefix=%4 -set buildtype=%5 -set baseFolder=%6\base - -set creasource=crea -set bbtksource=bbtk -set creamaracassource=creaMaracasVisu -set creaenvironmentsource=creaEnvironment -set creabrukersource=creaBruker -set creaimagesource=creaImageIO -set creacontourssource=creaContours -set crearigidregistrationssource=creaRigidRegistration -set bbtkgeditorsource=bbtkGEditor -set creatoolssource=creaTools -set creaminitoolssource=creaMiniTools - -set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype% -set PATH=%creadll%;%PATH% -set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype% -set PATH=%bbtkdll%;%PATH% -set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype% -set PATH=%creamaracasdll%;%PATH% -set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype% -set PATH=%creaenvironmentdll%;%PATH% -set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype% -set PATH=%creabrukerdll%;%PATH% -set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype% -set PATH=%creaimagedll%;%PATH% -set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype% -set PATH=%creacontoursdll%;%PATH% -set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype% -set PATH=%crearigidregistrationdll%;%PATH% -set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% -set PATH=%bbtkgeditordll%;%PATH% -set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -set PATH=%creaminitoolsdll%;%PATH% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% -set PATH=%creatoolssdll%;%PATH% set currentdir=%~dp0 -set logFolder=%creatoolsGeneration%\installLog - -echo end setting variables echo Compile creaTools call %baseFolder%\cleanmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 diff --git a/Install/scripts/creaTools/creaToolsVariables.bat b/Install/scripts/creaTools/creaToolsVariables.bat index c7fd794..f9578d7 100644 --- a/Install/scripts/creaTools/creaToolsVariables.bat +++ b/Install/scripts/creaTools/creaToolsVariables.bat @@ -3,9 +3,9 @@ echo ---------------------------- echo ---creaToolVariables.bat---- echo ---------------------------- -echo %1 = creatoolsGeneration -echo %2 = creatoolssource -echo %3 = docgeneration +echo creatoolsGeneration = %1 +echo creatoolssource = %2 +echo docgeneration = %3 echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin -- 2.45.1