From 57c059d19089ecc91347341bea7349016df6889c Mon Sep 17 00:00:00 2001 From: Jocelyn Date: Mon, 4 Mar 2019 19:28:19 +0000 Subject: [PATCH] fixed various issue between dos and tccle. --- windows_deliv/.gitignore | 2 + windows_deliv/make_installations.btm | 87 +++++++++++++++++----------- 2 files changed, 54 insertions(+), 35 deletions(-) diff --git a/windows_deliv/.gitignore b/windows_deliv/.gitignore index bf867e0..6dd74b1 100644 --- a/windows_deliv/.gitignore +++ b/windows_deliv/.gitignore @@ -1 +1,3 @@ nightly +include +isevpn diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm index ceca410..8976fa4 100644 --- a/windows_deliv/make_installations.btm +++ b/windows_deliv/make_installations.btm @@ -58,17 +58,22 @@ iff .%1.==.. then remtrace ================================================== remtrace Recompile Custom actions for installation program remtrace ================================================== - if "%NO_ENTERPRISE_BUILD%" NEQ "True" ( - cdd %EIFFEL_SRC + remtrace NO_ENTERPRISE_BUILD=%NO_ENTERPRISE_BUILD% + cd %EIFFEL_SRC cd tools - if EXIST %INIT_DIR%\isesvn\tools\setup ( - if not EXIST setup ( - xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I - ) - ) else ( + iff EXIST %INIT_DIR%\isesvn\tools\setup then + remtrace Get ISE SVN tools setup from folder + iff EXIST setup then + fullrd setup + endiff + xcopy /E /I /Y %INIT_DIR%\isesvn\tools\setup setup + else + remtrace Get ISE SVN tools setup from subversion co %DEFAULT_ISE_SVN%/Src/tools/setup setup - ) + endiff + + remtrace Build studio setup.dll cd %EIFFEL_SRC\tools\setup\studio clean_project finalize setup.ecf @@ -96,19 +101,16 @@ safe_md %INSTALL_DIR\setups\enterprise ren %INSTALL_DIR%\releases\enterprise_version\LICENSE %INSTALL_DIR%\releases\enterprise_version\LICENSE_ENTERPRISE +if exist %INSTALL_DIR%\%STUDIO_NAME% ( + echo issue from previous building! + ren %INSTALL_DIR%\%STUDIO_NAME% %INSTALL_DIR%\EiffelStudio +) + remtrace Creating WIX files espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo clean" espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo" -if "%NO_GPL_BUILD%" NEQ "True" ( - remtrace Preparing GPL edition - remtrace Clean previous GPL WIX files - rem 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 -) - if "%NO_ENTERPRISE_BUILD%" NEQ "True" ( remtrace Preparing Commercial edition remtrace Clean previous ENT WIX files @@ -117,34 +119,49 @@ if "%NO_ENTERPRISE_BUILD%" NEQ "True" ( safe_copy %INIT_DIR\install\bin\studio_ent_%WINNAME\package.msi %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.msi ) +if "%NO_GPL_BUILD%" NEQ "True" ( + remtrace Preparing GPL edition + remtrace Clean previous GPL WIX files + rem 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 +) remtrace ============================================== remtrace Building the Zips remtrace ============================================== cdd %INSTALL_DIR 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 - safe_copy %INSTALL_DIR\releases\gpl_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin - iff exist %INSTALL_DIR\releases\gpl_version\LICENSE then - safe_copy %INSTALL_DIR\releases\gpl_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE - else - remtrace Missing GPL license text - endiff - 7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG + if exist %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z ( + remtrace GPL archive: reuse + ) else ( + 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 + safe_copy %INSTALL_DIR\releases\gpl_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin + iff exist %INSTALL_DIR\releases\gpl_version\LICENSE then + safe_copy %INSTALL_DIR\releases\gpl_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE + else + remtrace Missing GPL license text + endiff + 7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG + ) ) 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 - iff exist %INSTALL_DIR\releases\enterprise_version\LICENSE_ENTERPRISE then - safe_copy %INSTALL_DIR\releases\enterprise_version\LICENSE_ENTERPRISE %INSTALL_DIR\%STUDIO_NAME%\LICENSE - else - 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 + if exist %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.7z ( + remtrace Enterprise archive: reuse + ) else ( + 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 + iff exist %INSTALL_DIR\releases\enterprise_version\LICENSE then + safe_copy %INSTALL_DIR\releases\enterprise_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE + else + 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 + ) ) remtrace Restoring the layout to its original state