Updated especially for GPL building.

This commit is contained in:
2018-12-12 12:45:36 +01:00
parent 176fa3f4ad
commit c62b514867
4 changed files with 24 additions and 20 deletions

View File

@@ -13,7 +13,9 @@ iff not defined NO_COMPILE then
safe_md headers safe_md headers
REM "We keep a copy of vendors specific header files at EiffelSoftware as they cannot be" REM "We keep a copy of vendors specific header files at EiffelSoftware as they cannot be"
REM "redistributed freely." REM "redistributed freely."
exprtfile %DEFAULT_ISE_SVN/Src/library/headers.tar.gz > headers\headers.tar.gz if not EXIST headers\headers.tar.gz (
exprtfile %DEFAULT_ISE_SVN/Src/library/headers.tar.gz > headers\headers.tar.gz
)
cd headers cd headers
tar xvfz headers.tar.gz tar xvfz headers.tar.gz
iff not isdir apps then iff not isdir apps then

View File

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

View File

@@ -30,19 +30,19 @@
<?define LicenseFile = "gpl.rtf"?> <?define LicenseFile = "gpl.rtf"?>
<?endif?> <?endif?>
<?ifdef x64?> <?ifdef x64?>
<?define ProductGuid = "F7D6C690-EC35-C4C3-7A50-00008ACC496D" ?> <?define ProductGuid = "00C1CA54-B234-43F7-8821-1488E8224BD3" ?>
<?define RegistriesGuid = "2229FB66-8B4E-218C-484D-8573938B9437" ?> <?define RegistriesGuid = "E8B890D0-3118-402E-8E90-BD401CD3DD89" ?>
<?define ShortcutsGuid = "5B2CA393-EF3B-50DE-8854-18530D291BBF" ?> <?define ShortcutsGuid = "8627643F-4630-4649-9AA5-E6BC78674934" ?>
<?else?> <?else?>
<?define ProductGuid = "B9B525CF-4DFB-3150-0060-64A4788E2142" ?> <?define ProductGuid = "2E2B8DDA-0AF3-4FD9-AC40-5C862846307C" ?>
<?define RegistriesGuid = "E32C6AE0-B9FD-2FE4-5405-39A39E3BDA04" ?> <?define RegistriesGuid = "FDC60BBD-74C9-40A8-9322-D6872738BD80" ?>
<?define ShortcutsGuid = "AC48CF2C-65CF-8056-09C3-6FFBB6C8D9B4" ?> <?define ShortcutsGuid = "8DEF0013-A478-432F-B698-BB52844FBD8F" ?>
<?endif?> <?endif?>
<?define UpgradeGuid = "F7F00C79-1833-49A2-8DDB-17AB76E2AB14" ?> <?define UpgradeGuid = "9E70F3A9-F792-4AA6-8F52-5351365B85D5" ?>
<?define Product = "EiffelStudio" ?> <?define Product = "EiffelStudio" ?>
<?define ProductVersion = "18.11" ?> <?define ProductVersion = "19.01" ?>
<?define ProductDescription = "EiffelStudio 18.11 Integrated Development Environment (IDE) Installer" ?> <?define ProductDescription = "EiffelStudio 19.01" Integrated Development Environment (IDE) Installer" ?>
<?define ProductKey = "Eiffel_18.11" ?> <?define ProductKey = "Eiffel_19.01" ?>
<?else?> <?else?>
<?ifdef EiffelEnvision?> <?ifdef EiffelEnvision?>
<?ifdef Enterprise?> <?ifdef Enterprise?>
@@ -61,7 +61,7 @@
<?define Product = "EiffelEnvision" ?> <?define Product = "EiffelEnvision" ?>
<?define ProductVersion = "2.8" ?> <?define ProductVersion = "2.8" ?>
<?define ProductDescription = "EiffelEnvision 2.8 The Eiffel for .NET Language Package for Visual Studio .NET 2005" ?> <?define ProductDescription = "EiffelEnvision 2.8 The Eiffel for .NET Language Package for Visual Studio .NET 2005" ?>
<?define ProductKey = "Eiffel_18.11" ?> <?define ProductKey = "Eiffel_19.01" ?>
<?else?> <?else?>
<?define Edition = "Test"?> <?define Edition = "Test"?>
<?define LicenseFile = "gpl.rtf"?> <?define LicenseFile = "gpl.rtf"?>
@@ -70,7 +70,7 @@
<?define Product = "EiffelStudio" ?> <?define Product = "EiffelStudio" ?>
<?define ProductVersion = "2.8" ?> <?define ProductVersion = "2.8" ?>
<?define ProductDescription = "Test" ?> <?define ProductDescription = "Test" ?>
<?define ProductKey = "Eiffel_18.11" ?> <?define ProductKey = "Eiffel_19.01" ?>
<?endif?> <?endif?>
<?endif?> <?endif?>
<?define ProductName = "$(var.Product) $(var.ProductVersion) ($(var.Platform)) $(var.Edition)" ?> <?define ProductName = "$(var.Product) $(var.ProductVersion) ($(var.Platform)) $(var.Edition)" ?>

View File

@@ -317,12 +317,14 @@ iff not defined NO_COMPILE then
cdd %EIFFEL_SRC\.. cdd %EIFFEL_SRC\..
co -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src %EIFFEL_SRC co -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src %EIFFEL_SRC
remtrace ISE specific files iff not defined NO_ENTERPRISE_BUILD then
cdd %EIFFEL_SRC remtrace ISE specific files
co %DEFAULT_ISE_SVN/Src/library/keygen library/keygen cdd %EIFFEL_SRC
cd tools co %DEFAULT_ISE_SVN/Src/library/keygen library/keygen
co %DEFAULT_ISE_SVN/Src/tools/activation activation cd tools
co %DEFAULT_ISE_SVN/Src/tools/estudio_enterprise estudio_enterprise co %DEFAULT_ISE_SVN/Src/tools/activation activation
co %DEFAULT_ISE_SVN/Src/tools/estudio_enterprise estudio_enterprise
endiff
remtrace Build the normal libraries remtrace Build the normal libraries
cdd %INIT_DIR cdd %INIT_DIR