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

Added a solution to generate only GPL version.

Browse Source
This commit is contained in:
Jocelyn FIAT
2018-09-07 19:33:13 +02:00
parent 1415685e5e
commit 12e9c09911
9 changed files with 140 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
windows_deliv/etc/config.btm
View File

@@ -17,7 +17,7 @@ endiff
REM General configuration
iff not defined STUDIO_VERSION_MAJOR_MINOR then
set STUDIO_VERSION_MAJOR_MINOR=18.06
set STUDIO_VERSION_MAJOR_MINOR=18.11
endiff
iff not defined WORK_DIR then

2
windows_deliv/etc/local-WINPC.btm
View File

@@ -29,7 +29,7 @@ iff not defined WORK_DIR then
endiff
iff not defined DEFAULT_PUBLIC_SVN then
set DEFAULT_PUBLIC_SVN=file:///C:/DEV/ise/repos/mirrors/svn/eiffelstudio/trunk
set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk
rem set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk
endiff
iff not defined DEFAULT_ISE_SVN then
set DEFAULT_ISE_SVN=svn://jfiat@svn.ise:3691/ise_svn/trunk

4
windows_deliv/etc/machines/WINPC.btm
View File

@@ -29,12 +29,12 @@ iff not defined WORK_DIR then
endiff
iff not defined DEFAULT_PUBLIC_SVN then
set DEFAULT_PUBLIC_SVN=file:///C:/DEV/ise/repos/mirrors/svn/eiffelstudio/trunk
set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk
rem set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk
endiff
iff not defined DEFAULT_ISE_SVN then
set DEFAULT_ISE_SVN=svn://jfiat@svn.ise:3691/ise_svn/trunk
set DEFAULT_ISE_SVN=file:///C:/DEV/ise/repos/mirrors/svn/ise/trunk
set DEFAULT_ISE_SVN=svn://192.168.1.11:3698/trunk
rem set DEFAULT_ISE_SVN=svn://192.168.1.11:3698/trunk
endiff
rem set PATH=%PATH%;C:\cygwin64\bin

6
windows_deliv/inc/display_environment.btm
View File

@@ -6,6 +6,12 @@ echo ISE_PLATFORM=%ISE_PLATFORM
echo DELIV_DIR=%DELIV_DIR
echo INSTALL_DIR=%INSTALL_DIR
echo STUDIO_DIR=%STUDIO_DIR
iff defined NO_GPL_BUILD then
echo NO_GPL_BUILD=%NO_GPL_BUILD
endiff
iff defined NO_ENTERPRISE_BUILD then
echo NO_ENTERPRISE_BUILD=%NO_ENTERPRISE_BUILD
endiff
echo Log file location: %INSTALL_LOG
echo The private ISE svn repository: %DEFAULT_ISE_SVN
echo The public svn repository: %DEFAULT_PUBLIC_SVN

24
windows_deliv/install/includes/Preprocessors.wxi
View File

