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

diff --git a/Install/creatools.bat_TEMPLATE b/Install/creatools.bat_TEMPLATE
index d9b4151b2c632e12e5b07fb2f8cbd5161516948a..1335e870a567da8bd69e439ff81b926da9a30a5b 100644 (file)
--- a/Install/creatools.bat_TEMPLATE
+++ b/Install/creatools.bat_TEMPLATE
@@ -1,12 +1,14 @@
 @echo off
 set creatoolsGeneration=<directory where you want to generate>
 set installPrefix=%creatoolsGeneration%\creatools_install
-set buildType=<Debug|Release|RelWithDebInfo>
+set buildType=<Debug|Release>
 set cvsUser=<USER>
 set docGeneration=<OFF|ON> 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 2b84606f520258b7961a27f34f94a300ce9d5311..5f05606bf1d98a8883221027cb44295a6133d82c 100644 (file)
--- 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 1a87b72efdeca5fbcd8296f3296655aa88f8169c..2e7e795a497741703ff39ebcd98823ba0e470be0 100644 (file)
--- 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 d0880c9f23b88d99eeb44f7d10e8f406cea7ed21..e2da794d4834ce55b2b516de4b4d09c6e98f45fa 100644 (file)
--- 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 58fcc6f527bdf07f3ad43425863a85617781e28f..689fd559a2f3c427bee55658d28833d28b1aad89 100644 (file)
--- 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 (file)
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 679286fe422eaa4237c14f59f39843da8881af5d..44e41568fc347cfbaa4f2657ca2ec679665a1a82 100644 (file)
--- 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 26b622bb90159829a6c3278ea0b00ac6c8fe90b7..ab6f2f9a4928dce932077bdc1c00526a276f0902 100644 (file)
--- 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 deb5780d6937b3cadec75448f2b5bd20a18ce25c..f37af9620f9dd6ef8d8543faeec180deec14ffb8 100644 (file)
--- 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 1e4438b74958d14b5ba2107cfbff137622fc5fa7..b03a9335a3af442528eb9cbc2f341a1a5607edeb 100644 (file)
--- 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 90a5d3029ebe7673ed0feb5be109c80861311f86..583c3ed924202f2b5ebc1cbecd736c4e1f92b21d 100644 (file)
--- 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 a2cb234ef9fb5c9cddbce34f86906efdec4e6a64..a95a85e07ec325203415993d3edafb2b4197adf0 100644 (file)
--- 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 5dc762bfb3500de36830da7c8346e00f0b214ced..d0ef6e7f39e5465a04891319cbb10dd3d9627236 100644 (file)
--- 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 (file)
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 839b4ba098d85ae4974259a8a8ae31d2d906760d..4ceff1b3dec09d5f504062021183818df67da18b 100644 (file)
--- 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 0ba113c933370f8b52aa82df5d0448528b32e79c..33650ce1c2b27843a4c6798100968e5e3f5e5295 100644 (file)
--- 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 07d9cb951377ef18011e75b7d9d25b2ae8ca21f3..ace284ec960889d0e5d0fab6bc06f8b4ceed21d5 100644 (file)
--- 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 634bc9243b5a7886322fc8c03002e994846ed2af..d816cdf8168caa043d20db485c0f121e735490e8 100644 (file)
--- 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 3b39c7ec96aef61fe6b1ba4cec0a940222211a2a..2d848f52207cf8ed8c127e5c7051315fa65072e0 100644 (file)
--- 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 59bcc7472c18eae8cf3728c8ee0fac49b4b46d5d..b6340908ae114d9239b9b64b0d5a6c37e4a5632a 100644 (file)
--- 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 26acb83d41b0fcb0f810859a865b16be424f500d..c0d843e203382ecde25ebc4d2a187b374de7759b 100644 (file)
--- 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 f5b86f61196ac8f9a7e4dcef9bd870ac2a3a115c..9fd1f88ba8d06f8713dc07cb11d0f4cff480a7de 100644 (file)
--- 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 c2859e08aa837f896839a4ef59c9d64d4e2a1c8e..62228358a4ad7fc5b787b047c0e9bfe1215148bf 100644 (file)
--- 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 401a12e061a0dd729edd1b085d2ba5f5ca0ed644..b98947bd79c8d3fa1dd4c53d703890b307d08edd 100644 (file)
--- 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 949918299e9117f6df68cfbb49e7f990693e190a..46e3c73106537859db66b022bbbe786fb89ec74c 100644 (file)
--- 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 5993b68030aff63e3440e70e772f23019889536a..4497515f8d298d34b536962ef797012a68ed7e04 100644 (file)
--- 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 8056162615964b727f20d931789f710069b6cbb0..0e8ab58b90516a667c74bfdc97ffafd281e043df 100644 (file)
--- 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 641cfbe2c3287d559448afce0653af6bb484e126..5d9ea7053a7c82746f120b7e2d9f9e7bfc0fddac 100644 (file)
--- 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 0210fb7c3fcef9f19a6b04c5c070133da5521ab8..1e7e5bdc2dc2cb4f5ee271ba6b23dec96ddbe229 100644 (file)
--- 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 e024399628b2d06d33401699fd522c4871a3d229..e101b9dd6d8020af114b6a2137c6116abc224811 100644 (file)
--- 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 196bae350bb4b032f739ac5877e7912dda9fe519..4bc70611d720c31488b36b131be8d21f04baa587 100644 (file)
--- 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 c62c98bc888c330acfe53e8167cd95b55f93aa82..dfdda28145e1bdbe3bd0cfee9d1cfc8684a0b35d 100644 (file)
--- 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 c7fd7948749c4c6566334f1e22f5614e1100dfc0..f9578d7b2f040ab281721c02c6e20829eabb8915 100644 (file)
--- 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