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

Updated etc and init.btm

Browse Source
This commit is contained in:
Jocelyn FIAT
2018-05-23 17:17:47 +02:00
parent 19336e23cd
commit 7700f077a4
10 changed files with 128 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
windows_deliv/etc/config.btm
View File

@@ -1,8 +1,8 @@
REM Check local file
iff defined ISE_BUILD_NAME .and. exist %~dp0local-%ISE_BUILD_NAME%.btm then
call %~dp0local-%ISE_BUILD_NAME%.btm
elseiff exist %~dp0local-%COMPUTERNAME%.btm then
call %~dp0local-%COMPUTERNAME%.btm
iff defined ISE_BUILD_NAME .and. exist %~dp0profiles\%ISE_BUILD_NAME%.btm then
call %~dp0profiles\%ISE_BUILD_NAME%.btm
elseiff exist %~dp0machines\%COMPUTERNAME%.btm then
call %~dp0machines\%COMPUTERNAME%.btm
elseiff exist %~dp0local.btm then
call %~dp0local.btm
endiff

7
windows_deliv/etc/local-JFIATPC.btm
View File

@@ -11,13 +11,6 @@ endiff
rem set ISE_EC_FLAGS=-full
iff not defined ISE_C_COMPILER then
set ISE_C_COMPILER=msc_vc140
endiff
iff not defined ISE_C_COMPILER_VER then
set ISE_C_COMPILER_VER=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

50
windows_deliv/etc/machines/JFIATPC.btm Normal file
View File

@@ -0,0 +1,50 @@
echo Load local settings
REM set ISE_PLATFORM=windows
iff not defined ISE_PLATFORM then
set ISE_PLATFORM=win64
endiff
iff not defined ISE_EIFFEL then
set ISE_EIFFEL=C:\DEV\Eiffel\18.05_%ISE_PLATFORM%
endiff
rem set ISE_EC_FLAGS=-full
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=C:\DEV\3rd\mysql\mysql-5.6.38-winx64
set MYSQL=C:\DEV\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=C:\DEV\3rd\mysql\mysql-5.6.38-win32
set MYSQL=C:\DEV\include\mysql-connector-c-6.1.11-win32
endiff
endiff
iff not defined WORK_DIR then
set WORK_DIR=C:\DEV\deliv
set WORK_DIR=M:\deliv
endiff
iff not defined DEFAULT_PUBLIC_SVN then
set DEFAULT_PUBLIC_SVN=file:///C:/DEV/ise/repos/mirrors/svn/eiffelstudio/trunk
rem set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk
endiff
iff not defined DEFAULT_ISE_SVN then
set DEFAULT_ISE_SVN=svn://jfiat@svn.ise:3691/ise_svn/trunk
set DEFAULT_ISE_SVN=file:///C:/DEV/ise/repos/mirrors/svn/ise/trunk
rem set DEFAULT_ISE_SVN=svn://192.168.1.11:3698/trunk
endiff
rem set PATH=%PATH%;C:\cygwin64\bin
set PATH=%PATH%;C:\apps\files\7-Zip
set DELIV_SKIP_ERROR="True"
rem set DELIV_SKIP_ERROR="False"
set ISE_LITE_DELIV="False"

48
windows_deliv/etc/machines/WINPC.btm Normal file
View File

@@ -0,0 +1,48 @@
echo Load local settings
REM set ISE_PLATFORM=windows
iff not defined ISE_PLATFORM then
set ISE_PLATFORM=win64
endiff
iff not defined ISE_EIFFEL then
set ISE_EIFFEL=C:\DEV\Eiffel\18.05_%ISE_PLATFORM%
endiff
rem set ISE_EC_FLAGS=-full
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=C:\DEV\3rd\mysql\mysql-5.6.38-winx64
set MYSQL=C:\DEV\include\mysql-connector-c-6.1.11-winx64
else
rem set MYSQL=C:\Program Files (x86)\MySQL\MySQL Connector.C 6.1
set MYSQL=C:\DEV\3rd\mysql\mysql-5.6.38-win32
rem set MYSQL=C:\DEV\include\mysql-connector-c-6.1.11-win32
endiff
iff not defined WORK_DIR then
set WORK_DIR=C:\DEV\deliv
rem set WORK_DIR=M:\deliv
endiff
iff not defined DEFAULT_PUBLIC_SVN then
set DEFAULT_PUBLIC_SVN=file:///C:/DEV/ise/repos/mirrors/svn/eiffelstudio/trunk
set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk
endiff
iff not defined DEFAULT_ISE_SVN then
set DEFAULT_ISE_SVN=svn://jfiat@svn.ise:3691/ise_svn/trunk
set DEFAULT_ISE_SVN=file:///C:/DEV/ise/repos/mirrors/svn/ise/trunk
set DEFAULT_ISE_SVN=svn://192.168.1.11:3698/trunk
endiff
rem set PATH=%PATH%;C:\cygwin64\bin
set PATH=%PATH%;C:\apps\files\7-Zip
set DELIV_SKIP_ERROR="True"
rem set DELIV_SKIP_ERROR="False"
set ISE_LITE_DELIV="False"

