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

temp change for gpl+ent

Browse Source
This commit is contained in:
Jocelyn FIAT
2019-03-04 15:43:49 +01:00
parent b085349683
commit 7575a75ca8
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
windows_deliv/make_installations.btm
View File

@@ -94,13 +94,17 @@ 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
ren %INSTALL_DIR%\releases\enterprise_version\LICENSE %INSTALL_DIR%\releases\enterprise_version\LICENSE_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"
if "%NO_GPL_BUILD%" NEQ "True" ( if "%NO_GPL_BUILD%" NEQ "True" (
remtrace Preparing GPL edition remtrace Preparing GPL edition
remtrace Clean previous GPL WIX files 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" 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
) )
@@ -108,7 +112,7 @@ if "%NO_GPL_BUILD%" NEQ "True" (
if "%NO_ENTERPRISE_BUILD%" NEQ "True" ( 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% rem 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
) )
@@ -135,8 +139,8 @@ 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
iff exist %INSTALL_DIR\releases\enterprise_version\LICENSE then iff exist %INSTALL_DIR\releases\enterprise_version\LICENSE_ENTERPRISE then
safe_copy %INSTALL_DIR\releases\enterprise_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE safe_copy %INSTALL_DIR\releases\enterprise_version\LICENSE_ENTERPRISE %INSTALL_DIR\%STUDIO_NAME%\LICENSE
else else
remtrace Missing Enterprise license text remtrace Missing Enterprise license text
endiff endiff