*** empty log message ***

diff --git a/Install/creatools.bat_TEMPLATE b/Install/creatools.bat_TEMPLATE
index a046c70..6da89a0 100644 (file)
--- a/Install/creatools.bat_TEMPLATE
+++ b/Install/creatools.bat_TEMPLATE
@@ -1,9 +1,10 @@
-
-set buildType=Release
-set docGeneration=OFF
-set cvsUser=<.......?????.......>
+set creatoolsGeneration=<directory where you want to generate>
+set installPrefix=<your Install dir> or </usr/local> 
+set buildType=<Debug|Release|RelWithDebInfo>
+set cvsUser=<USER>
+set docGeneration=<OFF|ON> let it to OFF!
 
 cd scripts
-call All.bat %buildType% %docGeneration% %cvsUser%
+call All.sh %creatoolsGeneration% %docGeneration% %cvsUser% %installPrefix% %buildType%
 cd ..
 

diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat
index 85f5895..02e011a 100644 (file)
--- a/Install/scripts/All.bat
+++ b/Install/scripts/All.bat
@@ -1,138 +1,138 @@
-rem %1 = buildtype
-rem %2 = docgeneration
-rem %3 = cvsUser
+rem %1 =<creatoolsGeneration>
+rem %2 =<docGeneration>
+rem %3 =<cvsUser>
+rem %4 =<installPrefix>
+rem %5 =<buildType>
 
 rem @echo off
-set buildtype=%1
+set creatoolsGeneration=%1
 set docgeneration=%2
 set cvsUser=%3
+set installPrefix=%4
+set buildtype=%5
 
 
-set creasourcefolder=crea
-set bbtksourcefolder=bbtk
-set creamaracassourcefolder=creaMaracasVisu
+set creasource=crea
+set bbtksource=bbtk
+set creamaracassource=creaMaracasVisu
 set creaenvironmentsource=creaEnvironment
 set creabrukersource=creaBruker
-set creaimagesourcefolder=creaImageIO
+set creaimagesource=creaImageIO
 set creacontourssource=creaContours
 set crearigidregistrationssource=creaRigidRegistration
 set bbtkgeditorsource=bbtkGEditor
 set creatoolssource=creaTools
 
 set currentdir=%~dp0
-rem set currentdir=%currentdir:\=/%
-set dirInstall=%currentdir%\tmpCreaTools_INSTALL
+call %currentdir%\cleangeneral.bat %creatoolsGeneration% %installPrefix%
 
-call cleangeneral.bat %dirInstall%
-
-call cvscheckout.bat %creasourcefolder% %cvsUser%
-call cvscheckout.bat %bbtksourcefolder% %cvsUser%
-call cvscheckout.bat %creamaracassourcefolder% %cvsUser%
-call cvscheckout.bat %creaenvironmentsource% %cvsUser%
-call cvscheckout.bat %creabrukersource% %cvsUser%
-call cvscheckout.bat %creaimagesourcefolder% %cvsUser%
-call cvscheckout.bat %creacontourssource% %cvsUser%
-call cvscheckout.bat %crearigidregistrationssource% %cvsUser%
-call cvscheckout.bat %bbtkgeditorsource% %cvsUser%
-call cvscheckout.bat %creatoolssource% %cvsUser%
 
+call %currentdir%\cvscheckout.bat %creasource% %cvsUser% %creatoolsGeneration%
+call %currentdir%\cvscheckout.bat %bbtksource% %cvsUser% %creatoolsGeneration%
+call %currentdir%\cvscheckout.bat %creamaracassource% %cvsUser% %creatoolsGeneration%
+call %currentdir%\cvscheckout.bat %creaenvironmentsource% %cvsUser% %creatoolsGeneration%
+call %currentdir%\cvscheckout.bat %creabrukersource% %cvsUser% %creatoolsGeneration%
+call %currentdir%\cvscheckout.bat %creaimagesource% %cvsUser% %creatoolsGeneration%
+call %currentdir%\cvscheckout.bat %creacontourssource% %cvsUser% %creatoolsGeneration%
+call %currentdir%\cvscheckout.bat %crearigidregistrationssource% %cvsUser% %creatoolsGeneration%
+call %currentdir%\cvscheckout.bat %bbtkgeditorsource% %cvsUser% %creatoolsGeneration%
+call %currentdir%\cvscheckout.bat %creatoolssource% %cvsUser% %creatoolsGeneration%
 
 
 
 rem CREA
