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

fixed various issue between dos and tccle.

Browse Source
This commit is contained in:
Jocelyn FIAT
2019-03-04 19:28:19 +00:00
parent 7575a75ca8
commit 57c059d190
2 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
windows_deliv/.gitignore vendored
View File

@@ -1 +1,3 @@
nightly
include
isevpn

53
windows_deliv/make_installations.btm
View File

@@ -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,12 +119,22 @@ 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" (
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
@@ -134,18 +146,23 @@ if "%NO_GPL_BUILD%" NEQ "True" (
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" (
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_ENTERPRISE then
safe_copy %INSTALL_DIR\releases\enterprise_version\LICENSE_ENTERPRISE %INSTALL_DIR\%STUDIO_NAME%\LICENSE
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
cdd %INSTALL_DIR