diff --git a/windows_deliv/etc/config.btm b/windows_deliv/etc/config.btm index 4534f1c..7535506 100644 --- a/windows_deliv/etc/config.btm +++ b/windows_deliv/etc/config.btm @@ -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 diff --git a/windows_deliv/etc/local-JFIATPC.btm b/windows_deliv/etc/local-JFIATPC.btm index 69c60c8..95dcd35 100644 --- a/windows_deliv/etc/local-JFIATPC.btm +++ b/windows_deliv/etc/local-JFIATPC.btm @@ -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 diff --git a/windows_deliv/etc/machines/JFIATPC.btm b/windows_deliv/etc/machines/JFIATPC.btm new file mode 100644 index 0000000..95dcd35 --- /dev/null +++ b/windows_deliv/etc/machines/JFIATPC.btm @@ -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" + diff --git a/windows_deliv/etc/machines/WINPC.btm b/windows_deliv/etc/machines/WINPC.btm new file mode 100644 index 0000000..c7141a0 --- /dev/null +++ b/windows_deliv/etc/machines/WINPC.btm @@ -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" + diff --git a/windows_deliv/etc/local-win64-vc140.btm b/windows_deliv/etc/profiles/win64-vc100.btm similarity index 57% rename from windows_deliv/etc/local-win64-vc140.btm rename to windows_deliv/etc/profiles/win64-vc100.btm index bb748e3..8755a8b 100644 --- a/windows_deliv/etc/local-win64-vc140.btm +++ b/windows_deliv/etc/profiles/win64-vc100.btm @@ -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 diff --git a/windows_deliv/etc/local-win64-vc150.btm b/windows_deliv/etc/profiles/win64-vc150.btm similarity index 100% rename from windows_deliv/etc/local-win64-vc150.btm rename to windows_deliv/etc/profiles/win64-vc150.btm diff --git a/windows_deliv/etc/local-win64-wsdk71.btm b/windows_deliv/etc/profiles/win64-wsdk71.btm similarity index 100% rename from windows_deliv/etc/local-win64-wsdk71.btm rename to windows_deliv/etc/profiles/win64-wsdk71.btm diff --git a/windows_deliv/etc/local-windows-vc150.btm b/windows_deliv/etc/profiles/windows-vc100.btm similarity index 57% rename from windows_deliv/etc/local-windows-vc150.btm rename to windows_deliv/etc/profiles/windows-vc100.btm index a15689e..4e56dc1 100644 --- a/windows_deliv/etc/local-windows-vc150.btm +++ b/windows_deliv/etc/profiles/windows-vc100.btm @@ -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 diff --git a/windows_deliv/init.btm b/windows_deliv/init.btm index 4fa4f9b..e9370a7 100644 --- a/windows_deliv/init.btm +++ b/windows_deliv/init.btm @@ -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 diff --git a/windows_deliv/make_delivery.btm b/windows_deliv/make_delivery.btm index ec6e9f2..dfbb61b 100644 --- a/windows_deliv/make_delivery.btm +++ b/windows_deliv/make_delivery.btm @@ -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