-call cleanmod.bat %creasourcefolder%
-call cmakemod.bat %creasourcefolder% %dirInstall%
-call creaVariables.bat %creasourcefolder% 
-call compilemod.bat %buildtype% %creasourcefolder%
-call ctestmod.bat %creasourcefolder%
-set creadll=%~dp0
-set creadll=%creadll%%creasourcefolder%Bin\%buildtype%
+call %currentdir%\cleanmod.bat %creasource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %creasource% %installPrefix% %creatoolsGeneration%
+call %currentdir%\creaVariables.bat %creatoolsGeneration% %creasource% %docgeneration%
+call %currentdir%\compilemod.bat %buildtype% %creasource% %creatoolsGeneration%
+call %currentdir%\ctestmod.bat %creasource% %creatoolsGeneration%
+set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype%
 set PATH=%creadll%;%PATH%
 
 
 rem BBTK
-call cleanmod.bat %bbtksourcefolder%
-call cmakemod.bat %bbtksourcefolder%  %dirInstall%
-call bbtkVariables.bat %bbtksourcefolder% %docgeneration%
-call compilemod.bat %buildtype% %bbtksourcefolder%
-call ctestmod.bat %bbtksourcefolder%
-set bbtkdll=%~dp0
-set bbtkdll=%bbtkdll%%bbtksourcefolder%Bin\%buildtype%
+call %currentdir%\cleanmod.bat %bbtksource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %bbtksource%  %installPrefix% %creatoolsGeneration%
+call %currentdir%\bbtkVariables.bat %creatoolsGeneration% %bbtksource% %docgeneration%
+call %currentdir%\compilemod.bat %buildtype% %bbtksource% %creatoolsGeneration%
+call %currentdir%\ctestmod.bat %bbtksource% %creatoolsGeneration%
+set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype%
 set PATH=%bbtkdll%;%PATH%
 
+
 rem creaMaracasVisu
-call cleanmod.bat %creamaracassourcefolder%
-call cmakemod.bat %creamaracassourcefolder%  %dirInstall%
-call creaMaracasVariables.bat %creamaracassourcefolder% %docgeneration%
-call compilemod.bat %buildtype% %creamaracassourcefolder%
-call ctestmod.bat %creamaracassourcefolder%
-set creamaracasdll=%~dp0%creamaracassourcefolder%\%buildtype%
+call %currentdir%\cleanmod.bat %creamaracassource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %creamaracassource%  %installPrefix% %creatoolsGeneration%
+call %currentdir%\creaMaracasVariables.bat %creatoolsGeneration% %creamaracassource% %docgeneration%
+call %currentdir%\compilemod.bat %buildtype% %creamaracassource% %creatoolsGeneration%
+call %currentdir%\ctestmod.bat %creamaracassource% %creatoolsGeneration%
+set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype%
 set PATH=%creamaracasdll%;%PATH%
 
 
 rem creaEnvironment
-call cleanmod.bat %creaenvironmentsource%
-call cmakemod.bat %creaenvironmentsource%  %dirInstall%
-call creaenvironmentVariables.bat %creaenvironmentsource% 
-call compilemod.bat %buildtype% %creaenvironmentsource%
-call ctestmod.bat %creaenvironmentsource%
-set creaenvironmentdll=%~dp0%creaenvironmentsource%\%buildtype%
+call %currentdir%\cleanmod.bat %creaenvironmentsource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %creaenvironmentsource%  %installPrefix% %creatoolsGeneration%
+call %currentdir%\creaenvironmentVariables.bat %creatoolsGeneration%  %creaenvironmentsource% %docgeneration%
+call %currentdir%\compilemod.bat %buildtype% %creaenvironmentsource% %creatoolsGeneration%
+call %currentdir%\ctestmod.bat %creaenvironmentsource% %creatoolsGeneration%
+set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype%
 set PATH=%creaenvironmentdll%;%PATH%
 
 rem creaBruker
