X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FcreaTools%2FcreaToolsInstall.bat;h=c945b28c67daf25b0dc1ad3a79caaca5d1729955;hb=718bd64a6acbaedc81791f940d04258008f7cfc9;hp=c62c98bc888c330acfe53e8167cd95b55f93aa82;hpb=202b0b1a7dc0552a8c4a9eb1c9c48b6866af6404;p=creaToolsTools.git

diff --git a/Install/scripts/creaTools/creaToolsInstall.bat b/Install/scripts/creaTools/creaToolsInstall.bat
index c62c98b..c945b28 100644
--- a/Install/scripts/creaTools/creaToolsInstall.bat
+++ b/Install/scripts/creaTools/creaToolsInstall.bat
@@ -1,57 +1,36 @@
-@echo off
-
-echo setting variables
-
-set creatoolsGeneration=%1
-set docgeneration=%2
-set cvsUser=%3
-set installPrefix=%4
-set buildtype=%5
-set baseFolder=%6\base
+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 ------------------------------------------------------------------------  
 
-set creasource=crea
-set bbtksource=bbtk
-set creamaracassource=creaMaracasVisu
-set creaenvironmentsource=creaEnvironment
-set creabrukersource=creaBruker
-set creaimagesource=creaImageIO
-set creacontourssource=creaContours
-set crearigidregistrationssource=creaRigidRegistration
-set bbtkgeditorsource=bbtkGEditor
-set creatoolssource=creaTools
-set creaminitoolssource=creaMiniTools
+@echo off
 
-set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype%
-set PATH=%creadll%;%PATH%
-set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype%
-set PATH=%bbtkdll%;%PATH%
-set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype%
-set PATH=%creamaracasdll%;%PATH%
-set creaenvironmentdll=%creatoolsGeneration%\creatools_bin\%creaenvironmentsource%Bin\%buildtype%
-set PATH=%creaenvironmentdll%;%PATH%
-set creabrukerdll=%creatoolsGeneration%\creatools_bin\%creabrukersource%Bin\%buildtype%
-set PATH=%creabrukerdll%;%PATH%
-set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype%
-set PATH=%creaimagedll%;%PATH%
-set creacontourdll=%creatoolsGeneration%\creatools_bin\%creacontourssource%Bin\%buildtype%
-set PATH=%creacontoursdll%;%PATH%
-set crearigidregistrationdll=%creatoolsGeneration%\creatools_bin\%crearigidregistrationssource%Bin\%buildtype%
-set PATH=%crearigidregistrationdll%;%PATH%
-set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype%
-set PATH=%bbtkgeditordll%;%PATH%
-set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype%
-set PATH=%creaminitoolsdll%;%PATH%
-set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype%
-set PATH=%creatoolssdll%;%PATH%
 set currentdir=%~dp0
-set logFolder=%creatoolsGeneration%\installLog
-
-echo end setting variables
 
 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
+call %currentdir%\creaToolsVariables.bat %creatoolsGeneration% %creatoolssource% %docgeneration% %buildtype% %forcex86% >> %logFolder%\creaToolsInstall.log 2>&1
 call %baseFolder%\compilemod.bat %buildtype% %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1
 ::call %baseFolder%\ctestmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1
 echo end of creaTools compilation