@@ -30,19 +30,19 @@
<?define LicenseFile = "gpl.rtf"?>
<?endif?>
<?ifdef x64?>
<?define ProductGuid = "9CCB7F8C-7AC0-44d0-8F0F-F17A1E4E0161" ?>
<?define RegistriesGuid = "238E308A-4805-4803-AE76-105BD697B236" ?>
<?define ShortcutsGuid = "D52D8C72-06D3-4bde-A27F-00A184062D70" ?>
<?define ProductGuid = "F7D6C690-EC35-C4C3-7A50-00008ACC496D" ?>
<?define RegistriesGuid = "2229FB66-8B4E-218C-484D-8573938B9437" ?>
<?define ShortcutsGuid = "5B2CA393-EF3B-50DE-8854-18530D291BBF" ?>
<?else?>
<?define ProductGuid = "9ABBC2D5-C6AE-4816-B34F-CE4C3A5BCC45" ?>
<?define RegistriesGuid = "67E1AF55-FD3D-4a92-97CF-DE7D195A485F" ?>
<?define ShortcutsGuid = "2697FFE1-80F1-445a-8745-E0913FCA69CB" ?>
<?define ProductGuid = "B9B525CF-4DFB-3150-0060-64A4788E2142" ?>
<?define RegistriesGuid = "E32C6AE0-B9FD-2FE4-5405-39A39E3BDA04" ?>
<?define ShortcutsGuid = "AC48CF2C-65CF-8056-09C3-6FFBB6C8D9B4" ?>
<?endif?>
<?define UpgradeGuid = "8F2F7FDA-F3F9-4ebc-8FF3-E320EE191970" ?>
<?define UpgradeGuid = "F7F00C79-1833-49A2-8DDB-17AB76E2AB14" ?>
<?define Product = "EiffelStudio" ?>
<?define ProductVersion = "18.07" ?>
<?define ProductDescription = "EiffelStudio 18.07 Integrated Development Environment (IDE) Installer" ?>
<?define ProductKey = "Eiffel_18.07" ?>
<?define ProductVersion = "18.11" ?>
<?define ProductDescription = "EiffelStudio 18.11 Integrated Development Environment (IDE) Installer" ?>
<?define ProductKey = "Eiffel_18.11" ?>
<?else?>
<?ifdef EiffelEnvision?>
<?ifdef Enterprise?>
@@ -61,7 +61,7 @@
<?define Product = "EiffelEnvision" ?>
<?define ProductVersion = "2.8" ?>
<?define ProductDescription = "EiffelEnvision 2.8 The Eiffel for .NET Language Package for Visual Studio .NET 2005" ?>
<?define ProductKey = "Eiffel_18.07" ?>
<?define ProductKey = "Eiffel_18.11" ?>
<?else?>
<?define Edition = "Test"?>
<?define LicenseFile = "gpl.rtf"?>
@@ -70,7 +70,7 @@
<?define Product = "EiffelStudio" ?>
<?define ProductVersion = "2.8" ?>
<?define ProductDescription = "Test" ?>
<?define ProductKey = "Eiffel_18.07" ?>
<?define ProductKey = "Eiffel_18.11" ?>
<?endif?>
<?endif?>
<?define ProductName = "$(var.Product) $(var.ProductVersion) ($(var.Platform)) $(var.Edition)" ?>

11
windows_deliv/make_delivery.btm
View File

@@ -21,6 +21,7 @@ iff %@INDEX[%@LOWER[%$],h] ge 0 then
echo - no_compile: to discard any compilation
echo - no_new_ec: to avoid compiling a new version of EiffelStudio
echo - enterprise: to build only the enterprise version of EiffelStudio
echo - gpl: to build only the GPL version of EiffelStudio
echo - no_wizards: to discard wizards building
echo - no_install: to generare only the delivery (but not the installation executable)
echo (or nothing to fully regenerate the installation).
@@ -42,9 +43,12 @@ else
unset /Q NO_NEW_EC
endiff
iff %@INDEX[%@LOWER[%$],enterprise] ge 0 then
set BUILD_ENTERPRISE_ONLY="True"
else
unset /Q BUILD_ENTERPRISE_ONLY
set NO_GPL_BUILD="True"
endiff
iff %@INDEX[%@LOWER[%$],gpl] ge 0 then
set NO_ENTERPRISE_BUILD="True"
unset /Q BUILD_ENTERPRISE
set BUILD_GPL="True"
endiff
iff %@INDEX[%@LOWER[%$],no_wizard] ge 0 then
set NO_WIZARDS="True"
@@ -367,7 +371,6 @@ else
endiff
call %INIT_DIR%\call_make_installations.btm
cdd %INIT_DIR%
REM Finish

116
windows_deliv/make_exes.btm
View File

