From 6ef4f1e8a880f85a4b740d88d1132c9375f3b89d Mon Sep 17 00:00:00 2001 From: Jocelyn FIAT Date: Mon, 24 Sep 2018 10:10:45 +0200 Subject: [PATCH] Cleaned configuration, and removed duplicated files. --- windows_deliv/etc/config.btm | 6 +-- windows_deliv/etc/local-JFIATPC.btm | 50 -------------------- windows_deliv/etc/local-WINPC.btm | 48 ------------------- windows_deliv/etc/machines/JFIATPC.btm | 9 ---- windows_deliv/etc/machines/WINPC.btm | 13 +---- windows_deliv/etc/machines/local.btm | 20 ++++++++ windows_deliv/etc/profiles/win64-vc100.btm | 6 +-- windows_deliv/etc/profiles/win64-vc150.btm | 6 +-- windows_deliv/etc/profiles/win64-wsdk71.btm | 6 +-- windows_deliv/etc/profiles/windows-vc100.btm | 6 +-- 10 files changed, 31 insertions(+), 139 deletions(-) delete mode 100644 windows_deliv/etc/local-JFIATPC.btm delete mode 100644 windows_deliv/etc/local-WINPC.btm create mode 100644 windows_deliv/etc/machines/local.btm diff --git a/windows_deliv/etc/config.btm b/windows_deliv/etc/config.btm index f58c71e..d76ec9c 100644 --- a/windows_deliv/etc/config.btm +++ b/windows_deliv/etc/config.btm @@ -1,10 +1,8 @@ REM Check local file 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 +elseiff exist %~dp0machines\local.btm then + call %~dp0machines\local.btm endiff REM Backward compatibility diff --git a/windows_deliv/etc/local-JFIATPC.btm b/windows_deliv/etc/local-JFIATPC.btm deleted file mode 100644 index 95dcd35..0000000 --- a/windows_deliv/etc/local-JFIATPC.btm +++ /dev/null @@ -1,50 +0,0 @@ -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" - diff --git a/windows_deliv/etc/local-WINPC.btm b/windows_deliv/etc/local-WINPC.btm deleted file mode 100644 index c9b17fc..0000000 --- a/windows_deliv/etc/local-WINPC.btm +++ /dev/null @@ -1,48 +0,0 @@ -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 - 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 - 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" - diff --git a/windows_deliv/etc/machines/JFIATPC.btm b/windows_deliv/etc/machines/JFIATPC.btm index 95dcd35..76f78b9 100644 --- a/windows_deliv/etc/machines/JFIATPC.btm +++ b/windows_deliv/etc/machines/JFIATPC.btm @@ -1,15 +1,12 @@ 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 @@ -42,9 +39,3 @@ 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" - diff --git a/windows_deliv/etc/machines/WINPC.btm b/windows_deliv/etc/machines/WINPC.btm index 7cd3d25..d049914 100644 --- a/windows_deliv/etc/machines/WINPC.btm +++ b/windows_deliv/etc/machines/WINPC.btm @@ -1,16 +1,12 @@ -echo Load local settings +echo Load WINPC 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\ @@ -39,10 +35,3 @@ 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" - diff --git a/windows_deliv/etc/machines/local.btm b/windows_deliv/etc/machines/local.btm new file mode 100644 index 0000000..dc3a8d4 --- /dev/null +++ b/windows_deliv/etc/machines/local.btm @@ -0,0 +1,20 @@ +echo Load local settings + +iff exist %~dp0%COMPUTERNAME%.btm then + call %~dp0%COMPUTERNAME%.btm +endiff + +:: Set default environment for any machine here. + +iff not defined WORK_DIR then + set WORK_DIR=%~dp0..\..\_DELIV +endiff + +rem set ISE_EC_FLAGS=-full + +set DELIV_SKIP_ERROR="True" +rem set DELIV_SKIP_ERROR="False" + +set ISE_LITE_DELIV="False" + + diff --git a/windows_deliv/etc/profiles/win64-vc100.btm b/windows_deliv/etc/profiles/win64-vc100.btm index 8755a8b..19f51b7 100644 --- a/windows_deliv/etc/profiles/win64-vc100.btm +++ b/windows_deliv/etc/profiles/win64-vc100.btm @@ -2,10 +2,8 @@ REM Check ISE_BUILD_NAME=win64-vc100 echo Use build "win64-vc100" set ISE_PLATFORM=win64 -iff exist %~dp0local-%COMPUTERNAME%.btm then - call %~dp0local-%COMPUTERNAME%.btm -elseiff exist %~dp0local.btm then - call %~dp0local.btm +iff exist %~dp0..\machines\local.btm then + call %~dp0..\machines\local.btm endiff set ISE_C_COMPILER=msc diff --git a/windows_deliv/etc/profiles/win64-vc150.btm b/windows_deliv/etc/profiles/win64-vc150.btm index a642159..d5feaa1 100644 --- a/windows_deliv/etc/profiles/win64-vc150.btm +++ b/windows_deliv/etc/profiles/win64-vc150.btm @@ -2,10 +2,8 @@ REM Check ISE_BUILD_NAME=win64-vc150 echo Use build "win64-vc150" set ISE_PLATFORM=win64 -iff exist %~dp0local-%COMPUTERNAME%.btm then - call %~dp0local-%COMPUTERNAME%.btm -elseiff exist %~dp0local.btm then - call %~dp0local.btm +iff exist %~dp0..\machines\local.btm then + call %~dp0..\machines\local.btm endiff set ISE_C_COMPILER=msc_vc140 diff --git a/windows_deliv/etc/profiles/win64-wsdk71.btm b/windows_deliv/etc/profiles/win64-wsdk71.btm index 2c52e1e..59b0a67 100644 --- a/windows_deliv/etc/profiles/win64-wsdk71.btm +++ b/windows_deliv/etc/profiles/win64-wsdk71.btm @@ -2,10 +2,8 @@ REM Check ISE_BUILD_NAME=win64-wsdk71 echo Use build "win64-wsdk71" set ISE_PLATFORM=win64 -iff exist %~dp0local-%COMPUTERNAME%.btm then - call %~dp0local-%COMPUTERNAME%.btm -elseiff exist %~dp0local.btm then - call %~dp0local.btm +iff exist %~dp0..\machines\local.btm then + call %~dp0..\machines\local.btm endiff set ISE_C_COMPILER=msc diff --git a/windows_deliv/etc/profiles/windows-vc100.btm b/windows_deliv/etc/profiles/windows-vc100.btm index 4e56dc1..6837b89 100644 --- a/windows_deliv/etc/profiles/windows-vc100.btm +++ b/windows_deliv/etc/profiles/windows-vc100.btm @@ -2,10 +2,8 @@ REM Check ISE_BUILD_NAME=windows-vc100 echo Use build "windows-vc100" set ISE_PLATFORM=windows -iff exist %~dp0local-%COMPUTERNAME%.btm then - call %~dp0local-%COMPUTERNAME%.btm -elseiff exist %~dp0local.btm then - call %~dp0local.btm +iff exist %~dp0..\machines\local.btm then + call %~dp0..\machines\local.btm endiff set ISE_C_COMPILER=msc