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

reverted changes.

Browse Source
This commit is contained in:
Jocelyn FIAT
2019-03-03 20:32:52 +00:00
parent 91720afd41
commit f9cb7ff160
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
windows_deliv/make_installations.btm
View File

@@ -59,7 +59,7 @@ iff .%1.==.. then
remtrace Recompile Custom actions for installation program 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 cdd %EIFFEL_SRC
cd tools cd tools
if EXIST %INIT_DIR%\isesvn\tools\setup ( if EXIST %INIT_DIR%\isesvn\tools\setup (
@@ -81,7 +81,7 @@ iff .%1.==.. then
safe_md %INIT_DIR\install\binaries safe_md %INIT_DIR\install\binaries
safe_md %INIT_DIR\install\binaries\%WINNAME safe_md %INIT_DIR\install\binaries\%WINNAME
move setup.dll %INIT_DIR\install\binaries\%WINNAME move setup.dll %INIT_DIR\install\binaries\%WINNAME
endiff )
endiff endiff
remtrace ============================================== remtrace ==============================================
@@ -105,13 +105,13 @@ if "%NO_GPL_BUILD%" NEQ "True" (
safe_copy %INIT_DIR\install\bin\studio_gpl_%WINNAME\package.msi %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.msi safe_copy %INIT_DIR\install\bin\studio_gpl_%WINNAME\package.msi %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.msi
) )
iff not defined NO_ENTERPRISE_BUILD then if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
remtrace Preparing Commercial edition remtrace Preparing Commercial edition
remtrace Clean previous ENT WIX files remtrace Clean previous ENT WIX files
fullrd %INIT_DIR%\install\bin\studio_ent_%WINNAME% fullrd %INIT_DIR%\install\bin\studio_ent_%WINNAME%
espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo enterprise_%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 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 ==============================================
@@ -131,7 +131,7 @@ if "%NO_GPL_BUILD%" NEQ "True" (
7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG 7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
) )
iff not defined NO_ENTERPRISE_BUILD then if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
remtrace Enterprise archive 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\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 safe_copy %INSTALL_DIR\releases\enterprise_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
@@ -141,7 +141,7 @@ iff not defined NO_ENTERPRISE_BUILD then
remtrace Missing Enterprise license text remtrace Missing Enterprise license text
endiff endiff
7z a -t7z %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG 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 remtrace Restoring the layout to its original state
cdd %INSTALL_DIR cdd %INSTALL_DIR