-call cleanmod.bat %creabrukersource%
-call cmakemod.bat %creabrukersource%  %dirInstall%
-call creaBrukerVariables.bat %creabrukersource% %docgeneration%
-call compilemod.bat %buildtype% %creabrukersource%
-call ctestmod.bat %creabrukersource%
-set creabrukerdll=%~dp0%creabrukersource%\%buildtype%
+call %currentdir%\cleanmod.bat %creabrukersource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %creabrukersource%  %installPrefix% %creatoolsGeneration%
+call %currentdir%\creaBrukerVariables.bat %creatoolsGeneration% %creabrukersource% %docgeneration%
+call %currentdir%\compilemod.bat %buildtype% %creabrukersource% %creatoolsGeneration%
+call %currentdir%\ctestmod.bat %creabrukersource% %creatoolsGeneration%
+set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype%
 set PATH=%creabrukerdll%;%PATH%
 
 rem creaImageIO
-call cleanmod.bat %creaimagesourcefolder%
-call cmakemod.bat %creaimagesourcefolder%  %dirInstall%
-call creaImageIOVariables.bat %creaimagesourcefolder% %docgeneration% 
-call compilemod.bat %buildtype% %creaimagesourcefolder%
-call ctestmod.bat %creaimagesourcefolder%
-set creaimagedll=%~dp0%creaimagesourcefolder%\%buildtype%
+call %currentdir%\cleanmod.bat %creaimagesource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %creaimagesource%  %installPrefix% %creatoolsGeneration%
+call %currentdir%\creaImageIOVariables.bat %creatoolsGeneration% %creaimagesource%  %docgeneration%
+call %currentdir%\compilemod.bat %buildtype% %creaimagesource% %creatoolsGeneration%
+call %currentdir%\ctestmod.bat %creaimagesource% %creatoolsGeneration%
+set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype%
 set PATH=%creaimagedll%;%PATH%
 
 
 rem creaContours
-call cleanmod.bat %creacontourssource%
-call cmakemod.bat %creacontourssource%  %dirInstall%
-call creaContoursVariables.bat %creacontourssource% %docgeneration%
-call compilemod.bat %buildtype% %creacontourssource%
-call ctestmod.bat %creacontourssource%
-set creacontourdll=%~dp0%creacontourssource%\%buildtype%
+call %currentdir%\cleanmod.bat %creacontourssource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %creacontourssource%  %installPrefix% %creatoolsGeneration%
+call %currentdir%\creaContoursVariables.bat %creatoolsGeneration% %creacontourssource% %docgeneration%
+call %currentdir%\compilemod.bat %buildtype% %creacontourssource% %creatoolsGeneration%
+call %currentdir%\ctestmod.bat %creacontourssource% %creatoolsGeneration%
+set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype%
 rem set PATH=%creacontoursdll%;%PATH%
 
 rem creaRigidRegistration
-call cleanmod.bat %crearigidregistrationssource%
-call cmakemod.bat %crearigidregistrationssource%  %dirInstall%
-call creaRigidRegistrationVariables.bat %crearigidregistrationssource% %docgeneration% 
-call compilemod.bat %buildtype% %crearigidregistrationssource%
-call ctestmod.bat %crearigidregistrationssource%
-rem set crearigidregistrationdll=%~dp0%crearigidregistrationssource%\%buildtype%
+call %currentdir%\cleanmod.bat %crearigidregistrationssource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %crearigidregistrationssource%  %installPrefix% %creatoolsGeneration%
+call %currentdir%\creaRigidRegistrationVariables.bat %creatoolsGeneration% %crearigidregistrationssource%  %docgeneration%
+call %currentdir%\compilemod.bat %buildtype% %crearigidregistrationssource% %creatoolsGeneration%
+call %currentdir%\ctestmod.bat %crearigidregistrationssource% %creatoolsGeneration%
+set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype%
 rem set PATH=%crearigidregistrationdll%;%PATH%
 
 rem bbtkGEditor