8
windows_deliv/etc/local-win64-vc140.btm → windows_deliv/etc/profiles/win64-vc100.btm
View File

@@ -1,5 +1,5 @@
REM Check ISE_BUILD_NAME=win64-vc140
echo Use build "win64-vc140"
REM Check ISE_BUILD_NAME=win64-vc100
echo Use build "win64-vc100"
set ISE_PLATFORM=win64
iff exist %~dp0local-%COMPUTERNAME%.btm then
@@ -8,5 +8,5 @@ elseiff exist %~dp0local.btm then
call %~dp0local.btm
endiff
set ISE_C_COMPILER=msc_vc140
set ISE_C_COMPILER_VER=VC140
set ISE_C_COMPILER=msc
set ISE_C_COMPILER_VER=VC100

0
windows_deliv/etc/local-win64-vc150.btm → windows_deliv/etc/profiles/win64-vc150.btm
View File

0
windows_deliv/etc/local-win64-wsdk71.btm → windows_deliv/etc/profiles/win64-wsdk71.btm
View File

8
windows_deliv/etc/local-windows-vc150.btm → windows_deliv/etc/profiles/windows-vc100.btm
View File

@@ -1,5 +1,5 @@
REM Check ISE_BUILD_NAME=windows-vc150
echo Use build "windows-vc150"
REM Check ISE_BUILD_NAME=windows-vc100
echo Use build "windows-vc100"
set ISE_PLATFORM=windows
iff exist %~dp0local-%COMPUTERNAME%.btm then
@@ -8,5 +8,5 @@ elseiff exist %~dp0local.btm then
call %~dp0local.btm
endiff
set ISE_C_COMPILER=msc_vc140
set ISE_C_COMPILER_VER=VC150
set ISE_C_COMPILER=msc
set ISE_C_COMPILER_VER=VC100

18
windows_deliv/init.btm
View File

@@ -10,6 +10,24 @@ set EIFFEL_SRC=%TMP_EIFFEL_SRC
set ISE_LIBRARY=%TMP_EIFFEL_SRC
set ISE_SRC=%TMP_EIFFEL_SRC
:: Make sure required directories exist
REM Create parent dir of %INSTALL_LOG if it does not exist.
set_parent_dir_of PDIR %INSTALL_LOG%
iff not isdir %PDIR then
md /S %PDIR
remtrace Create directory %PDIR
endiff
set_parent_dir_of PDIR %ERROR_LOG%
iff not isdir %PDIR then
md /S %PDIR
remtrace Create directory %PDIR
endiff
iff not isdir %TMP_EIFFEL_SRC% then
md /S %TMP_EIFFEL_SRC%
remtrace Create directory %TMP_EIFFEL_SRC%
endiff
:: Get C compilation environment information
call %INIT_DIR\inc\set_has_c_compiler HAS_WSDK71 WSDK71
call %INIT_DIR\inc\set_has_c_compiler HAS_VC100 VC100
call %INIT_DIR\inc\set_has_c_compiler HAS_VC140 VC140

16
windows_deliv/make_delivery.btm
View File

@@ -11,22 +11,6 @@ set TMP_ISE_EIFFEL=%ISE_EIFFEL
call %~dp0init.btm
REM Create parent dir of %INSTALL_LOG if it does not exist.
set_parent_dir_of PDIR %INSTALL_LOG%
iff not isdir %PDIR then
md /S %PDIR
remtrace Create directory %PDIR
endiff
set_parent_dir_of PDIR %ERROR_LOG%
iff not isdir %PDIR then
md /S %PDIR
remtrace Create directory %PDIR
endiff
iff not isdir %TMP_EIFFEL_SRC% then
md /S %TMP_EIFFEL_SRC%
remtrace Create directory %TMP_EIFFEL_SRC%
endiff
remtrace Set up the environment
on break goto broken
TIMER ON /1 >> NUL