Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/creaToolsTools

[creaToolsTools.git] / Install_ThirdParty / install_generate_thirdparty.bat_TEMPLATE

diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
index 34011d335ba9aedbbe41191f6029416a26ed001e..792cebfc845dab936b665ee8675a5615fea5daf8 100644 (file)
--- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
+++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
@@ -1,25 +1,4 @@
-REM ---------------------------------------------------------------------
-REM
-REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-REM                        pour la Santé)
-REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-REM
-REM  This software is governed by the CeCILL-B license under French law and 
-REM  abiding by the rules of distribution of free software. You can  use, 
-REM  modify and/ or redistribute the software under the terms of the CeCILL-B 
-REM  license as circulated by CEA, CNRS and INRIA at the following URL 
-REM  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-REM  or in the file LICENSE.txt.
-REM
-REM  As a counterpart to the access to the source code and  rights to copy,
-REM  modify and redistribute granted by the license, users are provided only
-REM  with a limited warranty  and the software's author,  the holder of the
-REM  economic rights,  and the successive licensors  have only  limited
-REM  liability. 
-REM
-REM  The fact that you are presently reading this means that you have had
-REM  knowledge of the CeCILL-B license and that you accept its terms.
-REM ------------------------------------------------------------------------  
+
 
 @echo off
 
@@ -27,76 +6,16 @@ echo -----------------------------------
 echo ---Setting Environment Variables---
 echo -----------------------------------
 
-set thirdpartyGeneration=<directory where you want to generate>
+set thirdpartyGeneration=<..directory where you want to generate..>
 set buildType=<debug|release>
 
-::The following line sets wxWidgets version. Set it ON if you want to compile wxWidgets 2.8.12
-::The following line set swxWidgets version. Set it OFF if you want to compile wxWidgets 2.9.3
-set wxStable=<ON|OFF>
 ::Set the following line ON if you want to force x86 compilation
 set forcex86=<ON|OFF>
 
+call scripts/tpl_variables.bat
 
-echo thirdpartyGeneration=%thirdpartyGeneration%
-echo buildType=%buildType%
-echo wxStable=%wxStable%
-
-echo -----------------------------------
-echo ---End Setting Global Variables----
-echo -----------------------------------
-
-echo -----------------------------------
-echo -------Calling Scripts-------------
-echo -----------------------------------
-
-echo starting time
-time /t
-date /T
-
-set scripts=%cd%\scripts
-set LogFolder=%thirdpartyGeneration%\installLog
-cd %scripts%
-
-echo cleaning All
-
-call cleanAll.bat %thirdpartyGeneration%
-
-cd %scripts%
-
-echo Calling download_ThirdPartySW.bat
-
-call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% %wxStable% >> %LogFolder%\downloadSources.log 2>&1
-
-cd %scripts%
-
-echo Calling install_thirdparty.bat
-
-start /B /wait install_thirdparty_all.bat %thirdpartyGeneration% %buildType% %forcex86%
-
-echo Calling generateThirdPartydllsExe.bat
-
-cd %scripts%
-
-start /B /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType% %forcex86%
-
-echo Calling generateThirdPartyLibExe.bat
-
-cd %scripts%
-
-start /B /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType% %forcex86%
-
-cd..
-
-echo -----------------------------------
-echo -------End of the Script-----------
-echo -----------------------------------
-
-echo ending time
-time /t
-date /T
-
-echo To see the log of this install please go to %LogFolder%
+call scripts/makeAll.bat
 
-::pause
+pause
 
-exit
\ No newline at end of file
+exit