-call cleanmod.bat %bbtkgeditorsource%
-call cmakemod.bat %bbtkgeditorsource%  %dirInstall%
-call bbtkGEditorVariables.bat %bbtkgeditorsource% %docgeneration% 
-call compilemod.bat %buildtype% %bbtkgeditorsource%
-call ctestmod.bat %bbtkgeditorsource%
-rem set bbtkgeditordll=%~dp0%bbtkgeditorsource%\%buildtype%
+call %currentdir%\cleanmod.bat %bbtkgeditorsource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %bbtkgeditorsource%  %installPrefix% %creatoolsGeneration%
+call %currentdir%\bbtkGEditorVariables.bat %creatoolsGeneration% %bbtkgeditorsource%  %docgeneration%
+call %currentdir%\compilemod.bat %buildtype% %bbtkgeditorsource% %creatoolsGeneration%
+call %currentdir%\ctestmod.bat %bbtkgeditorsource% %creatoolsGeneration%
+set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype%
 rem set PATH=%bbtkgeditordll%;%PATH%
 
 rem creaTools
-call cleanmod.bat %creatoolssource%
-call cmakemod.bat %creatoolssource%  %dirInstall%
-call creaToolsVariables.bat %creatoolssource%  %dirInstall%
-call compilemodCreaTools.bat %buildtype% %creatoolssource%
-rem remcall ctestmod.bat %creatoolssource%
-set creatoolsdll=%~dp0%creatoolssource%\%buildtype%
-set PATH=%creatoolssdll%;%PATH%
+call %currentdir%\cleanmod.bat %creatoolssource% %creatoolsGeneration%
+call %currentdir%\cmakemod.bat %creatoolssource%  %installPrefix% %creatoolsGeneration%
+call %currentdir%\creaToolsVariables.bat %creatoolsGeneration%  %creatoolssource% %docgeneration%
+call %currentdir%\compilemodCreaTools.bat %buildtype% %creatoolssource% %creatoolsGeneration%
+rem remcall ctestmod.bat %creatoolssource% %creatoolsGeneration%
+set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype%
+rem set PATH=%creatoolssdll%;%PATH%
 
 pause
 rem shutdown /s

diff --git a/Install/scripts/bbtkGEditorVariables.bat b/Install/scripts/bbtkGEditorVariables.bat
index 9c8b59d..2cc5568 100644 (file)
--- a/Install/scripts/bbtkGEditorVariables.bat
+++ b/Install/scripts/bbtkGEditorVariables.bat
@@ -1,12 +1,12 @@
-rem %1=creabrukersource% %2=docgeneration
+REM %1 = <creatoolsGeneration>
+REM %2 = <bbtkgeditorsource>
+REM %3 = <docgeneration>
 
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
+set binfolder=%1\creatools_bin\%2Bin
+cd %binfolder%
 
-cd %1Bin
-cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea CMakeCache.txt
-cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt
-cmake -D creaMaracasVisu_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaMaracasVisu CMakeCache.txt
-cmake -D BUILD_bbtkGEditor_DOC:BOOL=%2 CMakeCache.txt
+cmake -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt
+cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt
+cmake -D creaMaracasVisu_DIR:PATH=%1\creatools_install\creaMaracasVisu CMakeCache.txt
+cmake -D BUILD_bbtkGEditor_DOC:BOOL=%3 CMakeCache.txt
 cmake CMakeCache.txt
-cd ..
\ No newline at end of file

diff --git a/Install/scripts/bbtkVariables.bat b/Install/scripts/bbtkVariables.bat
index 38696f5..ecd68c4 100644 (file)
--- a/Install/scripts/bbtkVariables.bat
+++ b/Install/scripts/bbtkVariables.bat
@@ -1,13 +1,13 @@
-rem %1=bbtksourcefolder% %2=docgeneration
+REM %1 = <creatoolsGeneration>
+REM %2 = <bbtksourcefolder>
+REM %3 = <docgeneration>
 
-set binfolder=%1Bin
+set binfolder=%1\creatools_bin\%2Bin
 cd %binfolder%
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
-cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea  -D BUILD_BBTK_DOC:BOOL=%2 CMakeCache.txt
+
+cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\creatools_install\crea  -D BUILD_BBTK_DOC:BOOL=%3 CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
-cd ..
\ No newline at end of file

