Windows installers , Linux bbtk compilation

diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat
index 3807d20a590ab1185f6792b513f6ea3bbb9002ee..54d1318294474321e8a5f1f78aa86cb1b7069cc8 100644 (file)
--- a/Install/scripts/All.bat
+++ b/Install/scripts/All.bat
@@ -35,19 +35,24 @@ mkdir %logFolder%
 echo call configure variables
 call %scriptsFolder%\base\configureVariables.bat
 
-REM ::echo call Download Sources
-REM start /B /wait %scriptsFolder%\base\downloadSources.bat
+echo call Clean and Download-Sources
+start /B /wait %scriptsFolder%\base\downloadSources.bat
 
+echo %cd%
 
 cd %scriptsFolder%
-echo %cd%
-REM call All2.bat %creatoolsGeneration% %docGeneration% Debug Win32
+call All2.bat %creatoolsGeneration% %docGeneration% Release Win64
+
 REM cd %scriptsFolder%
 REM call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64
+
 REM cd %scriptsFolder%
 REM call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 
-cd %scriptsFolder%
-call All2.bat %creatoolsGeneration% %docGeneration% Release Win64
+
+REM cd %scriptsFolder%
+REM call All2.bat %creatoolsGeneration% %docGeneration% Debug Win32
+
+
 echo ..End..
 
 cd %scriptsFolder%

diff --git a/Install/scripts/All2.bat b/Install/scripts/All2.bat
index b742e7d432248ba4906ba98728af2217667e2b58..cff2fd77a4b5da08f0543a93a32a6f90b7015d1d 100644 (file)
--- a/Install/scripts/All2.bat
+++ b/Install/scripts/All2.bat
@@ -46,7 +46,8 @@ mkdir creatools_%buildtype%%platforme%\installLog
 echo call configure variables
 call %scriptsFolder%\base\configureVariables.bat
 
-goto skypToEED
+REM goto skypToEED
+REM :skypToEED
 
 echo call compile crea
 echo start /B /wait %scriptsFolder%\crea\creaInstall.bat
@@ -59,9 +60,6 @@ echo call compile creaEnvironment
 start /B /wait %scriptsFolder%\creaEnvironment\creaEnvironmentInstall.bat
 echo call compile creaBruker
 start /B /wait %scriptsFolder%\creaBruker\creaBrukerInstall.bat
-
-:skypToEED
-
 echo call compile creaImageIO
 start /B /wait %scriptsFolder%\creaImageIO\creaImageIOInstall.bat
 echo call compile creaContours
@@ -74,7 +72,6 @@ echo call compile creaMinitools
 start /B /wait %scriptsFolder%\creaTools\creaMinitoolsInstall.bat
 
 
-
 echo  THIS HAS TO BE THE LAST STEP...
 echo call compile creaTools
 start /B /wait %scriptsFolder%\creaTools\creaToolsInstall.bat

diff --git a/Install/scripts/creaTools/creaToolsInstall.bat b/Install/scripts/creaTools/creaToolsInstall.bat
index 630820b40ebd391bae631c0fd73f4af354267e7a..b076d922dd9b4ce5d3ae3d2fb8c6adfd6bf252cc 100644 (file)
--- a/Install/scripts/creaTools/creaToolsInstall.bat
+++ b/Install/scripts/creaTools/creaToolsInstall.bat
@@ -32,6 +32,7 @@ call %baseFolder%\cleanmod.bat %creatoolssource% %creatoolsGeneration% >> %logFo
 call %baseFolder%\cmakemod.bat %creatoolssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1
 call %currentdir%\creaToolsVariables.bat %creatoolsGeneration% %creatoolssource% %docgeneration% %buildtype% %plateforme% >> %logFolder%\creaToolsInstall.log 2>&1
 call %baseFolder%\compilemod.bat %buildtype% %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1
+copy %creatoolssource%*.exe %3\Results_CreaTools_Installers\
 ::call %baseFolder%\ctestmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1
 echo end of creaTools compilation
 

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt
index e019744d096b24949bdd71a5ec6ec35622eccf11..a63deb2d095ecf8ec4377025fdf3b982c92959ed 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt
@@ -7,8 +7,8 @@ PROJECT(crea_TPL)
 #==================================
 # The project version
 SET(PROJECT_MAJOR_VERSION 3)
-SET(PROJECT_MINOR_VERSION 1)
-SET(PROJECT_BUILD_VERSION 1)
+SET(PROJECT_MINOR_VERSION 2)
+SET(PROJECT_BUILD_VERSION 0)
 #==================================
 
 #==================================

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
index 36de5d031256f68389081bddff3a617a74103491..984dd0917a43090a287a7ce7c6471770ab0ec674 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
@@ -3,8 +3,8 @@ PROJECT(crea_TPdlls)
 cmake_minimum_required(VERSION 2.6)
 
 SET(PROJECT_MAJOR_VERSION 3)
-SET(PROJECT_MINOR_VERSION 1)
-SET(PROJECT_BUILD_VERSION 1)
+SET(PROJECT_MINOR_VERSION 2)
+SET(PROJECT_BUILD_VERSION 0)
 
 SET(CREA_VERBOSE_CMAKE TRUE)
 

diff --git a/Install_ThirdParty/scripts/tpl_variables.bat b/Install_ThirdParty/scripts/tpl_variables.bat
index 80350ba7aa5c2493cb72483da488ad3d1d1e751a..3acb7e3848cc3565bba4c8d9d2a48c1acb6ea0ab 100644 (file)
--- a/Install_ThirdParty/scripts/tpl_variables.bat
+++ b/Install_ThirdParty/scripts/tpl_variables.bat
@@ -4,7 +4,7 @@ set  EEDcleanBIN=TRUE
 set  EEDcleanINSTALL=TRUE
 set  EEDcleanLOGS=TRUE
 
-set  EEDdownload=TRUE
+set  EEDdownload=FALSE
 set  EEDdownloadQT=FALSE
 set  EEDdownloadITK=FALSE
 set  EEDdownloadWXWINDOWS=FALSE
@@ -26,7 +26,6 @@ set  EEDinstallXERCES=FALSE
 set  EEDinstallSQLite=TRUE
 
 set  EEDinstallerDLL=TRUE
-
 set  EEDinstallerLibraries=TRUE
 
 ::The following line sets wxWidgets version. Set it ON if you want to compile wxWidgets 2.8.12

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 931203711d9d4863d5ab48dddce85c12585dcf5f..57c9cc4802de0d7bd8284784d3c1cf9d87272f8e 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -165,6 +165,7 @@ then
      bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
      bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
      bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
      bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
    fi
 fi