Clean previous WiX files for GPL and ENT cases.

This commit is contained in:
2019-02-13 11:11:29 +01:00
parent 67bfa6b310
commit 48be270648

View File

@@ -88,18 +88,21 @@ safe_md %INSTALL_DIR\setups
safe_md %INSTALL_DIR\setups\gpl safe_md %INSTALL_DIR\setups\gpl
safe_md %INSTALL_DIR\setups\enterprise safe_md %INSTALL_DIR\setups\enterprise
remtrace Creating WIX files remtrace Creating WIX files
espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo clean" espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo clean"
espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo"
iff not NO_GPL_BUILD then iff not NO_GPL_BUILD then
remtrace Preparing GPL edition 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" 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 safe_copy %INIT_DIR\install\bin\studio_gpl_%WINNAME\package.msi %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.msi
endiff endiff
iff not NO_ENTERPRISE_BUILD then iff not NO_ENTERPRISE_BUILD then
remtrace Preparing Commercial edition 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" 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 endiff