diff --git a/Install/scripts/cleanmod.bat b/Install/scripts/cleanmod.bat
index 25771c9..24e5757 100644 (file)
--- a/Install/scripts/cleanmod.bat
+++ b/Install/scripts/cleanmod.bat
@@ -1,6 +1,8 @@
-REM %1=creasourcefolder
+REM %1 = <creasourcefolder>
+REM %2 = <creatoolsGeneration>
 
-set binfolder=%1Bin
+
+set binfolder=%2\creatools_bin\%1Bin
 mkdir %binfolder%
 cd %binfolder%
 del *.exe
@@ -11,4 +13,3 @@ del Release\*.exe
 del Release\*.dll
 del RelWithDebInfo\*.exe
 del RelWithDebInfo\*.dll
-cd ..
\ No newline at end of file

diff --git a/Install/scripts/cmakemod.bat b/Install/scripts/cmakemod.bat
index d1f8f45..ee6bd4c 100644 (file)
--- a/Install/scripts/cmakemod.bat
+++ b/Install/scripts/cmakemod.bat
@@ -1,13 +1,11 @@
-REM %1=<Module Sources  Ex. crea bbbtk creaMaracasVisu...>
-REM %2=<dirInstall>
+REM %1 = <Module Sources  Ex. crea bbbtk creaMaracasVisu...>
+REM %2 = <installPrefix>
+REM %3 = <creatoolsGeneration>
 
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
-set dirInstallModule=%2\%1
 
 mkdir %1Bin
 cd %1Bin
-cmake -G"Visual Studio 9 2008" -H%currentdir%%1 -B%currentdir%%1Bin
-cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%dirInstallModule% CMakeCache.txt
-cd ..
+cmake -G"Visual Studio 9 2008" -H%3\creatools_sources\%1 -B%3\creatools_bin\%1Bin
+cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt
+
 

diff --git a/Install/scripts/compilemod.bat b/Install/scripts/compilemod.bat
index 76cd8c4..777a79d 100644 (file)
--- a/Install/scripts/compilemod.bat
+++ b/Install/scripts/compilemod.bat
@@ -1,9 +1,13 @@
-REM %1=buildtype  %2=<Module Sources Ex crea bbtk creaMaracasVisu ...>
+REM %1 = <buildtype>  
+REM %2 = <Module Sources Ex crea bbtk creaMaracasVisu ...>
+REM %3 = <creatoolsGeneration>
 
-cd %2Bin
+set binfolder=%3\creatools_bin\%2Bin
+
+cd %binfolder%
 call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%1
 FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 INSTALL.vcproj
 FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcproj
-copy %2*.exe ..\Result_Installers\
-cd ..
+copy %2*.exe %3\Result_Installers\
+

diff --git a/Install/scripts/compilemodCreaTools.bat b/Install/scripts/compilemodCreaTools.bat
index f9486ba..fd36e9e 100644 (file)
--- a/Install/scripts/compilemodCreaTools.bat
+++ b/Install/scripts/compilemodCreaTools.bat
@@ -1,4 +1,10 @@
-cd %2Bin
+REM %1 = <buildtype>  
+REM %2 = <Module Sources Ex crea bbtk creaMaracasVisu ...>
+REM %3 = <creatoolsGeneration>
+
+set binfolder=%3\creatools_bin\%1Bin
+
+cd %binfolder%
 call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
 FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcproj
 copy %2*.exe ..\Result_Installers\

diff --git a/Install/scripts/creaBrukerVariables.bat b/Install/scripts/creaBrukerVariables.bat
index 2b0355f..9e87fe2 100644 (file)
--- a/Install/scripts/creaBrukerVariables.bat
+++ b/Install/scripts/creaBrukerVariables.bat
@@ -1,8 +1,8 @@
-rem %1=creabrukersource% %2=docgeneration
+REM %1 = <creatoolsGeneration>
+REM %2 = <creabrukersource>
+REM %3 = <docgeneration>
 
