From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Wed, 13 Feb 2013 15:56:19 +0000 (+0100)
Subject: Feature #1531
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=03c15497cf618702808b2cbaea55243c25b70698;p=creaToolsTools.git

Feature #1531
creaTools win64 installers debug version
---

diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat
index c4b2960..bc7314c 100644
--- a/Install/scripts/All.bat
+++ b/Install/scripts/All.bat
@@ -38,6 +38,9 @@ mkdir %logFolder%
 
 echo call configure variables
 call %scriptsFolder%\base\configureVariables.bat
+
+GOTO SKIPINSTALL
+
 echo call Download Sources
 start /B /wait %scriptsFolder%\base\downloadSources.bat
 echo call compile crea
@@ -60,11 +63,11 @@ echo call compile bbtkGEditor
 start /B /wait %scriptsFolder%\bbtkGEditor\bbtkGEditorInstall.bat
 echo call compile creaMinitools
 start /B /wait %scriptsFolder%\creaTools\creaMinitoolsInstall.bat
+
+:SKIPINSTALL
 echo  THIS HAS TO BE THE LAST STEP...
 echo call compile creaTools
-
-start /B /I /wait %scriptsFolder%\creaTools\creaToolsInstall.bat
-
+start /B /wait %scriptsFolder%\creaTools\creaToolsInstall.bat
 echo To see the log files of this install please go to %LogFolder%
 
 exit /B
diff --git a/Install/scripts/creaTools/creaToolsInstall.bat b/Install/scripts/creaTools/creaToolsInstall.bat
index 65a6712..f875214 100644
--- a/Install/scripts/creaTools/creaToolsInstall.bat
+++ b/Install/scripts/creaTools/creaToolsInstall.bat
@@ -26,6 +26,8 @@ REM ------------------------------------------------------------------------
 set currentdir=%~dp0
 
 echo Compile creaTools
+echo call %baseFolder%\cleanmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1
+
 call %baseFolder%\cleanmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1
 call %baseFolder%\cmakemod.bat %creatoolssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1
 call %currentdir%\creaToolsVariables.bat %creatoolsGeneration% %creatoolssource% %docgeneration% %buildtype% >> %logFolder%\creaToolsInstall.log 2>&1
diff --git a/Install_ThirdParty/scripts/tpl_variables.bat b/Install_ThirdParty/scripts/tpl_variables.bat
index 928c8f2..2cb26d6 100644
--- a/Install_ThirdParty/scripts/tpl_variables.bat
+++ b/Install_ThirdParty/scripts/tpl_variables.bat
@@ -1,10 +1,10 @@
-set  EEDclean=TRUE
+set  EEDclean=FALSE
 set  EEDcleanSOURCES=TRUE
 set  EEDcleanBIN=TRUE
 set  EEDcleanINSTALL=TRUE
 set  EEDcleanLOGS=TRUE
 
-set  EEDdownload=TRUE
+set  EEDdownload=FALSE
 set  EEDdownloadQT=TRUE
 set  EEDdownloadITK=TRUE
 set  EEDdownloadWXWINDOWS=TRUE
@@ -15,13 +15,13 @@ set  EEDdownloadGDCM=TRUE
 set  EEDdownloadTTH=TRUE
 
 set  EEDinstall=TRUE
-set  EEDinstallQT=TRUE
-set  EEDinstallWXWIDGETS=TRUE
+set  EEDinstallQT=FALSE
+set  EEDinstallWXWIDGETS=FALSE
 set  EEDinstallBOOST=TRUE
-set  EEEDinstallVTK=TRUE
-set  EEDinstallGDCM=TRUE
-set  EEDinstallITK=TRUE
-set  EEDinstallXERCES=TRUE
+set  EEEDinstallVTK=FALSE
+set  EEDinstallGDCM=FALSE
+set  EEDinstallITK=FALSE
+set  EEDinstallXERCES=FALSE
 
 set  EEDinstallerDLL=TRUE
 
diff --git a/windows/crea_ThirdParty_dlls/install/CMakeLists.txt b/windows/crea_ThirdParty_dlls/install/CMakeLists.txt
index 5728439..95afb6d 100644
--- a/windows/crea_ThirdParty_dlls/install/CMakeLists.txt
+++ b/windows/crea_ThirdParty_dlls/install/CMakeLists.txt
@@ -34,8 +34,8 @@
 
 INCLUDE(InstallRequiredSystemLibraries)
 
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "crea_ThirdParty_dlls - CREATIS-LRMN")
-SET(CPACK_PACKAGE_VENDOR "CREATIS-LRMN")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "crea_ThirdParty_dlls - CREATIS")
+SET(CPACK_PACKAGE_VENDOR "CREATIS")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION})