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

19
windows_deliv/inc/display_environment.btm
View File

@@ -22,21 +22,14 @@ echo The C environment: ISE_C_COMPILER=%ISE_C_COMPILER% (ISE_C_COMPILER_VER=%ISE
iff defined HAS_C_COMP_VER then
echo - HAS_C_COMP_VER=%HAS_C_COMP_VER% ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER% (ISE_C_COMPILER=%ISE_C_COMPILER%)
endiff
::iff defined HAS_WSDK71 then
:: echo - HAS_WSDK71=%HAS_WSDK71%
::endiff
iff defined HAS_VC100 then
echo - HAS_VC100=%HAS_VC100%
iff defined HAS_VC_MSC then
echo - HAS_VC_MSC=%HAS_VC_MSC%
echo - ISE_VC_MSC=%ISE_VC_MSC%
endiff
::iff defined HAS_VC110 then
:: echo - HAS_VC110=%HAS_VC110%
::endiff
iff defined HAS_VC140 then
echo - HAS_VC140=%HAS_VC140%
iff defined HAS_VC_MSC_VC140 then
echo - HAS_VC_MSC_VC140=%HAS_VC_MSC_VC140%
echo - ISE_VC_MSC_VC140=%ISE_VC_MSC_VC140%
endiff
::iff defined HAS_VC150 then
:: echo - HAS_VC150=%HAS_VC150%
::endiff
echo MYSQL lib location: %MYSQL%
echo -----------------------------

33
windows_deliv/init.btm
View File

@@ -13,6 +13,8 @@ set ISE_SRC=%TMP_EIFFEL_SRC
:: Make sure required directories exist
REM Create parent dir of %INSTALL_LOG if it does not exist.
echo DELIV_DIR=[%DELIV_DIR%]
echo INSTALL_LOG=[%INSTALL_LOG%]
set_parent_dir_of PDIR %INSTALL_LOG%
iff not isdir %PDIR then
md /S %PDIR
@@ -30,16 +32,27 @@ 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
::call %INIT_DIR\inc\set_has_c_compiler HAS_VC100 VC100
::call %INIT_DIR\inc\set_has_c_compiler HAS_VC140 VC140
::call %INIT_DIR\inc\set_has_c_compiler HAS_VC150 VC150
set "HAS_C_COMP_VER=False"
if "%ISE_C_COMPILER_VER%" NEQ "" (
IF /I "%ISE_C_COMPILER_VER%" NEQ "VC100" (
IF /I "%ISE_C_COMPILER_VER%" NEQ "VC140" (
call %INIT_DIR\inc\set_has_c_compiler HAS_C_COMP_VER %ISE_C_COMPILER_VER%
)
)
set "HAS_VC_MSC=False"
if "%ISE_VC_MSC%" NEQ "" (
call %INIT_DIR\inc\set_has_c_compiler HAS_VC_MSC %ISE_VC_MSC%
)
echo HAS_C_COMP_VER=%HAS_C_COMP_VER%
echo HAS_VC_MSC=%HAS_VC_MSC%
set "HAS_VC_MSC_VC140=False"
if "%ISE_VC_MSC_VC140%" NEQ "" (
call %INIT_DIR\inc\set_has_c_compiler HAS_VC_MSC_VC140 %ISE_VC_MSC_VC140%
)
echo HAS_VC_MSC_VC140=%HAS_VC_MSC_VC140%
:: if "%ISE_C_COMPILER_VER%" NEQ "" (
:: IF /I "%ISE_C_COMPILER_VER%" NEQ "VC100" (
:: IF /I "%ISE_C_COMPILER_VER%" NEQ "VC140" (
:: call %INIT_DIR\inc\set_has_c_compiler HAS_C_COMP_VER %ISE_C_COMPILER_VER%
:: )
:: )
:: )
::echo HAS_C_COMP_VER=%HAS_C_COMP_VER%

5
windows_deliv/install/update_from_svn.bat Normal file
View File

@@ -0,0 +1,5 @@
:: rd /q/s content
:: svn export https://svn.eiffel.com/eiffelstudio/trunk/Src/Delivery/scripts/windows/install/content content
rd /q/s includes
svn export https://svn.eiffel.com/eiffelstudio/trunk/Src/Delivery/scripts/windows/install/includes includes

55
windows_deliv/make_delivery.btm
View File

@@ -247,62 +247,47 @@ call make_other_libraries.btm %STUDIO_DIR
:clibs
remtrace Compile C code of Eiffel Software C libraries
remtrace HAS_VC100=%HAS_VC100%
remtrace HAS_VC140=%HAS_VC140%
remtrace HAS_VC_MSC=%HAS_VC_MSC%
remtrace HAS_VC_MSC_VC140=%HAS_VC_MSC_VC140%
remtrace HAS_C_COMP_VER=%HAS_C_COMP_VER% : ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER% (ISE_C_COMPILER=%ISE_C_COMPILER%)
IF "%HAS_VC100%" == "True" (
IF "%HAS_VC_MSC%" == "True" (
cdd %INIT_DIR
remtrace Build the C libraries of non-Eiffel Software C libraries for msc (VC100)
call espawn -u:VC100 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc"
remtrace Build the C libraries of non-Eiffel Software C libraries for msc (%ISE_VC_MSC%)
call espawn -u:%ISE_VC_MSC% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc"
)
IF "%HAS_VC140%" == "True" (
IF "%HAS_VC_MSC_VC140%" == "True" (
cdd %INIT_DIR
remtrace Build the C libraries of non-Eiffel Software C libraries for msc_vc140 (VC140)
call espawn -u:VC140 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc_vc140"
)
IF "%HAS_C_COMP_VER%" == "True" (
remtrace Build the C libraries of non-Eiffel Software C libraries for %ISE_C_COMPILER (%ISE_C_COMPILER_VER%)
cdd %INIT_DIR
call espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR %ISE_C_COMPILER%"
remtrace Build the C libraries of non-Eiffel Software C libraries for msc_vc140 (%ISE_VC_MSC_VC140%)
call espawn -u:%ISE_VC_MSC_VC140% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc_vc140"
)
cdd %INIT_DIR
remtrace Build the C libraries of non-Eiffel Software C libraries for mingw
call compile_c_libraries.btm %STUDIO_DIR mingw
IF "%HAS_VC100%" == "True" (
IF "%HAS_VC_MSC%" == "True" (
cdd %INIT_DIR
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for msc_vc100 (VC100)
call espawn -u:VC100 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc"
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for msc (%ISE_VC_MSC%)
call espawn -u:%ISE_VC_MSC% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc"
)
IF "%HAS_VC140%" == "True" (
IF "%HAS_VC_MSC_VC140%" == "True" (
cdd %INIT_DIR
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for msc_vc140 (VC140)
call espawn -u:VC140 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc_vc140"
)
IF "%HAS_C_COMP_VER%" == "True" (
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for %ISE_C_COMPILER% (%ISE_C_COMPILER_VER%)
cdd %INIT_DIR
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental %ISE_C_COMPILER%"
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for msc_vc140 (%ISE_VC_MSC_VC140%)
call espawn -u:%ISE_VC_MSC_VC140% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc_vc140"
)
cdd %INIT_DIR
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for mingw
call compile_c_libraries.btm %STUDIO_DIR\experimental mingw
IF "%HAS_VC100%" == "True" (
remtrace Build the other C libraries of non-Eiffel Software C libraries for msc (VC100)
IF "%HAS_VC_MSC%" == "True" (
remtrace Build the other C libraries of non-Eiffel Software C libraries for msc (%ISE_VC_MSC%)
cdd %INIT_DIR
espawn -u:VC100 "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc"
espawn -u:%ISE_VC_MSC% "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc"
)
IF "%HAS_VC140%" == "True" (
remtrace Build the other C libraries of non-Eiffel Software C libraries for msc_vc140 (VC140)
IF "%HAS_VC_MSC_VC140%" == "True" (
remtrace Build the other C libraries of non-Eiffel Software C libraries for msc_vc140 (%ISE_VC_MSC_VC140%)
cdd %INIT_DIR
espawn -u:VC140 "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc_vc140"
)
IF "%HAS_C_COMP_VER%" == "True" (
remtrace Build the other C libraries of non-Eiffel Software C libraries for %ISE_C_COMPILER% (%ISE_C_COMPILER_VER%)
cdd %INIT_DIR
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR %ISE_C_COMPILER%"
espawn -u:%ISE_VC_MSC_VC140% "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc_vc140"
)
remtrace Build the other C libraries of non-Eiffel Software C libraries for mingw
cdd %INIT_DIR

22
windows_deliv/make_exes.btm
View File

@@ -42,16 +42,22 @@ else
safe_copy %EIFFEL_SRC\C\CONFIGS\windows-x86-64-mingw %STUDIO_DIR\studio\config\%ISE_PLATFORM\mingw\config.sh
endiff
IF "%HAS_VC140%" == "True" (
remtrace Compile the run-time for Microsoft (msc_vc140)
espawn -u:VC140 "%COMSPEC% /c %INIT_DIR%\make_runtimes.btm msc_vc140"
IF "%ISE_C_COMPILER%" NEQ "msc_vc140" (
IF "%HAS_VC_MSC_VC140%" == "True" (
remtrace Compile the run-time for Microsoft (msc_vc140)
espawn -u:%ISE_VC_MSC_VC140% "%COMSPEC% /c %INIT_DIR%\make_runtimes.btm msc_vc140"
)
)
IF "%HAS_VC100%" == "True" (
remtrace Compile the run-time for Microsoft (msc)
espawn -u:VC100 "%COMSPEC% /c %INIT_DIR%\make_runtimes.btm msc"
IF "%ISE_C_COMPILER%" NEQ "msc" (
IF "%HAS_VC_MSC%" == "True" (
remtrace Compile the run-time for Microsoft (msc)
espawn -u:%ISE_VC_MSC% "%COMSPEC% /c %INIT_DIR%\make_runtimes.btm msc"
)
)
IF "%HAS_C_COMP_VER%" == "True" (
remtrace Compile the run-time for Microsoft (ISE_C_COMPILER=%ISE_C_COMPILER% ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER%)
rem Compile last, the version of the runtime corresponding to the compiler compiling the executables
IF "%ISE_C_COMPILER%" NEQ "" (
remtrace Compile the run-time for Microsoft (%ISE_C_COMPILER%)
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c %INIT_DIR%\make_runtimes.btm %ISE_C_COMPILER%"
)

38
windows_deliv/make_installations.btm
View File

@@ -27,9 +27,9 @@ endiff
iff .%1.==.. then
remtrace ---------------------------------------------
remtrace =============================================
remtrace Checkout and compile the hallow tool
remtrace ---------------------------------------------
remtrace =============================================
cdd %EIFFEL_SRC\tools
remtrace Compile finish_freezing Clib
@@ -51,11 +51,11 @@ iff .%1.==.. then
move eiffelsoftware.runtime.dll %INIT_DIR\install\bin
endiff
remtrace --------------------------------------------------
remtrace ==================================================
remtrace Recompile Custom actions for installation program
remtrace --------------------------------------------------
remtrace ==================================================
iff not defined NO_ENTERPRISE_BUILD then
if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
cdd %EIFFEL_SRC
cd tools
if EXIST %INIT_DIR%\isesvn\tools\setup (
@@ -75,12 +75,12 @@ iff .%1.==.. then
safe_md %INIT_DIR\install\binaries
safe_md %INIT_DIR\install\binaries\%WINNAME
move setup.dll %INIT_DIR\install\binaries\%WINNAME
endiff
)
endiff
remtrace ----------------------------------------------
remtrace ==============================================
remtrace Building the MSIs
remtrace ----------------------------------------------
remtrace ==============================================
cdd %INIT_DIR\install\content\eiffelstudio
@@ -91,28 +91,28 @@ safe_md %INSTALL_DIR\setups\enterprise
remtrace Creating WIX files
espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo clean"
iff not NO_GPL_BUILD then
if "%NO_GPL_BUILD%" NEQ "True" (
remtrace Preparing GPL edition
remtrace Clean previous GPL WIX files
fullrd %INIT_DIR%\install\bin\studio_gpl_%WINNAME%
espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo gpl_%WINNAME"
safe_copy %INIT_DIR\install\bin\studio_gpl_%WINNAME\package.msi %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.msi
endiff
)
iff not NO_ENTERPRISE_BUILD then
if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
remtrace Preparing Commercial edition
remtrace Clean previous ENT WIX files
fullrd %INIT_DIR%\install\bin\studio_ent_%WINNAME%
espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo enterprise_%WINNAME"
safe_copy %INIT_DIR\install\bin\studio_ent_%WINNAME\package.msi %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.msi
endiff
)
remtrace ----------------------------------------------
remtrace ==============================================
remtrace Building the Zips
remtrace ----------------------------------------------
remtrace ==============================================
cdd %INSTALL_DIR
iff not NO_GPL_BUILD then
if "%NO_GPL_BUILD%" NEQ "True" (
ren EiffelStudio %STUDIO_NAME%
remtrace GPL archive
safe_copy %INSTALL_DIR\releases\gpl_version\ec.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
@@ -125,7 +125,7 @@ iff not NO_GPL_BUILD then
7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
endiff
iff not NO_ENTERPRISE_BUILD then
if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
remtrace Enterprise archive
safe_copy %INSTALL_DIR\releases\enterprise_version\ec.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
safe_copy %INSTALL_DIR\releases\enterprise_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
@@ -135,18 +135,18 @@ iff not NO_ENTERPRISE_BUILD then
remtrace Missing Enterprise license text
endiff
7z a -t7z %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
endiff
)
remtrace Restoring the layout to its original state
cdd %INSTALL_DIR
ren %STUDIO_NAME% EiffelStudio
remtrace Uploading packages online
iff not NO_GPL_BUILD then
if "%NO_GPL_BUILD%" NEQ "True" (
cdd %INSTALL_DIR\setups\gpl
share_delivery %STUDIO_NAME%_gpl_%SVN_VERSION%-%ISE_PLATFORM%.msi
share_delivery %STUDIO_NAME%_gpl_%SVN_VERSION%-%ISE_PLATFORM%.7z
endiff
)
fullrf %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin\ec.exe
fullrf %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin\ecb.exe

7
windows_deliv/make_runtimes.btm
View File

@@ -4,6 +4,8 @@ call %INIT_DIR%\set_simple_aliases.btm
remtrace Compile the runtime for C compiler %1
remtrace - Configure a run-time for Microsoft %1
cd %EIFFEL_SRC\C
call configure clean >>& %INSTALL_LOG
iff defined WIN64 then
@@ -20,7 +22,7 @@ fullrf C\run-time\LIB\*.exp
safe_copy C\run-time\LIB\*dll* %STUDIO_DIR\studio\spec\%ISE_PLATFORM\lib\%1
cd %EIFFEL_SRC
remtrace Compile a run-time for Microsoft
remtrace - Compile a run-time for Microsoft %1
cd %EIFFEL_SRC\C
call configure clean >>& %INSTALL_LOG
iff defined WIN64 then
@@ -34,13 +36,14 @@ else
endiff
cd %EIFFEL_SRC
remtrace - Copy the generated files to %ISE_PLATFORM%\lib\%1
safe_copy C\run-time\LIB\*.lib %STUDIO_DIR\studio\spec\%ISE_PLATFORM\lib\%1
iff not defined WIN64 then
safe_copy C\desc\ise_desc.dll %STUDIO_DIR\studio\spec\%ISE_PLATFORM\lib\%1
safe_copy C\desc\ise_desc.lib %STUDIO_DIR\studio\spec\%ISE_PLATFORM\lib\%1
endiff
remtrace Copy the configuration file
remtrace - Copy the configuration file (%1)
iff not defined WIN64 then
safe_copy %EIFFEL_SRC\C\CONFIGS\windows-x86-msc %STUDIO_DIR\studio\config\%ISE_PLATFORM\%1\config.sh
else

16
windows_deliv/menu.bat
View File

@@ -1,7 +1,7 @@
@echo off
setlocal
set TCCLECMD="C:\apps\JPSoft\TCCLE14x64\tcc.exe"
set TCCLECMD="C:\Program Files\JPSoft\TCCLE14x64\tcc.exe"
::set TCCLECMD="C:\Program Files\JPSoft\TCCLE14x64\tcc.exe"
echo EiffelStudio delivery:
@@ -12,12 +12,13 @@ echo EiffelStudio delivery:
@echo 5: bootstrap environment
@echo 6: display logs
@echo 7: make_gpl_delivery
@echo 8: make_gpl_installation
@echo -------------------
@echo i: display info
@echo -------------------
@echo q: quit
CHOICE /C 1234567iq /M " > selection:"
CHOICE /C 12345678iq /M " > selection:"
if .%ERRORLEVEL%. == .1. GOTO make_delivery
if .%ERRORLEVEL%. == .2. GOTO make_exes
if .%ERRORLEVEL%. == .3. GOTO make_installations
@@ -25,8 +26,9 @@ if .%ERRORLEVEL%. == .4. GOTO starting_env
if .%ERRORLEVEL%. == .5. GOTO bootstrap_env
if .%ERRORLEVEL%. == .6. GOTO display_logs
if .%ERRORLEVEL%. == .7. GOTO make_gpl_delivery
if .%ERRORLEVEL%. == .8. GOTO display_info
if .%ERRORLEVEL%. == .9. goto end
if .%ERRORLEVEL%. == .8. GOTO make_gpl_installation
if .%ERRORLEVEL%. == .9. GOTO display_info
if .%ERRORLEVEL%. == .10. goto end
goto end
:make_delivery
@@ -39,6 +41,12 @@ set NO_ENTERPRISE_BUILD="True"
%TCCLECMD% /C make_delivery.btm
goto end
:make_gpl_installation
echo Build only GPL installation delivery
set NO_ENTERPRISE_BUILD="True"
%TCCLECMD% /C make_installations.btm
goto end
:make_exes
%TCCLECMD% /C make_exes.btm
goto end

13
windows_deliv/set_aliases.btm
View File

@@ -18,13 +18,20 @@ else
CANCEL
endiff
set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_C_COMPILER_VER%
echo ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER%
iff defined ISE_C_COMPILER_VER then
set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_VC_MSC%_%ISE_VC_MSC_VC140%.%ISE_C_COMPILER_VER%
set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_C_COMPILER_VER%
else
set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%
endiff
echo WORK_DIR=%WORK_DIR%
set DELIV_DIR=%WORK_DIR%\build
REM The file where all output is stored
set INSTALL_LOG=%DELIV_DIR\install.log
set ERROR_LOG=%DELIV_DIR\error.log
set INSTALL_LOG=%DELIV_DIR%\install.log
set ERROR_LOG=%DELIV_DIR%\error.log
REM NB: The following directory is where a new version of ec.exe will be finalized.
set FINALIZATION_DIR=%DELIV_DIR