From 48be2706488c929ffb499e869504ccf86f2b7bb8 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 13 Feb 2019 11:11:29 +0100 Subject: [PATCH] Clean previous WiX files for GPL and ENT cases. --- windows_deliv/make_installations.btm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm index 259d0bd..3ae3fd1 100644 --- a/windows_deliv/make_installations.btm +++ b/windows_deliv/make_installations.btm @@ -88,18 +88,21 @@ safe_md %INSTALL_DIR\setups safe_md %INSTALL_DIR\setups\gpl safe_md %INSTALL_DIR\setups\enterprise + remtrace Creating WIX files espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo clean" -espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo" - iff not NO_GPL_BUILD then 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 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