-set binfolder=%1Bin
+set binfolder=%1\creatools_bin\%2Bin
 cd %binfolder%
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
-cmake -D --BUILD_ALL:BOOL=OFF -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea  -D BUILD_creaBruker_DOC:BOOL=%2 CMakeCache.txt
-cd ..
\ No newline at end of file
+
+cmake -D --BUILD_ALL:BOOL=OFF -D crea_DIR:PATH=%1\creatools_install\crea  -D BUILD_creaBruker_DOC:BOOL=%3 CMakeCache.txt

diff --git a/Install/scripts/creaContoursVariables.bat b/Install/scripts/creaContoursVariables.bat
index 347dfe6..f8b3eb5 100644 (file)
--- a/Install/scripts/creaContoursVariables.bat
+++ b/Install/scripts/creaContoursVariables.bat
@@ -1,11 +1,13 @@
-rem %1=creabrukersource% %2=docgeneration
+REM %1 = <creatoolsGeneration>
+REM %2 = <creacontourssource>
+REM %3 = <docgeneration>
 
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
+set binfolder=%1\creatools_bin\%2Bin
+cd %binfolder%
 
-cd %1Bin
-cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D creaEnvironment_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaEnvironment -D creaMaracasVisu_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaMaracasVisu -D creaImageIO_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaImageIO  -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=ON CMakeCache.txt
-cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt
+rem %1=creabrukersource% %2=docgeneration
+cmake -D crea_DIR:PATH=%1\creatools_install\crea -D creaEnvironment_DIR:PATH%1\creatools_install\creaEnvironment -D creaMaracasVisu_DIR:PATH%1\creatools_install\creaMaracasVisu -D creaImageIO_DIR:PATH%1\creatools_install\creaImageIO CMakeCache.txt
+cmake -D BBTK_DIR:PATH%1\creatools_install\bbtk CMakeCache.txt
 cmake -D creaContours_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
 cmake CMakeCache.txt
-cd ..
+

diff --git a/Install/scripts/creaImageIOVariables.bat b/Install/scripts/creaImageIOVariables.bat
index 145cef3..13873b9 100644 (file)
--- a/Install/scripts/creaImageIOVariables.bat
+++ b/Install/scripts/creaImageIOVariables.bat
@@ -1,12 +1,11 @@
-rem %1=creabrukersource% %2=docgeneration
+REM %1 = <creatoolsGeneration>
+REM %2 = <creaimagesource>
+REM %3 = <docgeneration>
 
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
+set binfolder=%1\creatools_bin\%2Bin
+cd %binfolder%
 
-cd %1Bin
-cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt
-cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt
-cmake -D BUILD_DOXYGEN_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
+cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt
+cmake -D BBTK_DIR:PATH=%1\creatools_install/bbtk CMakeCache.txt
+cmake -D BUILD_DOXYGEN_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 cmake CMakeCache.txt
-
-cd ..
\ No newline at end of file

diff --git a/Install/scripts/creaMaracasVariables.bat b/Install/scripts/creaMaracasVariables.bat
index cc27378..ca43350 100644 (file)
--- a/Install/scripts/creaMaracasVariables.bat
+++ b/Install/scripts/creaMaracasVariables.bat
@@ -1,11 +1,11 @@
-rem %1=creamaracassourcefolder %2=docgeneration
+REM %1 = <creatoolsGeneration>
+REM %2 = <creamaracassourcefolder>
+REM %3 = <docgeneration>
 
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
+set binfolder=%1\creatools_bin\%2Bin
+cd %binfolder%
 
-cd %1Bin
-cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%2 CMakeCache.txt
-cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt
-cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
+cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt
+cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 cmake CMakeCache.txt
-cd ..
\ No newline at end of file

diff --git a/Install/scripts/creaRigidRegistrationVariables.bat b/Install/scripts/creaRigidRegistrationVariables.bat
index 1cefcf9..1333c8f 100644 (file)
--- a/Install/scripts/creaRigidRegistrationVariables.bat
+++ b/Install/scripts/creaRigidRegistrationVariables.bat
@@ -1,12 +1,13 @@
-rem %1=creabrukersource% %2=docgeneration
+REM %1 = <creatoolsGeneration>
+REM %2 = <crearigidregistrationssource>
+REM %3 = <docgeneration>
 
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
+set binfolder=%1\creatools_bin\%2Bin
+cd %binfolder%
 
