diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm index 02de4cf..ceca410 100644 --- a/windows_deliv/make_installations.btm +++ b/windows_deliv/make_installations.btm @@ -94,13 +94,17 @@ safe_md %INSTALL_DIR\setups safe_md %INSTALL_DIR\setups\gpl safe_md %INSTALL_DIR\setups\enterprise +ren %INSTALL_DIR%\releases\enterprise_version\LICENSE %INSTALL_DIR%\releases\enterprise_version\LICENSE_ENTERPRISE + 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 - fullrd %INIT_DIR%\install\bin\studio_gpl_%WINNAME% + 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 ) @@ -108,7 +112,7 @@ if "%NO_GPL_BUILD%" NEQ "True" ( if "%NO_ENTERPRISE_BUILD%" NEQ "True" ( remtrace Preparing Commercial edition remtrace Clean previous ENT WIX files - fullrd %INIT_DIR%\install\bin\studio_ent_%WINNAME% + rem 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 ) @@ -135,8 +139,8 @@ 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 then - safe_copy %INSTALL_DIR\releases\enterprise_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE + 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