eiffel/es_build_deliv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified and focus on msc, msc_vc140

Browse Source
This commit is contained in:
Jocelyn FIAT
2019-02-20 14:28:00 +01:00
parent 48be270648
commit 97f0a1d2aa
11 changed files with 145 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
windows_deliv/etc/config.btm
View File

@@ -35,16 +35,33 @@ iff not defined DEFAULT_ISE_SVN then
set DEFAULT_ISE_SVN=svn://%USERNAME%@svn.ise/ise_svn/trunk
endiff
iff not defined ISE_VC_MSC then
set ISE_VC_MSC=VC110
endiff
iff not defined ISE_VC_MSC_VC140 then
set ISE_VC_MSC_VC140=VC140
endiff
iff not defined ISE_C_COMPILER then
REM set ISE_C_COMPILER=msc_vc140
set ISE_C_COMPILER=msc
iff defined ISE_VC_MSC_VC140 then
set ISE_C_COMPILER=msc_vc140
set ISE_C_COMPILER_VER=%ISE_VC_MSC_VC140%
else
iff defined ISE_VC_MSC then
set ISE_C_COMPILER=msc
set ISE_C_COMPILER_VER=%ISE_VC_MSC%
endiff
endiff
endiff
iff not defined ISE_C_COMPILER_VER then
REM set ISE_C_COMPILER_VER=WSDK71
REM set ISE_C_COMPILER_VER=VC150
REM set ISE_C_COMPILER_VER=VC140
set ISE_C_COMPILER_VER=VC100
if "%ISE_C_COMPILER%" == "msc_vc140" (
set ISE_C_COMPILER_VER=%ISE_VC_MSC_VC140%
) else (
if "%HAS_VC_MSC%" == "True" (
set ISE_C_COMPILER_VER=%ISE_VC_MSC%
)
)
endiff
iff not defined ISE_NIGHTLY_SCP_HOST then

16
windows_deliv/etc/machines/JFIATPC.btm
View File

@@ -7,18 +7,18 @@ iff not defined ISE_EIFFEL then
set ISE_EIFFEL=%INIT_DIR%\bin\eiffel_%ISE_PLATFORM%
endiff
iff not defined ISE_VC_MSC then
set ISE_VC_MSC=VC110
endiff
iff not defined ISE_VC_MSC_VC140 then
set ISE_VC_MSC_VC140=VC140
endiff
iff not defined MYSQL then
iff "%ISE_PLATFORM%" == "win64" then
rem set MYSQL=C:\Program Files (x86)\MySQL\MySQL Connector.C 6.1
rem set MYSQL=C:\DEV\mysql\winx64\
rem set MYSQL=C:\apps\mysql-5.6.22-winx64\
rem set MYSQL=e:\3rd\mysql\mysql-5.6.38-winx64
set MYSQL=e:\include\mysql-connector-c-6.1.11-winx64
set MYSQL=%INIT_DIR%\include\mysql-connector-c-6.1.11-winx64
else
rem set MYSQL=C:\Program Files (x86)\MySQL\MySQL Connector.C 6.1
rem set MYSQL=e:\3rd\mysql\mysql-5.6.38-win32
set MYSQL=e:\include\mysql-connector-c-6.1.11-win32
set MYSQL=%INIT_DIR%\include\mysql-connector-c-6.1.11-win32
endiff
endiff