X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2Fbase%2Fcompilemod.bat;h=c7a3c835ad16846a7d221de237448148aa50c599;hb=3e1fe2cc17634ebb2ad535a71ac331ec3c6faa02;hp=58fcc6f527bdf07f3ad43425863a85617781e28f;hpb=bfd50d81b1a0115d5de2ceb5c083a47bee67005a;p=creaToolsTools.git

diff --git a/Install/scripts/base/compilemod.bat b/Install/scripts/base/compilemod.bat
index 58fcc6f..c7a3c83 100644
--- a/Install/scripts/base/compilemod.bat
+++ b/Install/scripts/base/compilemod.bat
@@ -1,11 +1,34 @@
+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
 echo ----------------------------
 echo -------compilemod.bat-------
 echo ----------------------------
 
-echo %1 = buildtype
-echo %2 = Module Sources Ex crea bbtk creaMaracasVisu ...
-echo %3 = creatoolsGeneration
+echo buildtype = %1 
+echo Module Sources = %2
+echo creatoolsGeneration = %3
 
 echo Architecture found = %PROCESSOR_ARCHITECTURE%
 if %PROCESSOR_ARCHITECTURE%==x86  (
@@ -23,17 +46,23 @@ if not exist %vcvarsall% (
   exit
 )
 
-if %PROCESSOR_ARCHITECTURE%==x86 (
+if %platforme%==Win32 (
 	call %vcvarsall%
+	set "compilerVersion=Visual Studio 10"
+	echo "Compilation forced x86"
 ) else (
-	call %vcvarsall% amd64
+	if %PROCESSOR_ARCHITECTURE%==x86 (
+		call %vcvarsall%
+	) else (
+		call %vcvarsall% amd64
+	)
 )
 
-set binfolder=%3\creatools_bin\%2Bin
+set binfolder=%3\creatools_%buildtype%%platforme%\creatools_bin\%2Bin
 cd %binfolder%
-FOR /R %%a IN (*.sln) DO msbuild %%a /p:UseEnv=true;BuildInParallel=true;Configuration=%1
-msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 ALL_BUILD.vcxproj
+REM FOR /R %%a IN (*.sln) DO msbuild %%a /p:UseEnv=true;BuildInParallel=true;Configuration=%1
+REM msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 ALL_BUILD.vcxproj
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 INSTALL.vcxproj
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 PACKAGE.vcxproj
-copy %2*.exe %3\Result_Installers\
+copy %2*.exe %3\creatools_%buildtype%%platforme%\Result_Installers\
 exit /B
\ No newline at end of file