From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Wed, 6 Oct 2010 23:22:28 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~14
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=52d405722a2de46a53f5b5296dd9a9d1d9f3ebb4;p=creaToolsTools.git

*** empty log message ***
---

diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat
index 96e1985..38124bf 100644
--- a/Install/scripts/All.bat
+++ b/Install/scripts/All.bat
@@ -7,6 +7,7 @@ set buildtype=%1
 set docgeneration=%2
 set cvsUser=%3
 
+
 set creasourcefolder=crea
 set bbtksourcefolder=bbtk
 set creamaracassourcefolder=creaMaracasVisu
@@ -21,9 +22,8 @@ set creatoolssource=creaTools
 set currentdir=%~dp0
 rem set currentdir=%currentdir:\=/%
 set dirInstall=%currentdir%\tmpCreaTools_INSTALL
-rmdir  %dirInstall% /s /q
-rmdir  Result_Installers /s /q
-mkdir Result_Installers
+
+call cleangeneral.bat %dirInstall%
 
 call cvscheckout.bat %creasourcefolder% %cvsUser%
 call cvscheckout.bat %bbtksourcefolder% %cvsUser%
@@ -128,12 +128,11 @@ rem set PATH=%bbtkgeditordll%;%PATH%
 rem creaTools
 call cleanmod.bat %creatoolssource%
 call cmakemod.bat %creatoolssource%  %dirInstall%
-call creaToolsVariables.bat %creatoolssource%
+call creaToolsVariables.bat %creatoolssource%  %dirInstall%
 call compilemodCreaTools.bat %buildtype% %creatoolssource%
 rem remcall ctestmod.bat %creatoolssource%
 set creatoolsdll=%~dp0%creatoolssource%\%buildtype%
 set PATH=%creatoolssdll%;%PATH%
 
-
 rem shutdown /s
-exit /b
+exit /b
\ No newline at end of file
diff --git a/Install/scripts/compilemod.bat b/Install/scripts/compilemod.bat
index a25d229..76cd8c4 100644
--- a/Install/scripts/compilemod.bat
+++ b/Install/scripts/compilemod.bat
@@ -5,5 +5,5 @@ 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/
+copy %2*.exe ..\Result_Installers\
 cd ..
diff --git a/Install/scripts/creaToolsVariables.bat b/Install/scripts/creaToolsVariables.bat
index a16d5a6..ea3ad5e 100644
--- a/Install/scripts/creaToolsVariables.bat
+++ b/Install/scripts/creaToolsVariables.bat
@@ -1,5 +1,6 @@
-REM %1=<dirInstall>
+REM %1=<Module Sources  Ex. crea bbbtk creaMaracasVisu...>
+REM %2=<dirInstall>
 
 cd %1Bin
-cmake -D CREATOOLS_SOURCE_PATH:PATH=%1 CMakeCache.txt
+cmake -D CREATOOLS_SOURCE_PATH:PATH=%2 CMakeCache.txt
 cd ..
\ No newline at end of file