@@ -85,8 +85,8 @@ cd %EIFFEL_SRC\framework\cli_debugger\Clib
default_make
REM Compiling EiffelStudio stuff
iff defined BUILD_ENTERPRISE_ONLY then
remtrace BUILD_ENTERPRISE_ONLY
iff defined NO_GPL_BUILD then
remtrace NO_GPL_BUILD=BUILD_ENTERPRISE_ONLY
remtrace Recompile EiffelStudio
cdd %FINALIZATION_DIR
safe_copy %EIFFEL_SRC\Eiffel\Ace\*.* .
@@ -126,63 +126,67 @@ iff defined BUILD_ENTERPRISE_ONLY then
else
iff not defined NO_NEW_EC then
remtrace GPL edition
cdd %EIFFEL_SRC\Eiffel\API\constants
remtrace update version for system_constants.e
set_version %EIFFEL_SRC 0000 system_constants.e
cdd %FINALIZATION_DIR
safe_copy %EIFFEL_SRC\Eiffel\Ace\*.* .
clean_project
remtrace finalize GPL edition "bench"
finalize ec.ecf bench
cleanup_eiffel bench ec.exe
iff exist ec.exe then
move ec.exe %INSTALL_DIR\releases\gpl_version
else
remerror Could not finalize a new "gpl_edition" EiffelStudio
CANCEL_ON_ERROR
iff not defined NO_GPL_BUILD then
remtrace GPL edition
cdd %EIFFEL_SRC\Eiffel\API\constants
remtrace update version for system_constants.e
set_version %EIFFEL_SRC 0000 system_constants.e
cdd %FINALIZATION_DIR
safe_copy %EIFFEL_SRC\Eiffel\Ace\*.* .
clean_project
remtrace finalize GPL edition "bench"
finalize ec.ecf bench
cleanup_eiffel bench ec.exe
iff exist ec.exe then
move ec.exe %INSTALL_DIR\releases\gpl_version
else
remerror Could not finalize a new "gpl_edition" EiffelStudio
CANCEL_ON_ERROR
endiff
clean_project
remtrace finalize GPL edition "batch"
finalize ec.ecf batch
cleanup_eiffel batch ecb.exe
iff exist ecb.exe then
move ecb.exe %INSTALL_DIR\releases\gpl_version
else
remerror Could not finalize a new batch version of the compiler
CANCEL_ON_ERROR
endiff
exprtfile -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src/Delivery/scripts/licensing/eiffelstudio/gpl.txt > %INSTALL_DIR\releases\gpl_version\LICENSE
endiff
clean_project
remtrace finalize GPL edition "batch"
finalize ec.ecf batch
cleanup_eiffel batch ecb.exe
iff exist ecb.exe then
move ecb.exe %INSTALL_DIR\releases\gpl_version
else
remerror Could not finalize a new batch version of the compiler
CANCEL_ON_ERROR
iff not defined NO_ENTERPRISE_BUILD then
remtrace Enterprise edition for EiffelStudio
cdd %EIFFEL_SRC\Eiffel\API\constants
sed -e "s/Version_type_name:\ STRING\ =\ \"GPL\ Edition\"/Version_type_name:\ STRING\ =\ \"Enterprise\ Edition\"/g" system_constants.e >> new_system_constants.e
move new_system_constants.e system_constants.e
cdd %FINALIZATION_DIR
clean_project
safe_copy %EIFFEL_SRC\tools\estudio_enterprise\ec.ecf ec.ecf
finalize ec.ecf bench
cleanup_eiffel bench ec.exe
iff exist ec.exe then
move ec.exe %INSTALL_DIR\releases\enterprise_version
else
remerror Could not finalize a new "enterprise_version" EiffelStudio
CANCEL_ON_ERROR
endiff
clean_project
finalize ec.ecf batch
cleanup_eiffel batch ecb.exe
iff exist ecb.exe then
move ecb.exe %INSTALL_DIR\releases\enterprise_version
else
remerror Could not finalize a new batch version of the compiler
CANCEL_ON_ERROR
endiff
exprtfile -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src/Delivery/scripts/licensing/eiffelstudio/enterprise.txt > %INSTALL_DIR\releases\enterprise_version\LICENSE
endiff
exprtfile -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src/Delivery/scripts/licensing/eiffelstudio/gpl.txt > %INSTALL_DIR\releases\gpl_version\LICENSE
remtrace Enterprise edition for EiffelStudio
cdd %EIFFEL_SRC\Eiffel\API\constants
sed -e "s/Version_type_name:\ STRING\ =\ \"GPL\ Edition\"/Version_type_name:\ STRING\ =\ \"Enterprise\ Edition\"/g" system_constants.e >> new_system_constants.e
move new_system_constants.e system_constants.e
cdd %FINALIZATION_DIR
clean_project
safe_copy %EIFFEL_SRC\tools\estudio_enterprise\ec.ecf ec.ecf
finalize ec.ecf bench
cleanup_eiffel bench ec.exe
iff exist ec.exe then
move ec.exe %INSTALL_DIR\releases\enterprise_version
else
remerror Could not finalize a new "enterprise_version" EiffelStudio
CANCEL_ON_ERROR
endiff
clean_project
finalize ec.ecf batch
cleanup_eiffel batch ecb.exe
iff exist ecb.exe then
move ecb.exe %INSTALL_DIR\releases\enterprise_version
else
remerror Could not finalize a new batch version of the compiler
CANCEL_ON_ERROR
endiff
exprtfile -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src/Delivery/scripts/licensing/eiffelstudio/enterprise.txt > %INSTALL_DIR\releases\enterprise_version\LICENSE
endiff
endiff

65
windows_deliv/make_installations.btm
View File