-cd %1Bin
-cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON CMakeCache.txt
-cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt
-cmake -D BUILD_creaRigidRegistration_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_PackRecalage_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
+cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON CMakeCache.txt
+cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt
+cmake -D BUILD_creaRigidRegistration_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_PackRecalage_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
-cd ..
+

diff --git a/Install/scripts/creaToolsVariables.bat b/Install/scripts/creaToolsVariables.bat
index ea3ad5e..c5f8223 100644 (file)
--- a/Install/scripts/creaToolsVariables.bat
+++ b/Install/scripts/creaToolsVariables.bat
@@ -1,6 +1,8 @@
-REM %1=<Module Sources  Ex. crea bbbtk creaMaracasVisu...>
-REM %2=<dirInstall>
+REM %1 = <creatoolsGeneration>
+REM %2 = <creatoolssource>
+REM %3 = <docgeneration>
 
-cd %1Bin
-cmake -D CREATOOLS_SOURCE_PATH:PATH=%2 CMakeCache.txt
-cd ..
\ No newline at end of file
+set binfolder=%1\creatools_bin\%2Bin
+cd %binfolder%
+
+cmake -D CREATOOLS_SOURCE_PATH:PATH=%1\creatools_install CMakeCache.txt

diff --git a/Install/scripts/creaVariables.bat b/Install/scripts/creaVariables.bat
index c8e6767..94d2941 100644 (file)
--- a/Install/scripts/creaVariables.bat
+++ b/Install/scripts/creaVariables.bat
@@ -1,6 +1,8 @@
-REM %1=creasourcefolder
+REM %1 = <creatoolsGeneration>
+REM %2 = <creasource>
+REM %3 = <docgeneration>
 
-set binfolder=%1Bin
+set binfolder=%1\creatools_bin\%2Bin
 cd %binfolder%
+
 cmake -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt
-cd ..
\ No newline at end of file

diff --git a/Install/scripts/creaenvironmentVariables.bat b/Install/scripts/creaenvironmentVariables.bat
index a09e286..fabf2e1 100644 (file)
--- a/Install/scripts/creaenvironmentVariables.bat
+++ b/Install/scripts/creaenvironmentVariables.bat
@@ -1,8 +1,8 @@
-rem %1=creaenvironmentsource 
+REM %1 = <creatoolsGeneration>
+REM %2 = <creamaracassourcefolder>
+REM %3 = <docgeneration>
 
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
+set binfolder=%1\creatools_bin\%2Bin
+cd %binfolder%
 
-cd %1Bin
-cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea CMakeCache.txt
-cd ..
\ No newline at end of file
+cmake -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt

diff --git a/Install/scripts/ctestmod.bat b/Install/scripts/ctestmod.bat
index d892360..9da0774 100644 (file)
--- a/Install/scripts/ctestmod.bat
+++ b/Install/scripts/ctestmod.bat
@@ -1,6 +1,8 @@
 REM %1=<Module Sources  Ex. crea bbbtk creaMaracasVisu...>
+REM %2 = <creatoolsGeneration>
+
+set binfolder=%2\creatools_bin\%1Bin
 
-set binfolder=%1Bin
 cd %binfolder%
 rem EED>> ctest -D ContinuousStart -D ContinuousUpdate -D ContinuousConfigure -D ContinuousBuild -D ContinuousTest -D ContinuousSubmit
 rem EED>> ctest -D ContinuousMemCheck -D ContinuousSubmit 
@@ -9,4 +11,3 @@ rem EED>> ctest -D ExperimentalMemCheck -D ExperimentalSubmit
 ctest -D ExperimentalConfigure -D ExperimentalBuild
 rem EED>> ctest -D NightlyStart -D NightlyUpdate -D NightlyConfigure -D NightlyBuild -D NightlyTest -D NightlySubmit
 rem EED>> ctest -D NightlyMemCheck -D NightlySubmit
-cd ..
\ No newline at end of file