From 46d3c130a2196f9060d87bc8575fdabf5b9068c8 Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Mon, 16 Oct 2023 17:13:02 +0500 Subject: [PATCH] Add Enterprise build and bundled prerequisites (#15) * Add Enterprise build and bundled prerequisites * Small fixes * Small fixes * Fix issue with Licenses * Revert changes with License_Redist.rtf --- install/win/DocSpace.aip | 144 +++++++++++++++++++++++++++--------- install/win/build-batch.bat | 15 ++-- 2 files changed, 115 insertions(+), 44 deletions(-) diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip index 5ff1cfcfac..0aaaa72022 100644 --- a/install/win/DocSpace.aip +++ b/install/win/DocSpace.aip @@ -50,7 +50,9 @@ + + @@ -58,7 +60,7 @@ - + @@ -210,8 +212,10 @@ + + @@ -264,6 +268,7 @@ + @@ -310,8 +315,8 @@ - - + + @@ -415,11 +420,13 @@ + + @@ -427,6 +434,7 @@ + @@ -474,8 +482,8 @@ - - + + @@ -501,6 +509,7 @@ + @@ -538,6 +547,7 @@ + @@ -1075,6 +1085,7 @@ + @@ -1188,6 +1199,8 @@ + + @@ -1207,16 +1220,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -1241,7 +1254,7 @@ - + @@ -1271,6 +1284,7 @@ + @@ -1304,7 +1318,7 @@ - + @@ -1392,6 +1406,7 @@ + @@ -1402,26 +1417,49 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -1431,6 +1469,9 @@ + + + @@ -1524,47 +1565,80 @@ - - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + diff --git a/install/win/build-batch.bat b/install/win/build-batch.bat index 631538a0b6..a6fc2dd2e8 100644 --- a/install/win/build-batch.bat +++ b/install/win/build-batch.bat @@ -101,14 +101,11 @@ IF "%SignBuild%"=="true" ( %AdvancedInstaller% /edit buildtools\install\win\DocSpace.aip /SetDigitalCertificateFile -file %onlyoffice_codesign_path% -password "%onlyoffice_codesign_password%" ) -%AdvancedInstaller% /rebuild buildtools\install\win\DocSpace.aip +:: Build DocSpace Community +%AdvancedInstaller% /rebuild buildtools\install\win\DocSpace.aip -buildslist DOCSPACE_COMMUNITY -REM echo ######## Build DocSpace Enterprise package ######## -%AdvancedInstaller% /edit buildtools\install\win\DocSpace.Enterprise.aip /SetVersion %BUILD_VERSION%.%BUILD_NUMBER% +:: Build DocSpace Enterprise +copy "buildtools\install\win\Resources\License_Enterprise.rtf" "buildtools\install\win\Resources\License.rtf" /y +copy "buildtools\install\win\Resources\License_Enterprise_Redist.rtf" "buildtools\install\win\Resources\License_Redist.rtf" /y -IF "%SignBuild%"=="true" ( -%AdvancedInstaller% /edit buildtools\install\win\DocSpace.Enterprise.aip /SetSig -%AdvancedInstaller% /edit buildtools\install\win\DocSpace.Enterprise.aip /SetDigitalCertificateFile -file %onlyoffice_codesign_path% -password "%onlyoffice_codesign_password%" -) - -%AdvancedInstaller% /rebuild buildtools\install\win\DocSpace.Enterprise.aip +%AdvancedInstaller% /rebuild buildtools\install\win\DocSpace.aip -buildslist DOCSPACE_ENTERPRISE