@@ -86,50 +86,61 @@ remtrace Creating WIX files
espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo clean"
espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo"
remtrace Preparing GPL edition
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
iff not NO_GPL_BUILD then
remtrace Preparing GPL edition
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
remtrace Preparing Commercial edition
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
iff not NO_ENTERPRISE_BUILD then
remtrace Preparing Commercial edition
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
remtrace ----------------------------------------------
remtrace Building the Zips
remtrace ----------------------------------------------
cdd %INSTALL_DIR
ren EiffelStudio %STUDIO_NAME%
safe_copy %INSTALL_DIR\releases\gpl_version\ec.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
safe_copy %INSTALL_DIR\releases\gpl_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
iff exist %INSTALL_DIR\releases\gpl_version\LICENSE then
safe_copy %INSTALL_DIR\releases\gpl_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE
else
remtrace Missing GPL license text
iff not NO_GPL_BUILD then
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
safe_copy %INSTALL_DIR\releases\gpl_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
iff exist %INSTALL_DIR\releases\gpl_version\LICENSE then
safe_copy %INSTALL_DIR\releases\gpl_version\LICENSE %INSTALL_DIR\%STUDIO_NAME%\LICENSE
else
remtrace Missing GPL license text
endiff
7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
endiff
7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
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
else
remtrace Missing Enterprise license text
iff not NO_ENTERPRISE_BUILD then
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
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
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
ren %STUDIO_NAME% EiffelStudio
remtrace Uploading packages online
cdd %INSTALL_DIR\setups\gpl
share_delivery %STUDIO_NAME%_gpl_%SVN_VERSION%-%ISE_PLATFORM%.msi
share_delivery %STUDIO_NAME%_gpl_%SVN_VERSION%-%ISE_PLATFORM%.7z
iff not NO_GPL_BUILD then
cdd %INSTALL_DIR\setups\gpl
share_delivery %STUDIO_NAME%_gpl_%SVN_VERSION%-%ISE_PLATFORM%.msi
share_delivery %STUDIO_NAME%_gpl_%SVN_VERSION%-%ISE_PLATFORM%.7z
endiff
fullrf %INSTALL_DIR\EiffelStudio\studio\spec\%ISE_PLATFORM%\bin\ec.exe
fullrf %INSTALL_DIR\EiffelStudio\studio\spec\%ISE_PLATFORM%\bin\ecb.exe
fullrf %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin\ec.exe
fullrf %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin\ecb.exe
remtrace Your deliveries are now ready
cdd %INIT_DIR

17
windows_deliv/menu.bat
View File

@@ -1,8 +1,9 @@
@echo off
setlocal
set TCCLECMD="C:\apps\JPSoft\TCCLE14x64\tcc.exe"
set TCCLECMD="C:\Program Files\JPSoft\TCCLE14x64\tcc.exe"
@echo EiffelStudio delivery:
echo EiffelStudio delivery:
@echo 1: make_delivery
@echo 2: make_exes
@@ -10,26 +11,34 @@ set TCCLECMD="C:\apps\JPSoft\TCCLE14x64\tcc.exe"
@echo 4: starting environment
@echo 5: bootstrap environment
@echo 6: display logs
@echo 7: make_gpl_delivery
@echo -------------------
@echo i: display info
@echo -------------------
@echo q: quit
CHOICE /C 123456iq /M " > selection:"
CHOICE /C 1234567iq /M " > selection:"
if .%ERRORLEVEL%. == .1. GOTO make_delivery
if .%ERRORLEVEL%. == .2. GOTO make_exes
if .%ERRORLEVEL%. == .3. GOTO make_installations
if .%ERRORLEVEL%. == .4. GOTO starting_env
if .%ERRORLEVEL%. == .5. GOTO bootstrap_env
if .%ERRORLEVEL%. == .6. GOTO display_logs
if .%ERRORLEVEL%. == .7. GOTO display_info
if .%ERRORLEVEL%. == .8. goto end
if .%ERRORLEVEL%. == .7. GOTO make_gpl_delivery
if .%ERRORLEVEL%. == .8. GOTO display_info
if .%ERRORLEVEL%. == .9. goto end
goto end
:make_delivery
%TCCLECMD% /C make_delivery.btm
goto end
:make_gpl_delivery
echo Build only GPL delivery
set NO_ENTERPRISE_BUILD="True"
%TCCLECMD% /C make_delivery.btm
goto end
:make_exes
%TCCLECMD% /C make_exes.btm
goto end