Fix xp plugins (desktop)

Change fetching icu (github deprecated svn)

.github/workflows/check.yml

@@ -17,5 +17,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: DavidAnson/markdownlint-cli2-action@v9
         with:
-          globs: '*.md,develop/*.md,scripts/**.md'
-          separator: ','
+          command: config
+          globs: |
+            .markdownlint.jsonc
+            *.md
+            develop/*.md
+            scripts/**.md

.markdownlint.jsonc

@@ -0,0 +1,5 @@
+{
+  "line-length": {
+    "code_block_line_length": 300
+  }
+}

build.pro

@@ -8,6 +8,16 @@ include($$PWD/common.pri)
 
 CONFIG += ordered
 
+core:CONFIG += core_libraries
+builder:CONFIG += core_libraries
+desktop:CONFIG += core_libraries
+server:CONFIG += core_libraries
+mobile:CONFIG += core_libraries
+
+!core_libraries:CONFIG += no_x2t
+!core_libraries:CONFIG += no_use_common_binary
+!core_libraries:CONFIG += no_tests
+
 core_windows {
     desktop:CONFIG += core_and_multimedia
 }
@@ -28,34 +38,36 @@ core_android {
     CONFIG += no_tests
 }
 
-addSubProject(cryptopp,         $$CORE_ROOT_DIR/Common/3dParty/cryptopp/project/cryptopp.pro)
-addSubProject(cfcpp,            $$CORE_ROOT_DIR/Common/cfcpp/cfcpp.pro)
-addSubProject(unicodeconverter, $$CORE_ROOT_DIR/UnicodeConverter/UnicodeConverter.pro,\
-                                    cryptopp)
-addSubProject(kernel,           $$CORE_ROOT_DIR/Common/kernel.pro,\
-                                    unicodeconverter)
-addSubProject(network,          $$CORE_ROOT_DIR/Common/Network/network.pro,\
-                                    kernel unicodeconverter)
-addSubProject(graphics,         $$CORE_ROOT_DIR/DesktopEditor/graphics/pro/graphics.pro,\
-                                    kernel unicodeconverter)
-addSubProject(pdffile,          $$CORE_ROOT_DIR/PdfFile/PdfFile.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(djvufile,         $$CORE_ROOT_DIR/DjVuFile/DjVuFile.pro,\
-                                    kernel unicodeconverter graphics pdffile)
-addSubProject(xpsfile,          $$CORE_ROOT_DIR/XpsFile/XpsFile.pro,\
-                                    kernel unicodeconverter graphics pdffile)
-addSubProject(htmlrenderer,     $$CORE_ROOT_DIR/HtmlRenderer/htmlrenderer.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(docxrenderer,     $$CORE_ROOT_DIR/DocxRenderer/DocxRenderer.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(htmlfile2,        $$CORE_ROOT_DIR/HtmlFile2/HtmlFile2.pro,\
-                                    kernel unicodeconverter graphics network)
-addSubProject(doctrenderer,     $$CORE_ROOT_DIR/DesktopEditor/doctrenderer/doctrenderer.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(fb2file,          $$CORE_ROOT_DIR/Fb2File/Fb2File.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(epubfile,         $$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\
-                                    kernel unicodeconverter graphics htmlfile2)
+core_libraries {
+    addSubProject(cryptopp,         $$CORE_ROOT_DIR/Common/3dParty/cryptopp/project/cryptopp.pro)
+    addSubProject(cfcpp,            $$CORE_ROOT_DIR/Common/cfcpp/cfcpp.pro)
+    addSubProject(unicodeconverter, $$CORE_ROOT_DIR/UnicodeConverter/UnicodeConverter.pro,\
+                                        cryptopp)
+    addSubProject(kernel,           $$CORE_ROOT_DIR/Common/kernel.pro,\
+                                        unicodeconverter)
+    addSubProject(network,          $$CORE_ROOT_DIR/Common/Network/network.pro,\
+                                        kernel unicodeconverter)
+    addSubProject(graphics,         $$CORE_ROOT_DIR/DesktopEditor/graphics/pro/graphics.pro,\
+                                        kernel unicodeconverter)
+    addSubProject(pdffile,          $$CORE_ROOT_DIR/PdfFile/PdfFile.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(djvufile,         $$CORE_ROOT_DIR/DjVuFile/DjVuFile.pro,\
+                                        kernel unicodeconverter graphics pdffile)
+    addSubProject(xpsfile,          $$CORE_ROOT_DIR/XpsFile/XpsFile.pro,\
+                                        kernel unicodeconverter graphics pdffile)
+    addSubProject(htmlrenderer,     $$CORE_ROOT_DIR/HtmlRenderer/htmlrenderer.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(docxrenderer,     $$CORE_ROOT_DIR/DocxRenderer/DocxRenderer.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(htmlfile2,        $$CORE_ROOT_DIR/HtmlFile2/HtmlFile2.pro,\
+                                        kernel unicodeconverter graphics network)
+    addSubProject(doctrenderer,     $$CORE_ROOT_DIR/DesktopEditor/doctrenderer/doctrenderer.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(fb2file,          $$CORE_ROOT_DIR/Fb2File/Fb2File.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(epubfile,         $$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\
+                                        kernel unicodeconverter graphics htmlfile2)
+}
 !no_x2t {
     addSubProject(docxformat,   $$CORE_ROOT_DIR/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro)
     addSubProject(pptxformat,   $$CORE_ROOT_DIR/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro)
@@ -92,6 +104,7 @@ addSubProject(epubfile,         $$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\
 !no_tests {
     addSubProject(standardtester,  $$CORE_ROOT_DIR/Test/Applications/StandardTester/standardtester.pro)
     addSubProject(x2ttester,       $$CORE_ROOT_DIR/Test/Applications/x2tTester/x2ttester.pro)
+    addSubProject(metafiletester,  $$CORE_ROOT_DIR/Test/Applications/MetafileTester/MetafileTester.pro)
 
     #TODO:
     !linux_arm64:addSubProject(ooxml_crypt, $$CORE_ROOT_DIR/OfficeCryptReader/ooxml_crypt/ooxml_crypt.pro)
@@ -130,3 +143,7 @@ mobile {
         addSubProject(hunspell, $$CORE_ROOT_DIR/Common/3dParty/hunspell/qt/hunspell.pro)
     }
 }
+
+osign {
+    addSubProject(osign, $$CORE_ROOT_DIR/DesktopEditor/xmlsec/src/osign/lib/osign.pro)
+}

defaults

@@ -1,3 +1,3 @@
-sdkjs-plugin="photoeditor, macros, ocr, translator, thesaurus, youtube, highlightcode"
-sdkjs-plugin-server="speech, zotero, mendeley"
+sdkjs-plugin="photoeditor, macros, ocr, translator, thesaurus, youtube, highlightcode, drawio, zotero"
+sdkjs-plugin-server="speech, zotero, mendeley, speechrecognition"
 sdkjs-addons="sdkjs-forms"

develop/Dockerfile

@@ -3,11 +3,17 @@ RUN apt-get update -y && \
 	apt-get install git -y \
 			python3 -y \
 			openjdk-11-jdk -y \
+			bzip2 -y \
 			npm -y && \
-			npm install -g grunt-cli -y && \
+	npm install -g grunt grunt-cli -y && \
 	ln -s /usr/bin/python3 /usr/bin/python && \
 	ln -s /usr/bin/pip3 /usr/bin/pip && \
 	git clone --depth 1 https://github.com/ONLYOFFICE/build_tools.git var/www/onlyoffice/documentserver/build_tools && \
 	sed -i '/documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER}/d' /app/ds/run-document-server.sh && \
+	#Set Up Debug Logging
+	sed -i 's/WARN/ALL/g' /etc/onlyoffice/documentserver/log4js/production.json && \
+	#Start test example
+	if [ -s /etc/supervisor/conf.d/ds-example.conf ] ; then sed -i 's,autostart=false,autostart=true,' /etc/supervisor/conf.d/ds-example.conf; fi && \
+	if [ -s /app/ds/setup/config/supervisor/ds/ds-example.conf ] ; then sed -i 's,autostart=false,autostart=true,' /app/ds/setup/config/supervisor/ds/ds-example.conf; fi && \
 	rm -rf /var/lib/apt/lists/*
-ENTRYPOINT python3 /var/www/onlyoffice/documentserver/build_tools/develop/run_build_js.py /var/www/onlyoffice/documentserver && /bin/sh -c /app/ds/run-document-server.sh 
+ENTRYPOINT python3 /var/www/onlyoffice/documentserver/build_tools/develop/run_build_js.py /var/www/onlyoffice/documentserver $@ && /bin/sh -c /app/ds/run-document-server.sh 

develop/README.md

@@ -1,50 +1,219 @@
 # Docker
 
 This directory containing instruction for developers,
-who want to change something in sdkjs or web-apps module,
+who want to change something in sdkjs or web-apps or server module,
 but don't want to compile pretty compilcated core product to make those changes.
 
-## Installing ONLYOFFICE Docs
+## System requirements
 
-## How to use - Linux or macOS
+### Windows
 
-**Note**: You need the latest Docker version installed.
+You need the latest
+[Docker Desktop for Windows](https://docs.docker.com/desktop/install/windows-install/)
+installed.
 
-You might need to pull **onlyoffice/documentserver** image:
+**Note**: Docker Desktop does not start automatically after installation.
+You should manually start the **Docker Desktop** application.
+
+**Note**: If you have problems running Docker Desktop with the
+"Use WSL 2 instead of Hyper-V" installation option,
+try reinstalling it without this option.
+
+### Linux or macOS
+
+You need the latest
+[Docker](https://docs.docker.com/engine/install/)
+version installed.
+
+## Create develop Docker Images
+
+To create a image with the ability to include external non-minified sdkjs code,
+use the following commands:
+
+### Clone development environment to work dir
+
+```bash
+git clone https://github.com/ONLYOFFICE/build_tools.git
+```
+
+### Modify Docker Images
 
 **Note**: Do not prefix docker command with sudo.
 [This](https://docs.docker.com/engine/install/linux-postinstall/#manage-docker-as-a-non-root-user)
 instruction show how to use docker without sudo.
 
 ```bash
-docker pull onlyoffice/documentserver
-```
-
-### Create develop image
-
-To create a image with the ability to include external non-minified sdkjs code,
-use the following command:
-
-```bash
-git clone https://github.com/ONLYOFFICE/build_tools.git
 cd build_tools/develop
+docker pull onlyoffice/documentserver
 docker build -t documentserver-develop .
 ```
 
 **Note**: The dot at the end is required.
 
-### Connecting external folders
+**Note**: Sometimes script may fail due to network errors. Just restart it.
 
-To connect external folders to the container,
-you need to pass the "-v" parameter
-along with the relative paths to the required folders.  
-The folders `sdkjs` and `web-apps` are required for proper development workflow
+## Clone development modules
+
+Clone development modules to the work dir
 
 * `sdkjs` repo is located [here](https://github.com/ONLYOFFICE/sdkjs/)
 * `web-apps` repo is located [here](https://github.com/ONLYOFFICE/web-apps/)
+* `server` repo is located [here](https://github.com/ONLYOFFICE/server/)
 
 ```bash
-docker run -i -t -d -p 80:80 --restart=always \
-    -v /host-dir/sdkjs:/var/www/onlyoffice/documentserver/sdkjs \
-    -v /host-dir/web-apps:/var/www/onlyoffice/documentserver/web-apps documentserver-develop
+cd ../..
+git clone https://github.com/ONLYOFFICE/sdkjs.git
+git clone https://github.com/ONLYOFFICE/web-apps.git
+git clone https://github.com/ONLYOFFICE/server.git
+```
+
+## Start server with external folders
+
+To mount external folders to the container,
+you need to pass the "-v" parameter
+along with the relative paths to the required folders.  
+The folders `sdkjs` and `web-apps` are required for proper development workflow.
+The folders `server` is optional
+
+**Note**: ONLYOFFICE server uses port 80.
+Look for another application using port 80 and stop it
+
+**Note**: Server start with `sdkjs` and `web-apps` takes 15 minutes
+and takes 20 minutes with `server`
+
+**Note**: Run command from work dir with development modules
+
+### docker run on Windows (PowerShell)
+
+**Note**: Run PowerShell as administrator to fix EACCES error when installing
+node_modules
+
+run with `sdkjs` and `web-apps`
+
+```bash
+docker run -i -t -p 80:80 --restart=always -e ALLOW_PRIVATE_IP_ADDRESS=true -v $pwd/sdkjs:/var/www/onlyoffice/documentserver/sdkjs -v $pwd/web-apps:/var/www/onlyoffice/documentserver/web-apps documentserver-develop
+```
+
+or run with `sdkjs`, `web-apps` and `server`
+
+```bash
+docker run -i -t -p 80:80 --restart=always -e ALLOW_PRIVATE_IP_ADDRESS=true -v $pwd/sdkjs:/var/www/onlyoffice/documentserver/sdkjs -v $pwd/web-apps:/var/www/onlyoffice/documentserver/web-apps -v $pwd/server:/var/www/onlyoffice/documentserver/server documentserver-develop
+```
+
+### docker run on Linux or macOS
+
+run with `sdkjs` and `web-apps`
+
+```bash
+docker run -i -t -p 80:80 --restart=always -e ALLOW_PRIVATE_IP_ADDRESS=true -v $(pwd)/sdkjs:/var/www/onlyoffice/documentserver/sdkjs -v $(pwd)/web-apps:/var/www/onlyoffice/documentserver/web-apps documentserver-develop
+```
+
+or run with `sdkjs`, `web-apps` and `server`
+
+```bash
+docker run -i -t -p 80:80 --restart=always -e ALLOW_PRIVATE_IP_ADDRESS=true -v $(pwd)/sdkjs:/var/www/onlyoffice/documentserver/sdkjs -v $(pwd)/web-apps:/var/www/onlyoffice/documentserver/web-apps -v $(pwd)/server:/var/www/onlyoffice/documentserver/server documentserver-develop
+```
+
+## Open editor
+
+After the server starts successfully, you will see Docker log messages like this
+
+```bash
+[Date] [WARN] [localhost] [docId] [userId] nodeJS
+```
+
+To try the document editor, open a browser tab and type
+[http://localhost/example](http://localhost/example) into the URL bar.
+
+**Note**: Disable **ad blockers** for localhost page.
+It may block some scripts (like Analytics.js)
+
+## Modify sources
+
+### To change something in `sdkjs` do the following steps
+
+1)Edit source file. Let's insert an image url into each open document.  
+Following command inserts (in case of problems, you can replace URL)
+`this.AddImageUrl(['http://localhost/example/images/logo.png']);`  
+after event  
+`this.sendEvent('asc_onDocumentContentReady');`  
+in file  
+`sdkjs/common/apiBase.js`
+
+### change sdkjs on Windows (PowerShell)
+
+```bash
+(Get-Content sdkjs/common/apiBase.js) -replace "this\.sendEvent\('asc_onDocumentContentReady'\);", "this.sendEvent('asc_onDocumentContentReady');this.AddImageUrl(['http://localhost/example/images/logo.png']);"  | Set-Content sdkjs/common/apiBase.js
+```
+
+### change sdkjs on Linux or macOS
+
+```bash
+sed -i "s,this.sendEvent('asc_onDocumentContentReady');,this.sendEvent('asc_onDocumentContentReady');this.AddImageUrl(['http://localhost/example/images/logo.png']);," sdkjs/common/apiBase.js
+```
+
+2)Delete browser cache or hard reload the page `Ctrl + Shift + R`
+
+3)Open new file in browser
+
+### To change something in `server` do the following steps
+
+1)Edit source file. Let's send `"Hello World!"`
+chart message every time a document is opened.  
+Following command inserts  
+`yield* onMessage(ctx, conn, {"message": "Hello World!"});`  
+in function  
+`sendAuthInfo`  
+in file  
+`server/DocService/sources/DocsCoServer.js`
+
+### change server on Windows (PowerShell)
+
+```bash
+(Get-Content server/DocService/sources/DocsCoServer.js) -replace 'opt_hasForgotten, opt_openedAt\) \{', 'opt_hasForgotten, opt_openedAt) {yield* onMessage(ctx, conn, {"message": "Hello World!"});' | Set-Content server/DocService/sources/DocsCoServer.js
+```
+
+### change server on Linux or macOS
+
+```bash
+sed -i 's#opt_hasForgotten, opt_openedAt) {#opt_hasForgotten, opt_openedAt) {yield* onMessage(ctx, conn, {"message": "Hello World!"});#' server/DocService/sources/DocsCoServer.js
+```
+
+2)Restart document server process
+
+**Note**: Look for ``CONTAINER_ID`` in the result of ``docker ps``.
+
+```bash
+docker exec -it CONTAINER_ID supervisorctl restart all
+```
+
+3)Open new file in browser
+
+## Start server with additional functionality(addons)
+
+To get additional functionality and branding you need to connect a branding folder,
+additional addon folders and pass command line arguments
+
+For example run with `onlyoffice` branding and
+addons:`sdkjs-forms`, `sdkjs-ooxml`, `web-apps-mobile`
+
+### docker run on Windows (PowerShell) with branding
+
+**Note**: Run PowerShell as administrator to fix EACCES error when installing
+node_modules
+
+```bash
+docker run -i -t -p 80:80 --restart=always -e ALLOW_PRIVATE_IP_ADDRESS=true `
+    -v $pwd/sdkjs:/var/www/onlyoffice/documentserver/sdkjs -v $pwd/web-apps:/var/www/onlyoffice/documentserver/web-apps `
+    -v $pwd/onlyoffice:/var/www/onlyoffice/documentserver/onlyoffice -v $pwd/sdkjs-ooxml:/var/www/onlyoffice/documentserver/sdkjs-ooxml -v $pwd/sdkjs-forms:/var/www/onlyoffice/documentserver/sdkjs-forms -v $pwd/web-apps-mobile:/var/www/onlyoffice/documentserver/web-apps-mobile `
+    documentserver-develop args --branding onlyoffice --branding-url 'https://github.com/ONLYOFFICE/onlyoffice.git' --siteUrl localhost
+```
+
+### docker run on Linux or macOS with branding
+
+```bash
+docker run -i -t -p 80:80 --restart=always -e ALLOW_PRIVATE_IP_ADDRESS=true \
+    -v $(pwd)/sdkjs:/var/www/onlyoffice/documentserver/sdkjs -v $(pwd)/web-apps:/var/www/onlyoffice/documentserver/web-apps \
+    -v $(pwd)/onlyoffice:/var/www/onlyoffice/documentserver/onlyoffice -v $(pwd)/sdkjs-ooxml:/var/www/onlyoffice/documentserver/sdkjs-ooxml -v $(pwd)/sdkjs-forms:/var/www/onlyoffice/documentserver/sdkjs-forms -v $(pwd)/web-apps-mobile:/var/www/onlyoffice/documentserver/web-apps-mobile \
+    documentserver-develop args --branding onlyoffice --branding-url 'https://github.com/ONLYOFFICE/onlyoffice.git' --siteUrl localhost
 ```

develop/run_build_js.py

@@ -2,11 +2,56 @@
 
 import sys
 sys.path.append(sys.argv[1] + '/build_tools/scripts')
+sys.path.append(sys.argv[1] + '/build_tools/scripts/develop')
 import build_js
+import run_server
 import config
 import base
 
-base.cmd_in_dir(sys.argv[1] + '/build_tools/', 'python3', ['configure.py'])
-config.parse()
+git_dir = sys.argv[1];
 
-build_js.build_js_develop(sys.argv[1])
+base.print_info('argv :'+' '.join(sys.argv))
+base.cmd_in_dir(git_dir + '/build_tools/', 'python3', ['configure.py', '--develop', '1'] + sys.argv[2:])
+
+config.parse()
+config.parse_defaults()
+
+if base.is_exist(git_dir + "/server/FileConverter/bin/fonts.log"):
+  base.print_info('remove font cache to regenerate fonts in external sdkjs volume')
+  base.delete_file(git_dir + "/server/FileConverter/bin/fonts.log");
+
+# external server volume
+if base.is_exist(sys.argv[1] + '/server/DocService/package.json'):
+  base.print_info('replace supervisor cfg to run docservice and converter from source')
+  base.replaceInFileRE("/etc/supervisor/conf.d/ds-docservice.conf", "command=.*", "command=node " + git_dir + "/server/DocService/sources/server.js")
+  base.replaceInFileRE("/app/ds/setup/config/supervisor/ds/ds-docservice.conf", "command=.*", "command=node " + git_dir + "/server/DocService/sources/server.js")
+  base.replaceInFileRE("/etc/supervisor/conf.d/ds-converter.conf", "command=.*", "command=node " + git_dir + "/server/FileConverter/sources/convertermaster.js")
+  base.replaceInFileRE("/app/ds/setup/config/supervisor/ds/ds-converter.conf", "command=.*", "command=node " + git_dir + "/server/FileConverter/sources/convertermaster.js")
+  base.print_info('run_server.run_docker_server')
+  run_server.run_docker_server();
+else:
+  #Fix theme generation for external sdkjs volume
+  if base.is_exist(git_dir + "/server/FileConverter/bin/DoctRenderer.config"):
+    base.print_info('replace DoctRenderer.config for external sdkjs volume')
+    base.generate_doctrenderer_config(git_dir + "/server/FileConverter/bin/DoctRenderer.config", "../../../sdkjs/deploy/", "server", "../../../web-apps/vendor/", "../../../dictionaries")
+  
+  addons = {}
+  addons.update(base.get_sdkjs_addons())
+  addons.update(base.get_web_apps_addons())
+  staticContent = ""
+  for addon in addons:
+      if (addon):
+        staticContent += '"/' + addon + '": {"path": "/var/www/onlyoffice/documentserver/' + addon + '","options": {"maxAge": "7d"}},'
+  
+  if staticContent:
+    base.print_info('replace production-linux.json for addons'+staticContent)
+    base.replaceInFileRE("/etc/onlyoffice/documentserver/production-linux.json", '"static_content": {.*', '"static_content": {' + staticContent)
+
+  base.print_info('replace supervisor cfg to run docservice and converter from pkg')
+  base.replaceInFileRE("/etc/supervisor/conf.d/ds-docservice.conf", "command=node .*", "command=/var/www/onlyoffice/documentserver/server/DocService/docservice")
+  base.replaceInFileRE("/app/ds/setup/config/supervisor/ds/ds-docservice.conf", "command=node .*", "command=/var/www/onlyoffice/documentserver/server/DocService/docservice")
+  base.replaceInFileRE("/etc/supervisor/conf.d/ds-converter.conf", "command=node .*", "command=/var/www/onlyoffice/documentserver/server/FileConverter/converter")
+  base.replaceInFileRE("/app/ds/setup/config/supervisor/ds/ds-converter.conf", "command=node .*", "command=/var/www/onlyoffice/documentserver/server/FileConverter/converter")
+  base.print_info('run_server.run_docker_sdk_web_apps: ' + git_dir)
+  run_server.run_docker_sdk_web_apps(git_dir)
+  

make.py

@@ -71,16 +71,13 @@ make_common.make()
 
 # build updmodule for desktop (only for windows version)
 if config.check_option("module", "desktop"):
-  config.extend_option("qmake_addon", "URL_WEBAPPS_HELP=https://download.onlyoffice.com/install/desktop/editors/help/v" + base.get_env('PRODUCT_VERSION') + "-1/apps")
+  config.extend_option("qmake_addon", "URL_WEBAPPS_HELP=https://download.onlyoffice.com/install/desktop/editors/help/v" + base.get_env('PRODUCT_VERSION') + "/apps")
 
   if "windows" == base.host_platform():
     config.extend_option("config", "updmodule")
     base.set_env("DESKTOP_URL_UPDATES_MAIN_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcast.json")
     base.set_env("DESKTOP_URL_UPDATES_DEV_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcastdev.json")
 
-    if ("windows" == base.host_platform()):
-      base.set_env("VIDEO_PLAYER_VLC_DIR", base_dir + "/../desktop-sdk/ChromiumBasedEditors/videoplayerlib/vlc")
-
 # build
 build.make()
 

make_package.py

@@ -22,7 +22,6 @@ parser.add_argument("-B", "--build",    dest="build",    type=str,
 args = parser.parse_args()
 
 # vars
-common.workspace_dir = utils.get_abspath(utils.get_script_dir(__file__) + "/..")
 common.os_family = utils.host_platform()
 common.platform = args.platform
 common.prefix = common.platformPrefixes[common.platform] if common.platform in common.platformPrefixes else ""
@@ -30,14 +29,14 @@ common.targets = args.targets
 common.clean = "clean" in args.targets
 common.sign = "sign" in args.targets
 common.deploy = "deploy" in args.targets
-common.version = args.version if (args.version is not None) else utils.get_env("PRODUCT_VERSION", "1.0.0")
-common.build = args.build if (args.build is not None) else utils.get_env("BUILD_NUMBER", "1")
-common.channel = utils.get_env("BUILD_CHANNEL", "other")
+common.version = args.version if args.version else utils.get_env("BUILD_VERSION", "0.0.0")
+common.build = args.build if args.build else utils.get_env("BUILD_NUMBER", "0")
 common.branding = args.branding
 common.timestamp = utils.get_timestamp()
+common.workspace_dir = utils.get_abspath(utils.get_script_dir(__file__) + "/..")
+common.branding_dir = utils.get_abspath(common.workspace_dir + "/" + args.branding) if args.branding else common.workspace_dir
+common.deploy_data = utils.get_path(common.workspace_dir + "/deploy.txt")
 common.summary = []
-common.deploy_data = []
-utils.log("workspace_dir: " + common.workspace_dir)
 utils.log("os_family:     " + common.os_family)
 utils.log("platform:      " + str(common.platform))
 utils.log("prefix:        " + str(common.prefix))
@@ -49,6 +48,8 @@ utils.log("version:       " + common.version)
 utils.log("build:         " + common.build)
 utils.log("branding:      " + str(common.branding))
 utils.log("timestamp:     " + common.timestamp)
+utils.log("workspace_dir: " + common.workspace_dir)
+utils.log("branding_dir:  " + common.branding_dir)
 
 # branding
 if common.branding is not None:
@@ -63,22 +64,22 @@ import package_mobile
 
 # build
 utils.set_cwd(common.workspace_dir, verbose=True)
-utils.delete_file("deploy.json")
+utils.delete_file(common.deploy_data)
 if "core" in common.targets:
   package_core.make()
-if "closure-maps-os" in common.targets:
-  package_core.deploy_closure_maps("opensource")
-if "closure-maps-com" in common.targets:
-  package_core.deploy_closure_maps("commercial")
+if "closuremaps_opensource" in common.targets:
+  package_core.deploy_closuremaps("opensource")
+if "closuremaps_commercial" in common.targets:
+  package_core.deploy_closuremaps("commercial")
 if "desktop" in common.targets:
   package_desktop.make()
 if "builder" in common.targets:
   package_builder.make()
-if "server-community" in common.targets:
+if "server_community" in common.targets:
   package_server.make("community")
-if "server-enterprise" in common.targets:
+if "server_enterprise" in common.targets:
   package_server.make("enterprise")
-if "server-developer" in common.targets:
+if "server_developer" in common.targets:
   package_server.make("developer")
 if "mobile" in common.targets:
   package_mobile.make()

scripts/base.py

@@ -14,6 +14,8 @@ import re
 import stat
 import json
 
+__file__script__path__ = os.path.dirname( os.path.realpath(__file__))
+
 # common functions --------------------------------------
 def get_script_dir(file=""):
   test_file = file
@@ -188,28 +190,56 @@ def copy_dir(src, dst):
   if is_dir(dst):
     delete_dir(dst)
   try:
-    shutil.copytree(get_path(src), get_path(dst))    
-  except OSError as e:
-    print('Directory not copied. Error: %s' % e)
+    shutil.copytree(get_path(src), get_path(dst))
+  except:
+    if ("windows" == host_platform()) and copy_dir_windows(src, dst):
+      return
+    print("Directory not copied")
   return
 
+def copy_dir_windows(src, dst):
+  if is_dir(dst):
+    delete_dir(dst)
+  err = cmd("robocopy", [get_path(src), get_path(dst), "/e", "/NFL", "/NDL", "/NJH", "/NJS", "/nc", "/ns", "/np"], True)
+  if (1 == err):
+    return True
+  return False
+
 def delete_dir_with_access_error(path):
   def delete_file_on_error(func, path, exc_info):
-    if not os.access(path, os.W_OK):
-      os.chmod(path, stat.S_IWUSR)
-      func(path)
+    if ("windows" != host_platform()):
+      if not os.access(path, os.W_OK):
+        os.chmod(path, stat.S_IWUSR)
+        func(path)
+      return
+    elif (0 != path.find("\\\\?\\")):
+      # abspath not work with long names
+      full_path = path
+      drive_pos = full_path.find(":")
+      if (drive_pos < 0) or (drive_pos > 2):
+        full_path = os.getcwd() + "\\" + full_path
+      else:
+        full_path = full_path
+      if (len(full_path) >= 260):
+        full_path = "\\\\?\\" + full_path
+      if not os.access(full_path, os.W_OK):
+        os.chmod(full_path, stat.S_IWUSR)
+      func(full_path)
     return
   if not is_dir(path):
     print("delete warning [folder not exist]: " + path)
     return
-  shutil.rmtree(get_path(path), ignore_errors=False, onerror=delete_file_on_error)
+  shutil.rmtree(os.path.normpath(get_path(path)), ignore_errors=False, onerror=delete_file_on_error)
   return
 
 def delete_dir(path):
   if not is_dir(path):
     print("delete warning [folder not exist]: " + path)
     return
-  shutil.rmtree(get_path(path), ignore_errors=True)
+  if ("windows" == host_platform()):
+    delete_dir_with_access_error(path)
+  else:
+    shutil.rmtree(get_path(path), ignore_errors=True)
   return
 
 def copy_lib(src, dst, name):
@@ -274,6 +304,18 @@ def replaceInFile(path, text, textReplace):
   with open(get_path(path), "w") as file:
     file.write(filedata)
   return
+def replaceInFileUtf8(path, text, textReplace):
+  if not is_file(path):
+    print("[replaceInFile] file not exist: " + path)
+    return
+  filedata = ""
+  with open(get_path(path), "rb") as file:
+    filedata = file.read().decode("UTF-8")
+  filedata = filedata.replace(text, textReplace)
+  delete_file(path)
+  with open(get_path(path), "wb") as file:
+    file.write(filedata.encode("UTF-8"))
+  return
 def replaceInFileRE(path, pattern, textReplace):
   if not is_file(path):
     print("[replaceInFile] file not exist: " + path)
@@ -592,6 +634,20 @@ def get_gcc_version():
 def qt_setup(platform):
   compiler = config.check_compiler(platform)
   qt_dir = config.option("qt-dir") if (-1 == platform.find("_xp")) else config.option("qt-dir-xp")
+
+  # qt bug
+  if (host_platform() == "mac"):
+    for compiler_folder in glob.glob(qt_dir + "/*"):
+      if is_dir(compiler_folder):
+        old_path_file = compiler_folder + "/mkspecs/features/toolchain.prf"
+        new_path_file = compiler_folder + "/mkspecs/features/toolchain.prf.bak"
+        if (is_file(old_path_file) and not is_file(new_path_file)):
+          try:
+            copy_file(old_path_file, new_path_file)
+            copy_file(get_script_dir() + "/../tools/mac/toolchain.prf", old_path_file)
+          except IOError as e:
+            print("Unable to copy file: " + old_path_file)
+
   compiler_platform = compiler["compiler"] if platform_is_32(platform) else compiler["compiler_64"]
   qt_dir = qt_dir + "/" + compiler_platform
 
@@ -616,6 +672,37 @@ def qt_version():
   qt_dir = qt_dir.split("/")[-3]
   return "".join(i for i in qt_dir if (i.isdigit() or i == "."))
 
+def check_congig_option_with_platfom(platform, option_name):
+  if config.check_option("config", option_name):
+    return True
+  if (0 == platform.find("win")) and config.check_option("config_addon_windows", option_name):
+    return True
+  elif (0 == platform.find("linux")) and config.check_option("config_addon_linux", option_name):
+    return True
+  elif (0 == platform.find("mac")) and config.check_option("config_addon_macos", option_name):
+    return True
+  elif (0 == platform.find("ios")) and config.check_option("config_addon_ios", option_name):
+    return True
+  elif (0 == platform.find("android")) and config.check_option("config_addon_android", option_name):
+    return True
+  return False
+
+def qt_config_platform_addon(platform):
+  config_addon = ""
+  if (0 == platform.find("win")):
+    config_addon += (" " + config.option("config_addon_windows"))
+  elif (0 == platform.find("linux")):
+    config_addon += (" " + config.option("config_addon_linux"))
+  elif (0 == platform.find("mac")):
+    config_addon += (" " + config.option("config_addon_macos"))
+  elif (0 == platform.find("ios")):
+    config_addon += (" " + config.option("config_addon_ios"))
+  elif (0 == platform.find("android")):
+    config_addon += (" " + config.option("config_addon_android"))
+  if (config_addon == " "):
+    config_addon = ""
+  return config_addon
+
 def qt_config(platform):
   config_param = config.option("module") + " " + config.option("config") + " " + config.option("features")
   config_param_lower = config_param.lower()
@@ -647,6 +734,7 @@ def qt_config(platform):
   if ("linux_arm64" == platform):
     config_param += " linux_arm64"
 
+  config_param += qt_config_platform_addon(platform)
   return config_param
 
 def qt_major_version():
@@ -743,7 +831,7 @@ def app_make():
   return "make"
 
 # doctrenderer.config
-def generate_doctrenderer_config(path, root, product, vendor = ""):
+def generate_doctrenderer_config(path, root, product, vendor = "", dictionaries = ""):
   content = "<Settings>\n"
 
   content += ("<file>" + root + "sdkjs/common/Native/native.js</file>\n")
@@ -762,6 +850,9 @@ def generate_doctrenderer_config(path, root, product, vendor = ""):
   content += ("<file>" + vendor_dir + "xregexp/xregexp-all-min.js</file>\n")
   content += ("<sdkjs>" + root + "sdkjs</sdkjs>\n")
 
+  if ("" != dictionaries):
+    content += ("<dictionaries>" + dictionaries + "</dictionaries>\n")
+
   if (False): # old html file
     content += ("<htmlfile>" + vendor_dir + "jquery/jquery.min.js</htmlfile>\n")
     if ("desktop" == product):
@@ -1173,9 +1264,38 @@ def copy_sdkjs_plugin(src_dir, dst_dir, name, is_name_as_guid=False, is_desktop_
     delete_dir(dst_deploy_dir)
   return
 
-def copy_sdkjs_plugins(dst_dir, is_name_as_guid=False, is_desktop_local=False):
-  plugins_dir = get_script_dir() + "/../../onlyoffice.github.io/sdkjs-plugins/content"
+def copy_marketplace_plugin(dst_dir, is_name_as_guid=False, is_desktop_local=False, is_store_copy=False):
+  git_dir = __file__script__path__ + "/../.."
+  if False:
+    # old version
+    base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins", dst_dir, "manager", is_name_as_guid, is_desktop_local)
+    return
+  src_dir_path = git_dir + "/onlyoffice.github.io/store/plugin"
+  name = "marketplace"
+  if is_name_as_guid:
+    name = "{AA2EA9B6-9EC2-415F-9762-634EE8D9A95E}"
+
+  dst_dir_path = dst_dir + "/" + name
+  if is_dir(dst_dir_path):
+    delete_dir(dst_dir_path)
+  create_dir(dst_dir_path)
+
+  copy_dir_content(src_dir_path, dst_dir_path)
+  if is_desktop_local:
+    for file in glob.glob(dst_dir_path + "/*.html"):
+      replaceInFile(file, "https://onlyoffice.github.io/sdkjs-plugins/", "../")
+
+  if is_store_copy:
+    copy_dir(git_dir + "/onlyoffice.github.io/store", dst_dir_path + "/store")
+    delete_dir(dst_dir_path + "/store/plugin")
+    delete_dir(dst_dir_path + "/store/plugin-dev")
+  return
+
+def copy_sdkjs_plugins(dst_dir, is_name_as_guid=False, is_desktop_local=False, isXp=False):
+  plugins_dir = __file__script__path__ + "/../../onlyoffice.github.io/sdkjs-plugins/content"
   plugins_list_config = config.option("sdkjs-plugin")
+  if isXp:
+    plugins_list_config="photoeditor, macros, drawio, highlightcode, doc2md"
   if ("" == plugins_list_config):
     return
   plugins_list = plugins_list_config.rsplit(", ")
@@ -1184,7 +1304,7 @@ def copy_sdkjs_plugins(dst_dir, is_name_as_guid=False, is_desktop_local=False):
   return
 
 def copy_sdkjs_plugins_server(dst_dir, is_name_as_guid=False, is_desktop_local=False):
-  plugins_dir = get_script_dir() + "/../../onlyoffice.github.io/sdkjs-plugins/content"
+  plugins_dir = __file__script__path__ + "/../../onlyoffice.github.io/sdkjs-plugins/content"
   plugins_list_config = config.option("sdkjs-plugin-server")
   if ("" == plugins_list_config):
     return
@@ -1338,7 +1458,7 @@ def copy_v8_files(core_dir, deploy_dir, platform, is_xp=False):
     copy_files(directory_v8 + platform + "/icudt*.dat", deploy_dir + "/")
   return
 
-def clone_marketplace_plugin(out_dir, is_name_as_guid=False, is_replace_paths=False, is_delete_git_dir=True, git_owner=""):
+def clone_marketplace_plugin(out_dir, is_name_as_guid=False, is_replace_paths=False, is_delete_git_dir=True, git_owner=""):  
   old_cur = os.getcwd()
   os.chdir(out_dir)
   git_update("onlyoffice.github.io", False, True, git_owner)
@@ -1470,3 +1590,75 @@ def correct_elf_rpath_directory(directory, origin, is_recursion = True):
       correct_elf_rpath_directory(file, origin)
   return
 
+def is_need_build_js():
+  if "osign" == config.option("module"):
+    return False
+  return True
+
+def copy_dictionaries(src, dst, is_hyphen = True, is_spell = True):
+  if (False == is_hyphen) and (False == is_spell):
+    return
+
+  if not is_dir(dst):
+    create_dir(dst)
+
+  src_folder = src
+  if ("/" != src[-1:]):
+    src_folder += "/"
+  src_folder += "*"
+  for file in glob.glob(src_folder):
+    if is_file(file):
+      copy_file(file, dst)
+      continue
+
+    basename = os.path.basename(file)
+    if (".git" == basename):
+      continue
+
+    if (True == is_hyphen) and (True == is_spell):
+      copy_dir(file, dst + "/" + basename)
+      continue
+
+    is_spell_present = is_file(file + "/" + basename + ".dic")
+    is_hyphen_present = is_file(file + "/hyph_" + basename + ".dic")
+
+    is_dir_need = False
+    if (is_hyphen and is_hyphen_present) or (is_spell and is_spell_present):
+      is_dir_need = True
+
+    if not is_dir_need:
+      continue
+
+    lang_folder = dst + "/" + basename
+    create_dir(lang_folder)
+
+    if is_hyphen and is_hyphen_present:
+      copy_dir_content(file, lang_folder, "hyph_", "")
+    
+    if is_spell and is_spell_present:
+      copy_dir_content(file, lang_folder, "", "hyph_")
+
+  if is_file(dst + "/en_US/en_US_thes.dat"):
+    delete_file(dst + "/en_US/en_US_thes.dat")
+    delete_file(dst + "/en_US/en_US_thes.idx")
+  
+  if is_file(dst + "/ru_RU/ru_RU_oo3.dic"):
+    delete_file(dst + "/ru_RU/ru_RU_oo3.dic")
+    delete_file(dst + "/ru_RU/ru_RU_oo3.aff")
+
+  if is_file(dst + "/uk_UA/th_uk_UA.dat"):
+    delete_file(dst + "/uk_UA/th_uk_UA.dat")
+    delete_file(dst + "/uk_UA/th_uk_UA.idx")
+
+  return
+
+def check_module_version(actual_version, clear_func):
+  module_file = "./module.version"
+  current_module_version = readFile(module_file)
+  if (actual_version == current_module_version):
+    return
+  if is_file(module_file):
+    delete_file(module_file)
+  writeFile(module_file, actual_version)
+  clear_func()
+  return

scripts/build_js.py

@@ -27,6 +27,8 @@ def correct_sdkjs_licence(directory):
 def make():
   if ("1" == base.get_env("OO_NO_BUILD_JS")):
     return
+  if not base.is_need_build_js():
+    return
 
   base.set_env('NODE_ENV', 'production')
 
@@ -53,8 +55,6 @@ def make():
     base.copy_dir(base_dir + "/../sdkjs/deploy/sdkjs", out_dir + "/desktop/sdkjs")
     correct_sdkjs_licence(out_dir + "/desktop/sdkjs")
     base.copy_dir(base_dir + "/../web-apps/deploy/web-apps", out_dir + "/desktop/web-apps")
-    if not base.is_file(out_dir + "/desktop/sdkjs/common/AllFonts.js"):
-      base.copy_file(base_dir + "/../sdkjs/common/HtmlFileInternal/AllFonts.js", out_dir + "/desktop/sdkjs/common/AllFonts.js")
     base.delete_dir(out_dir + "/desktop/web-apps/apps/documenteditor/embed")
     base.delete_dir(out_dir + "/desktop/web-apps/apps/documenteditor/mobile")
     base.delete_dir(out_dir + "/desktop/web-apps/apps/presentationeditor/embed")
@@ -65,7 +65,8 @@ def make():
     
     build_interface(base_dir + "/../desktop-apps/common/loginpage/build")
     base.copy_file(base_dir + "/../desktop-apps/common/loginpage/deploy/index.html", out_dir + "/desktop/index.html")
-  
+    base.copy_file(base_dir + "/../desktop-apps/common/loginpage/deploy/noconnect.html", out_dir + "/desktop/noconnect.html")
+
   # mobile
   if config.check_option("module", "mobile"):
     build_sdk_native(base_dir + "/../sdkjs/build", False)
@@ -73,38 +74,30 @@ def make():
     base.create_dir(out_dir + "/mobile/sdkjs")
     vendor_dir_src = base_dir + "/../web-apps/vendor/"
     sdk_dir_src = base_dir + "/../sdkjs/deploy/sdkjs/"
-    
-    base.join_scripts([vendor_dir_src + "xregexp/xregexp-all-min.js", 
-                   vendor_dir_src + "underscore/underscore-min.js",
-                   base_dir + "/../sdkjs/common/Native/native.js",
-                   base_dir + "/../sdkjs/common/Native/Wrappers/common.js",
-                   base_dir + "/../sdkjs/common/Native/jquery_native.js"], 
-                   out_dir + "/mobile/sdkjs/banners_word.js")
+  
+    prefix_js = [
+      vendor_dir_src + "xregexp/xregexp-all-min.js", 
+      vendor_dir_src + "underscore/underscore-min.js",
+      base_dir + "/../sdkjs/common/Native/native.js",
+      base_dir + "/../sdkjs-native/common/common.js",
+      base_dir + "/../sdkjs/common/Native/jquery_native.js"
+    ]
 
-    base.join_scripts([vendor_dir_src + "xregexp/xregexp-all-min.js", 
-                       vendor_dir_src + "underscore/underscore-min.js",
-                       base_dir + "/../sdkjs/common/Native/native.js",
-                       base_dir + "/../sdkjs/cell/native/common.js",
-                       base_dir + "/../sdkjs/common/Native/jquery_native.js"], 
-                       out_dir + "/mobile/sdkjs/banners_cell.js")
+    postfix_js = [
+      base_dir + "/../sdkjs/common/libfont/engine/fonts_native.js",
+      base_dir + "/../sdkjs/common/Charts/ChartStyles.js"
+    ]
 
-    base.join_scripts([vendor_dir_src + "xregexp/xregexp-all-min.js", 
-                       vendor_dir_src + "underscore/underscore-min.js",
-                       base_dir + "/../sdkjs/common/Native/native.js",
-                       base_dir + "/../sdkjs/common/Native/Wrappers/common.js",
-                       base_dir + "/../sdkjs/common/Native/jquery_native.js"], 
-                       out_dir + "/mobile/sdkjs/banners_slide.js")
+    base.join_scripts(prefix_js, out_dir + "/mobile/sdkjs/banners.js")
 
     base.create_dir(out_dir + "/mobile/sdkjs/word")
-    base.join_scripts([out_dir + "/mobile/sdkjs/banners_word.js", sdk_dir_src + "word/sdk-all-min.js", sdk_dir_src + "word/sdk-all.js"], out_dir + "/mobile/sdkjs/word/script.bin")
+    base.join_scripts([out_dir + "/mobile/sdkjs/banners.js", sdk_dir_src + "word/sdk-all-min.js", sdk_dir_src + "word/sdk-all.js"] + postfix_js, out_dir + "/mobile/sdkjs/word/script.bin")
     base.create_dir(out_dir + "/mobile/sdkjs/cell")
-    base.join_scripts([out_dir + "/mobile/sdkjs/banners_cell.js", sdk_dir_src + "cell/sdk-all-min.js", sdk_dir_src + "cell/sdk-all.js"], out_dir + "/mobile/sdkjs/cell/script.bin")
+    base.join_scripts([out_dir + "/mobile/sdkjs/banners.js", sdk_dir_src + "cell/sdk-all-min.js", sdk_dir_src + "cell/sdk-all.js"] + postfix_js, out_dir + "/mobile/sdkjs/cell/script.bin")
     base.create_dir(out_dir + "/mobile/sdkjs/slide")
-    base.join_scripts([out_dir + "/mobile/sdkjs/banners_slide.js", sdk_dir_src + "slide/sdk-all-min.js", sdk_dir_src + "slide/sdk-all.js"], out_dir + "/mobile/sdkjs/slide/script.bin")
+    base.join_scripts([out_dir + "/mobile/sdkjs/banners.js", sdk_dir_src + "slide/sdk-all-min.js", sdk_dir_src + "slide/sdk-all.js"] + postfix_js, out_dir + "/mobile/sdkjs/slide/script.bin")
 
-    base.delete_file(out_dir + "/mobile/sdkjs/banners_word.js")
-    base.delete_file(out_dir + "/mobile/sdkjs/banners_cell.js")
-    base.delete_file(out_dir + "/mobile/sdkjs/banners_slide.js")
+    base.delete_file(out_dir + "/mobile/sdkjs/banners.js")
   return
 
 # JS build
@@ -148,7 +141,10 @@ def build_sdk_builder(directory):
 def build_sdk_native(directory, minimize=True):
   #_run_npm_cli(directory)
   _run_npm(directory)
-  _run_grunt(directory, get_build_param(minimize) + ["--mobile=true"] + base.sdkjs_addons_param())
+  addons = base.sdkjs_addons_param()
+  if not config.check_option("sdkjs-addons", "sdkjs-native"):
+    addons.append("--addon=sdkjs-native")
+  _run_grunt(directory, get_build_param(minimize) + ["--mobile=true"] + addons)
   return
 
 def build_js_develop(root_dir):
@@ -161,14 +157,14 @@ def build_js_develop(root_dir):
   _run_grunt(root_dir + external_folder + "/sdkjs/build", get_build_param(False) + base.sdkjs_addons_param())
   _run_grunt(root_dir + external_folder + "/sdkjs/build", ["develop"] + base.sdkjs_addons_param())
   _run_npm(root_dir + external_folder + "/web-apps/build")
-  _run_npm(root_dir + external_folder + "/web-apps/build/sprites")
+  _run_npm_ci(root_dir + external_folder + "/web-apps/build/sprites")
   _run_grunt(root_dir + external_folder + "/web-apps/build/sprites", [])
 
   old_cur = os.getcwd()
   old_product_version = base.get_env("PRODUCT_VERSION")
   base.set_env("PRODUCT_VERSION", old_product_version + "d")
   os.chdir(root_dir + external_folder + "/web-apps/vendor/framework7-react")
-  base.cmd("npm", ["install"])
+  base.cmd("npm", ["ci"])
   base.cmd("npm", ["run", "deploy-word"])
   base.cmd("npm", ["run", "deploy-cell"])
   base.cmd("npm", ["run", "deploy-slide"])

scripts/build_js_native.py

@@ -14,6 +14,9 @@ parser.add_option("--output",
 parser.add_option("--write-version",
                   action="store_true", dest="write_version", default=False,
                   help="Create version file of build")
+parser.add_option("--minimize",
+                  action="store", type="string", dest="minimize", default="0",
+                  help="Is minimized version")
 (options, args) = parser.parse_args(arguments)
 
 def write_version_files(output_dir):
@@ -32,7 +35,11 @@ def write_version_files(output_dir):
 # parse configuration
 config.parse()
 config.parse_defaults()
-config.extend_option("jsminimize", "0")
+
+isMinimize = False
+if ("1" == options.minimize or "true" == options.minimize):
+  isMinimize = True
+config.set_option("jsminimize", "disable")
 
 branding = config.option("branding-name")
 if ("" == branding):
@@ -46,41 +53,33 @@ if (options.output):
 
 base.create_dir(out_dir)
 
-build_js.build_sdk_native(base_dir + "/../sdkjs/build")
+build_js.build_sdk_native(base_dir + "/../sdkjs/build", isMinimize)
 vendor_dir_src = base_dir + "/../web-apps/vendor/"
 sdk_dir_src = base_dir + "/../sdkjs/deploy/sdkjs/"
 
-base.join_scripts([vendor_dir_src + "xregexp/xregexp-all-min.js", 
-               vendor_dir_src + "underscore/underscore-min.js",
-               base_dir + "/../sdkjs/common/Native/native.js",
-               base_dir + "/../sdkjs/common/Native/Wrappers/common.js",
-               base_dir + "/../sdkjs/common/Native/jquery_native.js"], 
-               out_dir + "/banners_word.js")
+prefix_js = [
+  vendor_dir_src + "xregexp/xregexp-all-min.js", 
+  vendor_dir_src + "underscore/underscore-min.js",
+  base_dir + "/../sdkjs/common/Native/native.js",
+  base_dir + "/../sdkjs-native/common/common.js",
+  base_dir + "/../sdkjs/common/Native/jquery_native.js"
+]
 
-base.join_scripts([vendor_dir_src + "xregexp/xregexp-all-min.js", 
-                   vendor_dir_src + "underscore/underscore-min.js",
-                   base_dir + "/../sdkjs/common/Native/native.js",
-                   base_dir + "/../sdkjs/cell/native/common.js",
-                   base_dir + "/../sdkjs/common/Native/jquery_native.js"], 
-                   out_dir + "/banners_cell.js")
+postfix_js = [
+  base_dir + "/../sdkjs/common/libfont/engine/fonts_native.js",
+  base_dir + "/../sdkjs/common/Charts/ChartStyles.js"
+]
 
-base.join_scripts([vendor_dir_src + "xregexp/xregexp-all-min.js", 
-                   vendor_dir_src + "underscore/underscore-min.js",
-                   base_dir + "/../sdkjs/common/Native/native.js",
-                   base_dir + "/../sdkjs/common/Native/Wrappers/common.js",
-                   base_dir + "/../sdkjs/common/Native/jquery_native.js"], 
-                   out_dir + "/banners_slide.js")
+base.join_scripts(prefix_js, out_dir + "/banners.js")
 
 base.create_dir(out_dir + "/word")
-base.join_scripts([out_dir + "/banners_word.js", sdk_dir_src + "word/sdk-all-min.js", sdk_dir_src + "word/sdk-all.js"], out_dir + "/word/script.bin")
+base.join_scripts([out_dir + "/banners.js", sdk_dir_src + "word/sdk-all-min.js", sdk_dir_src + "word/sdk-all.js"] + postfix_js, out_dir + "/word/script.bin")
 base.create_dir(out_dir + "/cell")
-base.join_scripts([out_dir + "/banners_cell.js", sdk_dir_src + "cell/sdk-all-min.js", sdk_dir_src + "cell/sdk-all.js"], out_dir + "/cell/script.bin")
+base.join_scripts([out_dir + "/banners.js", sdk_dir_src + "cell/sdk-all-min.js", sdk_dir_src + "cell/sdk-all.js"] + postfix_js, out_dir + "/cell/script.bin")
 base.create_dir(out_dir + "/slide")
-base.join_scripts([out_dir + "/banners_slide.js", sdk_dir_src + "slide/sdk-all-min.js", sdk_dir_src + "slide/sdk-all.js"], out_dir + "/slide/script.bin")
+base.join_scripts([out_dir + "/banners.js", sdk_dir_src + "slide/sdk-all-min.js", sdk_dir_src + "slide/sdk-all.js"] + postfix_js, out_dir + "/slide/script.bin")
 
-base.delete_file(out_dir + "/banners_word.js")
-base.delete_file(out_dir + "/banners_cell.js")
-base.delete_file(out_dir + "/banners_slide.js")
+base.delete_file(out_dir + "/banners.js")
 
 # Write sdk version mark file if needed
 if (options.write_version):

scripts/build_server.py

@@ -16,8 +16,7 @@ def make():
   if("" != config.option("branding")):
     branding_dir = git_dir + '/' + config.option("branding") + '/server'
 
-  base.cmd_in_dir(server_dir, "npm", ["install"])
-  base.cmd_in_dir(server_dir, "grunt", ["--no-color", "-v"] + base.server_addons_param())
+  build_server_with_addons()
 
     #env variables
   product_version = base.get_env('PRODUCT_VERSION')
@@ -30,18 +29,16 @@ def make():
 
   cur_date = datetime.date.today().strftime("%m/%d/%Y")
 
-  server_build_dir = server_dir + "/build/server"
-
-  base.replaceInFileRE(server_build_dir + "/Common/sources/commondefines.js", "const buildNumber = [0-9]*", "const buildNumber = " + build_number)
-  base.replaceInFileRE(server_build_dir + "/Common/sources/license.js", "const buildDate = '[0-9-/]*'", "const buildDate = '" + cur_date + "'")
-  base.replaceInFileRE(server_build_dir + "/Common/sources/commondefines.js", "const buildVersion = '[0-9.]*'", "const buildVersion = '" + product_version + "'")
+  base.replaceInFileRE(server_dir + "/Common/sources/commondefines.js", "const buildNumber = [0-9]*", "const buildNumber = " + build_number)
+  base.replaceInFileRE(server_dir + "/Common/sources/license.js", "const buildDate = '[0-9-/]*'", "const buildDate = '" + cur_date + "'")
+  base.replaceInFileRE(server_dir + "/Common/sources/commondefines.js", "const buildVersion = '[0-9.]*'", "const buildVersion = '" + product_version + "'")
 
   custom_public_key = branding_dir + '/debug.js'
 
   if(base.is_exist(custom_public_key)):
-      base.copy_file(custom_public_key, server_build_dir + '/Common/sources')
+      base.copy_file(custom_public_key, server_dir + '/Common/sources')
 
-  pkg_target = "node14"
+  pkg_target = "node16"
 
   if ("linux" == base.host_platform()):
     pkg_target += "-linux"
@@ -51,16 +48,26 @@ def make():
   if ("windows" == base.host_platform()):
     pkg_target += "-win"
 
-  base.cmd_in_dir(server_build_dir + "/DocService", "pkg", [".", "-t", pkg_target, "--options", "max_old_space_size=4096", "-o", "docservice"])
-  base.cmd_in_dir(server_build_dir + "/FileConverter", "pkg", [".", "-t", pkg_target, "-o", "converter"])
-  base.cmd_in_dir(server_build_dir + "/Metrics", "pkg", [".", "-t", pkg_target, "-o", "metrics"])
+  base.cmd_in_dir(server_dir + "/DocService", "pkg", [".", "-t", pkg_target, "--options", "max_old_space_size=4096", "-o", "docservice"])
+  base.cmd_in_dir(server_dir + "/FileConverter", "pkg", [".", "-t", pkg_target, "-o", "converter"])
+  base.cmd_in_dir(server_dir + "/Metrics", "pkg", [".", "-t", pkg_target, "-o", "metrics"])
 
   example_dir = base.get_script_dir() + "/../../document-server-integration/web/documentserver-example/nodejs"
   base.delete_dir(example_dir  + "/node_modules")
-  base.cmd_in_dir(example_dir, "npm", ["install"])
+  base.cmd_in_dir(example_dir, "npm", ["ci"])
   base.cmd_in_dir(example_dir, "pkg", [".", "-t", pkg_target, "-o", "example"])
 
+def build_server_with_addons():
+  addons = {}
+  addons["server"] = [True, False]
+  addons.update(base.get_server_addons())
+  for addon in addons:
+    if (addon):
+      addon_dir = base.get_script_dir() + "/../../" + addon
+      base.cmd_in_dir(addon_dir, "npm", ["ci"])
+      base.cmd_in_dir(addon_dir, "npm", ["run", "build"])
+
 def build_server_develop():
   server_dir = base.get_script_dir() + "/../../server"
-  base.cmd_in_dir(server_dir, "npm", ["install"])
+  base.cmd_in_dir(server_dir, "npm", ["ci"])
   base.cmd_in_dir(server_dir, "grunt", ["develop", "-v"] + base.server_addons_param())

scripts/config.py

@@ -182,6 +182,9 @@ def extend_option(name, value):
   else:
     options[name] = value
 
+def set_option(name, value):
+  options[name] = value
+
 def branding():
   branding = option("branding-name")
   if ("" == branding):
@@ -219,6 +222,10 @@ def parse_defaults():
       options[name] = options[name].replace("default", defaults_options[name])
     else:
       options[name] = defaults_options[name]
+
+  if ("config_addon" in defaults_options):
+    extend_option("config", defaults_options["config_addon"])
+
   return
 
 def is_cef_107():

scripts/core_common/make_common.py

@@ -21,6 +21,7 @@ import glew
 import harfbuzz
 import hyphen
 import googletest
+import libvlc
 
 def check_android_ndk_macos_arm(dir):
   if base.is_dir(dir + "/darwin-x86_64") and not base.is_dir(dir + "/darwin-arm64"):
@@ -46,6 +47,9 @@ def make():
   glew.make()
   hyphen.make()
   googletest.make()
+
+  if config.check_option("build-libvlc", "1"):
+    libvlc.make()
   
   if config.check_option("module", "mobile"):
     if (config.check_option("platform", "android")):

scripts/core_common/modules/icu.py

@@ -5,23 +5,44 @@ sys.path.append('../..')
 import config
 import base
 import os
+import glob
 import icu_android
 
+def fetch_icu(major, minor):
+  base.cmd("git", ["clone", "--depth", "1", "--branch", "maint/maint-" + major, "https://github.com/unicode-org/icu.git", "./icu2"])
+  base.copy_dir("./icu2/icu4c", "./icu")
+  base.delete_dir_with_access_error("icu2")
+  #base.cmd("svn", ["export", "https://github.com/unicode-org/icu/tags/release-" + icu_major + "-" + icu_minor + "/icu4c", "./icu", "--non-interactive", "--trust-server-cert"])
+  return
+
+def clear_module():
+  if base.is_dir("icu"):
+    base.delete_dir_with_access_error("icu")
+
+  # remove build
+  for child in glob.glob("./*"):
+    if base.is_dir(child):
+      base.delete_dir(child)
+
+  return
+
 def make():
   print("[fetch & build]: icu")
 
-  if (-1 != config.option("platform").find("android")):
-    icu_android.make()
-
   base_dir = base.get_script_dir() + "/../../core/Common/3dParty/icu"
   old_cur = os.getcwd()
   os.chdir(base_dir)
 
-  icu_major = "58"
-  icu_minor = "2"
+  base.check_module_version("3", clear_module)
 
+  if (-1 != config.option("platform").find("android")):
+    icu_android.make()
+
+  icu_major = "58"
+  icu_minor = "3"
+  
   if not base.is_dir("icu"):
-    base.cmd("svn", ["export", "https://github.com/unicode-org/icu/tags/release-" + icu_major + "-" + icu_minor + "/icu4c", "./icu", "--non-interactive", "--trust-server-cert"])
+    fetch_icu(icu_major, icu_minor)  
 
   if ("windows" == base.host_platform()):
     platformToolset = "v140"

scripts/core_common/modules/icu_android.py

@@ -5,11 +5,18 @@ sys.path.append('../..')
 import base
 import os
 
+def fetch_icu(major, minor):
+  base.cmd("git", ["clone", "--depth", "1", "--branch", "maint/maint-" + major, "https://github.com/unicode-org/icu.git", "./icu2"])
+  base.copy_dir("./icu2/icu4c", "./icu")
+  base.delete_dir_with_access_error("icu2")
+  #base.cmd("svn", ["export", "https://github.com/unicode-org/icu/tags/release-" + icu_major + "-" + icu_minor + "/icu4c", "./icu", "--non-interactive", "--trust-server-cert"])
+  return
+
 current_dir = base.get_script_dir() + "/../../core/Common/3dParty/icu/android"
 
 toolshains_dir = current_dir + "/toolchains"
 icu_major = "58"
-icu_minor = "2"
+icu_minor = "3"
 icu_is_shared = False
 
 current_path = base.get_env("PATH")
@@ -77,11 +84,11 @@ def make():
   os.chdir(current_dir)
 
   if not base.is_dir("icu"):
-    base.cmd("svn", ["export", "https://github.com/unicode-org/icu/tags/release-" + icu_major + "-" + icu_minor + "/icu4c", "./icu", "--non-interactive", "--trust-server-cert"])
+    fetch_icu(icu_major, icu_minor)
     if ("linux" == base.host_platform()):
       base.replaceInFile(current_dir + "/icu/source/i18n/digitlst.cpp", "xlocale", "locale")
-    #if ("mac" == base.host_platform()):
-    #  base.replaceInFile(current_dir + "/icu/source/tools/pkgdata/pkgdata.cpp", "cmd, \"%s %s -o %s%s %s %s%s %s %s\",", "cmd, \"%s %s -o %s%s %s %s %s %s %s\",")
+    if ("mac" == base.host_platform()):
+      base.replaceInFile(current_dir + "/icu/source/tools/pkgdata/pkgdata.cpp", "cmd, \"%s %s -o %s%s %s %s%s %s %s\",", "cmd, \"%s %s -o %s%s %s %s %s %s %s\",")
 
   if not base.is_dir(current_dir + "/icu/cross_build"):
     base.create_dir(current_dir + "/icu/cross_build")

scripts/core_common/modules/icu_mac.py

@@ -35,7 +35,7 @@ def restore_icu_defs(current_dir):
   return
 
 icu_major = "58"
-icu_minor = "2"
+icu_minor = "3"
 
 current_dir_old = os.getcwd()
 current_dir = base.get_script_dir() + "/../../core/Common/3dParty/icu"

scripts/core_common/modules/libvlc.py

@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append('../..')
+import config
+import base
+import os
+
+def docker_build(image_name, dockerfile_dir, base_dir):
+  base.cmd("docker", ["build", "-t", image_name, dockerfile_dir])
+  vlc_dir = base_dir + "/vlc"
+  base.cmd("docker", ["run", "--rm", "-v", vlc_dir + ":/vlc", image_name])
+  base.cmd("docker", ["image", "rm", image_name])
+  return
+
+def form_build_win(src_dir, dest_dir):
+  if not base.is_dir(dest_dir):
+    base.create_dir(dest_dir)
+  # copy include dir
+  base.copy_dir(src_dir + "/sdk/include", dest_dir + "/include")
+  # form lib dir
+  base.create_dir(dest_dir + "/lib")
+  base.copy_file(src_dir + "/sdk/lib/libvlc.lib", dest_dir + "/lib/vlc.lib")
+  base.copy_file(src_dir + "/sdk/lib/libvlccore.lib", dest_dir + "/lib/vlccore.lib")
+  base.copy_dir(src_dir + "/plugins", dest_dir + "/lib/plugins")
+  base.copy_file(src_dir + "/libvlc.dll", dest_dir + "/lib")
+  base.copy_file(src_dir + "/libvlccore.dll", dest_dir + "/lib")
+  base.copy_file(src_dir + "/vlc-cache-gen.exe", dest_dir + "/lib")
+  # generate cache file 'plugins.dat' for plugins loading
+  base.cmd_exe(dest_dir + "/lib/vlc-cache-gen", [dest_dir + "/lib/plugins"])
+  return
+
+def form_build_linux(src_dir, dest_dir):
+  if not base.is_dir(dest_dir):
+    base.create_dir(dest_dir)
+  # copy include dir
+  base.copy_dir(src_dir + "/include", dest_dir + "/include")
+  # copy and form lib dir
+  base.copy_dir(src_dir + "/lib", dest_dir + "/lib")
+  base.delete_dir(dest_dir + "/lib/pkgconfig")
+  base.delete_file(dest_dir + "/lib/vlc/libcompat.a")
+
+def form_build_mac(src_dir, dest_dir):
+  if not base.is_dir(dest_dir):
+    base.create_dir(dest_dir)
+  # copy include dir
+  base.copy_dir(src_dir + "/include", dest_dir + "/include")
+  # copy and form lib dir
+  base.copy_dir(src_dir + "/lib", dest_dir + "/lib")
+  base.cmd("find", [dest_dir + "/lib", "-name", "\"*.la\"", "-type", "f", "-delete"])
+  base.delete_dir(dest_dir + "/lib/pkgconfig")
+  base.delete_file(dest_dir + "/lib/vlc/libcompat.a")
+  # generate cache file 'plugins.dat' for plugins loading
+  base.run_command("DYLD_LIBRARY_PATH=" + dest_dir + "/lib " + dest_dir + "/lib/vlc/vlc-cache-gen " + dest_dir + "/lib/vlc/plugins")
+  return
+
+def make():
+
+  print("[fetch & build]: libvlc")
+
+  base_dir = base.get_script_dir() + "/../../core/Common/3dParty/libvlc"
+  vlc_dir = base_dir + "/vlc"
+  vlc_version = "3.0.18"
+
+  old_cur = os.getcwd()
+  os.chdir(base_dir)
+
+  if not base.is_dir(vlc_dir):
+    # temporary disable auto CRLF for Windows
+    if "windows" == base.host_platform():
+      autocrlf_old = base.run_command("git config --global core.autocrlf")['stdout']
+      base.cmd("git", ["config", "--global", "core.autocrlf", "false"])
+    base.cmd("git", ["clone", "https://code.videolan.org/videolan/vlc.git", "--branch", vlc_version])
+    if "windows" == base.host_platform():
+      base.cmd("git", ["config", "--global", "core.autocrlf", autocrlf_old])
+  
+  base.create_dir("build")
+  base.copy_file("tools/ignore-cache-time.patch", "vlc")
+
+  # windows
+  if "windows" == base.host_platform():
+    if config.check_option("platform", "win_64"):
+      base.copy_file("tools/win_64/build.patch", "vlc")
+      docker_build("libvlc-win64", base_dir + "/tools/win_64", base_dir)
+      form_build_win(vlc_dir + "/build/win64/vlc-" + vlc_version, base_dir + "/build/win_64")
+      
+    if config.check_option("platform", "win_32"):
+      base.copy_file("tools/win_32/build.patch", "vlc")
+      docker_build("libvlc-win32", base_dir + "/tools/win_32", base_dir)
+      form_build_win(vlc_dir + "/build/win32/vlc-" + vlc_version, base_dir + "/build/win_32")
+
+  # linux
+  if config.check_option("platform", "linux_64"):
+    docker_build("libvlc-linux64", base_dir + "/tools/linux_64", base_dir)
+    form_build_linux(vlc_dir + "/build/linux_64", base_dir + "/build/linux_64")
+  
+  # mac
+  if "mac" == base.host_platform():
+    os.chdir(vlc_dir)
+
+    base.cmd("git", ["restore", "src/modules/bank.c"])
+    base.cmd("patch", ["-p1", "src/modules/bank.c", "../tools/ignore-cache-time.patch"])
+
+    if config.check_option("platform", "mac_64"):
+      base.cmd("git", ["restore", "extras/package/macosx/build.sh"])
+      base.cmd("patch", ["-p1", "extras/package/macosx/build.sh", "../tools/mac_64/build.patch"])
+      base.create_dir("build/mac_64")
+      os.chdir("build/mac_64")
+      base.cmd("../../extras/package/macosx/build.sh", ["-c"])
+      form_build_mac(vlc_dir + "/build/mac_64/vlc_install_dir", base_dir + "/build/mac_64")
+
+    if config.check_option("platform", "mac_arm64"):
+      base.cmd("git", ["restore", "extras/package/macosx/build.sh"])
+      base.cmd("patch", ["-p1", "extras/package/macosx/build.sh", "../tools/mac_arm64/build.patch"])
+      base.create_dir("build/mac_arm64")
+      os.chdir("build/mac_arm64")
+      base.cmd("../../extras/package/macosx/build.sh", ["-c"])
+      form_build_mac(vlc_dir + "/build/mac_arm64/vlc_install_dir", base_dir + "/build/mac_arm64")
+
+  os.chdir(old_cur)
+  return

scripts/core_common/modules/v8.py

@@ -230,8 +230,11 @@ def make_xp():
       if base.is_file("depot_tools/cipd.ps1"):
         base.replaceInFile("depot_tools/cipd.ps1", "windows-386", "windows-amd64")
   
+  # old variant
+  #path_to_python2 = "/depot_tools/win_tools-2_7_13_chromium7_bin/python/bin"
+  path_to_python2 = "/depot_tools/bootstrap-2@3_8_10_chromium_26_bin/python/bin"
   os.environ["PATH"] = os.pathsep.join([base_dir + "/depot_tools", 
-    base_dir + "/depot_tools/win_tools-2_7_13_chromium7_bin/python/bin", 
+    base_dir + path_to_python2, 
     config.option("vs-path") + "/../Common7/IDE",
     os.environ["PATH"]])
 

scripts/core_common/modules/v8_89.py

@@ -108,9 +108,10 @@ def make():
 
   if ("windows" == base.host_platform()):
     base.replaceInFile("v8/build/config/win/BUILD.gn", ":static_crt", ":dynamic_crt")
-
     if not base.is_file("v8/src/base/platform/wrappers.cc"):
       base.writeFile("v8/src/base/platform/wrappers.cc", "#include \"src/base/platform/wrappers.h\"\n")
+  else:
+    base.replaceInFile("depot_tools/gclient_paths.py", "@functools.lru_cache", "")
 
   if not base.is_file("v8/third_party/jinja2/tests.py.bak"):
     base.copy_file("v8/third_party/jinja2/tests.py", "v8/third_party/jinja2/tests.py.bak")

scripts/deploy.py

@@ -7,6 +7,7 @@ import deploy_builder
 import deploy_server
 import deploy_core
 import deploy_mobile
+import deploy_osign
 
 def make():
   if config.check_option("module", "desktop"):
@@ -19,4 +20,6 @@ def make():
     deploy_core.make()
   if config.check_option("module", "mobile"):
     deploy_mobile.make()
+  if config.check_option("module", "osign"):
+    deploy_osign.make()
   return

scripts/deploy_builder.py

@@ -79,9 +79,12 @@ def make():
 
     # app
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, root_dir, "docbuilder")
-    base.generate_doctrenderer_config(root_dir + "/DoctRenderer.config", "./", "builder")
+    base.generate_doctrenderer_config(root_dir + "/DoctRenderer.config", "./", "builder", "", "./dictionaries")
     base.copy_dir(git_dir + "/document-templates/new/en-US", root_dir + "/empty")
 
+    # dictionaries
+    base.copy_dictionaries(git_dir + "/dictionaries", root_dir + "/dictionaries", True, False)
+
     # js
     base.copy_dir(base_dir + "/js/" + branding + "/builder/sdkjs", root_dir + "/sdkjs")
     base.create_dir(root_dir + "/sdkjs/vendor")

scripts/deploy_core.py

@@ -60,7 +60,10 @@ def make():
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "x2ttester")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "ooxml_crypt")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "vboxtester")
+    base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "metafiletester")
 
+    # dictionaries
+    base.copy_dictionaries(git_dir + "/dictionaries", archive_dir + "/dictionaries", True, False)
 
     if base.is_file(archive_dir + ".7z"):
       base.delete_file(archive_dir + ".7z")

scripts/deploy_desktop.py

@@ -6,30 +6,16 @@ import os
 import platform
 import glob
 
-def deploy_marketplace_plugin(git_dir, root_dir):
-  # old manager
-  #base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins", root_dir + "/editors/sdkjs-plugins", "manager", True)
+def copy_lib_with_links(src_dir, dst_dir, lib, version):
+  lib_full_name = lib + "." + version
+  major_version = version[:version.find(".")]
+  lib_major_name = lib + "." + major_version
 
-  # plugin manager with local paths
-  sys_plugins_dir = root_dir + "/editors/sdkjs-plugins"
-  base.clone_marketplace_plugin(sys_plugins_dir, True, True, False)
-      
-  # store with local paths
-  manager_dir = sys_plugins_dir + "/{AA2EA9B6-9EC2-415F-9762-634EE8D9A95E}"
+  base.copy_file(src_dir + "/" + lib_full_name, dst_dir + "/" + lib_full_name)
   
-  store_dir_path = manager_dir + "/store"
-  if base.is_dir(store_dir_path):
-    base.delete_dir(store_dir_path)
-  base.create_dir(store_dir_path)
-  
-  base.copy_dir_content(sys_plugins_dir + "/onlyoffice.github.io/store", store_dir_path, "", ".git")
-  base.delete_dir(store_dir_path + "/plugin")
-  base.delete_file(store_dir_path + "/build.bat")
-  
-  for file in glob.glob(store_dir_path + "/*.html"):
-    base.replaceInFile(file, "https://onlyoffice.github.io/sdkjs-plugins/", "../../")
-      
-  base.delete_dir_with_access_error(sys_plugins_dir + "/onlyoffice.github.io")
+  base.cmd_in_dir(dst_dir, "ln", ["-s", "./" + lib_full_name, "./" + lib_major_name])
+  base.cmd_in_dir(dst_dir, "ln", ["-s", "./" + lib_major_name, "./" + lib])
+
   return
 
 def make():
@@ -68,23 +54,25 @@ def make():
 
     platform_postfix = platform + base.qt_dst_postfix()
 
+    build_libraries_path = core_build_dir + "/lib/" + platform_postfix
+
     # x2t
     base.create_dir(root_dir + "/converter")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "kernel")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "kernel_network")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "UnicodeConverter")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "graphics")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "PdfFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "DjVuFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "XpsFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "HtmlFile2")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "HtmlRenderer")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "Fb2File")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "EpubFile")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "DocxRenderer")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "kernel")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "kernel_network")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "UnicodeConverter")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "graphics")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "PdfFile")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "DjVuFile")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "XpsFile")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "HtmlFile2")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "HtmlRenderer")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "Fb2File")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "EpubFile")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "DocxRenderer")
     
     if ("ios" == platform):
-      base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "x2t")
+      base.copy_lib(build_libraries_path, root_dir + "/converter", "x2t")
     else:
       base.copy_exe(core_build_dir + "/bin/" + platform_postfix, root_dir + "/converter", "x2t")
 
@@ -107,19 +95,24 @@ def make():
 
     # doctrenderer
     if isWindowsXP:
-      base.copy_lib(core_build_dir + "/lib/" + platform_postfix + "/xp", root_dir + "/converter", "doctrenderer")
+      base.copy_lib(build_libraries_path + "/xp", root_dir + "/converter", "doctrenderer")
     else:
-      base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir + "/converter", "doctrenderer")      
+      base.copy_lib(build_libraries_path, root_dir + "/converter", "doctrenderer")      
     base.copy_v8_files(core_dir, root_dir + "/converter", platform, isWindowsXP)
 
-    base.generate_doctrenderer_config(root_dir + "/converter/DoctRenderer.config", "../editors/", "desktop")
+    base.generate_doctrenderer_config(root_dir + "/converter/DoctRenderer.config", "../editors/", "desktop", "", "../dictionaries")
     base.copy_dir(git_dir + "/document-templates/new", root_dir + "/converter/empty")
 
     # dictionaries
-    base.create_dir(root_dir + "/dictionaries")
-    base.copy_dir_content(git_dir + "/dictionaries", root_dir + "/dictionaries", "", ".git")
+    base.copy_dictionaries(git_dir + "/dictionaries", root_dir + "/dictionaries")
+
+    base.copy_dir(git_dir  + "/core-fonts/opensans",   root_dir + "/fonts")
+    base.copy_dir(git_dir  + "/core-fonts/asana",      root_dir + "/fonts/asana")
+    base.copy_dir(git_dir  + "/core-fonts/caladea",    root_dir + "/fonts/caladea")
+    base.copy_dir(git_dir  + "/core-fonts/crosextra",  root_dir + "/fonts/crosextra")
+    base.copy_dir(git_dir  + "/core-fonts/openoffice", root_dir + "/fonts/openoffice")
+    base.copy_file(git_dir + "/core-fonts/ASC.ttf",    root_dir + "/fonts/ASC.ttf")
 
-    base.copy_dir(git_dir + "/desktop-apps/common/package/fonts", root_dir + "/fonts")
     base.copy_file(git_dir + "/desktop-apps/common/package/license/3dparty/3DPARTYLICENSE", root_dir + "/3DPARTYLICENSE")
   
     # cef
@@ -139,11 +132,11 @@ def make():
       isUseQt = False
 
     # libraries
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "hunspell")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix + ("/xp" if isWindowsXP else ""), root_dir, "ooxmlsignature")
-    base.copy_lib(core_build_dir + "/lib/" + platform_postfix + ("/xp" if isWindowsXP else ""), root_dir, "ascdocumentscore")
+    base.copy_lib(build_libraries_path, root_dir, "hunspell")
+    base.copy_lib(build_libraries_path + ("/xp" if isWindowsXP else ""), root_dir, "ooxmlsignature")
+    base.copy_lib(build_libraries_path + ("/xp" if isWindowsXP else ""), root_dir, "ascdocumentscore")
     if (0 != platform.find("mac")):
-      base.copy_lib(core_build_dir + "/lib/" + platform_postfix + ("/xp" if isWindowsXP else ""), root_dir, "qtascdocumentscore")
+      base.copy_lib(build_libraries_path + ("/xp" if isWindowsXP else ""), root_dir, "qtascdocumentscore")
     
     if (0 == platform.find("mac")):
       base.copy_dir(core_build_dir + "/bin/" + platform_postfix + "/editors_helper.app", root_dir + "/editors_helper.app")
@@ -155,9 +148,7 @@ def make():
       base.qt_copy_lib("Qt5Gui", root_dir)
       base.qt_copy_lib("Qt5PrintSupport", root_dir)
       base.qt_copy_lib("Qt5Svg", root_dir)
-      base.qt_copy_lib("Qt5Widgets", root_dir)
-      base.qt_copy_lib("Qt5Multimedia", root_dir)
-      base.qt_copy_lib("Qt5MultimediaWidgets", root_dir)
+      base.qt_copy_lib("Qt5Widgets", root_dir)      
       base.qt_copy_lib("Qt5Network", root_dir)
       base.qt_copy_lib("Qt5OpenGL", root_dir)
 
@@ -166,13 +157,17 @@ def make():
       base.qt_copy_plugin("imageformats", root_dir)
       base.qt_copy_plugin("platforms", root_dir)
       base.qt_copy_plugin("platforminputcontexts", root_dir)
-      base.qt_copy_plugin("printsupport", root_dir)
-      base.qt_copy_plugin("mediaservice", root_dir)
-      base.qt_copy_plugin("playlistformats", root_dir)
+      base.qt_copy_plugin("printsupport", root_dir)      
 
       base.qt_copy_plugin("platformthemes", root_dir)
       base.qt_copy_plugin("xcbglintegrations", root_dir)
 
+      if not base.check_congig_option_with_platfom(platform, "libvlc"):
+        base.qt_copy_lib("Qt5Multimedia", root_dir)
+        base.qt_copy_lib("Qt5MultimediaWidgets", root_dir)
+        base.qt_copy_plugin("mediaservice", root_dir)
+        base.qt_copy_plugin("playlistformats", root_dir)
+
       base.qt_copy_plugin("styles", root_dir)
 
       if (0 == platform.find("linux")):
@@ -180,7 +175,8 @@ def make():
         base.qt_copy_lib("Qt5X11Extras", root_dir)
         base.qt_copy_lib("Qt5XcbQpa", root_dir)
         base.qt_copy_icu(root_dir)
-        base.copy_files(base.get_env("QT_DEPLOY") + "/../lib/libqgsttools_p.so*", root_dir)
+        if not base.check_congig_option_with_platfom(platform, "libvlc"):
+          base.copy_files(base.get_env("QT_DEPLOY") + "/../lib/libqgsttools_p.so*", root_dir)
 
       if (0 == platform.find("win")):
         base.copy_file(git_dir + "/desktop-apps/win-linux/extras/projicons/" + apps_postfix + "/projicons.exe", root_dir + "/DesktopEditors.exe")
@@ -191,29 +187,29 @@ def make():
       elif (0 == platform.find("linux")):
         base.copy_file(git_dir + "/desktop-apps/win-linux/" + apps_postfix + "/DesktopEditors", root_dir + "/DesktopEditors")
 
-      if ("" != base.get_env("VIDEO_PLAYER_VLC_DIR")):
-        vlc_dir = git_dir + "/desktop-sdk/ChromiumBasedEditors/videoplayerlib/vlc/"
+      if base.check_congig_option_with_platfom(platform, "libvlc"):
+        vlc_dir = git_dir + "/core/Common/3dParty/libvlc/build/" + platform + "/lib"
+        
         if (0 == platform.find("win")):
-          base.copy_file(vlc_dir + platform + "/bin/libvlc.dll", root_dir + "/libvlc.dll")
-          base.copy_file(vlc_dir + platform + "/bin/libvlccore.dll", root_dir + "/libvlccore.dll")
-          base.copy_file(vlc_dir + platform + "/bin/VLCQtCore.dll", root_dir + "/VLCQtCore.dll")
-          base.copy_file(vlc_dir + platform + "/bin/VLCQtWidgets.dll", root_dir + "/VLCQtWidgets.dll")
-        else:
-          base.copy_file(vlc_dir + platform + "/bin/libvlc.so", root_dir + "/libvlc.so")
-          base.copy_file(vlc_dir + platform + "/bin/libvlc.so.5", root_dir + "/libvlc.so.5")
-          base.copy_file(vlc_dir + platform + "/bin/libvlccore.so", root_dir + "/libvlccore.so")
-          base.copy_file(vlc_dir + platform + "/bin/libvlccore.so.8", root_dir + "/libvlccore.so.8")
-          base.copy_file(vlc_dir + platform + "/bin/VLCQtCore.so", root_dir + "/VLCQtCore.so")
-          base.copy_file(vlc_dir + platform + "/bin/VLCQtWidgets.so", root_dir + "/VLCQtWidgets.so")
+          base.copy_dir(vlc_dir + "/plugins", root_dir + "/plugins")          
+          base.copy_files(vlc_dir + "/*.dll", root_dir)
+          base.copy_file(vlc_dir + "/vlc-cache-gen.exe", root_dir + "/vlc-cache-gen.exe")
+        elif (0 == platform.find("linux")):
+          base.copy_dir(vlc_dir + "/vlc/plugins", root_dir + "/plugins")
+          base.copy_file(vlc_dir + "/vlc/libcompat.a", root_dir + "/libcompat.a")
+          copy_lib_with_links(vlc_dir + "/vlc", root_dir, "libvlc_pulse.so", "0.0.0")
+          copy_lib_with_links(vlc_dir + "/vlc", root_dir, "libvlc_vdpau.so", "0.0.0")
+          copy_lib_with_links(vlc_dir + "/vlc", root_dir, "libvlc_xcb_events.so", "0.0.0")
+          copy_lib_with_links(vlc_dir, root_dir, "libvlc.so", "5.6.1")
+          copy_lib_with_links(vlc_dir, root_dir, "libvlccore.so", "9.0.1")
+          base.copy_file(vlc_dir + "/vlc/vlc-cache-gen", root_dir + "/vlc-cache-gen")
 
         if isWindowsXP:
-          base.copy_lib(core_build_dir + "/lib/" + platform + "/mediaplayer/xp", root_dir, "videoplayer")
+          base.copy_lib(build_libraries_path + "/mediaplayer/xp", root_dir, "videoplayer")
         else:
-          base.copy_lib(core_build_dir + "/lib/" + platform + "/mediaplayer", root_dir, "videoplayer")
-
-        base.copy_dir(vlc_dir + platform + "/bin/plugins", root_dir + "/plugins")
+          base.copy_lib(build_libraries_path + "/mediaplayer", root_dir, "videoplayer")
       else:
-        base.copy_lib(core_build_dir + "/lib/" + platform_postfix + ("/xp" if isWindowsXP else ""), root_dir, "videoplayer")
+        base.copy_lib(build_libraries_path + ("/xp" if isWindowsXP else ""), root_dir, "videoplayer")
 
     base.create_dir(root_dir + "/editors")
     base.copy_dir(base_dir + "/js/" + branding + "/desktop/sdkjs", root_dir + "/editors/sdkjs")
@@ -221,7 +217,9 @@ def make():
     base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/resources/local", root_dir + "/editors/sdkjs/common/Images/local")
 
     base.create_dir(root_dir + "/editors/sdkjs-plugins")
-    base.copy_sdkjs_plugins(root_dir + "/editors/sdkjs-plugins", True, True)
+    if not isWindowsXP:
+      base.copy_marketplace_plugin(root_dir + "/editors/sdkjs-plugins", True, True, True)
+    base.copy_sdkjs_plugins(root_dir + "/editors/sdkjs-plugins", True, True, isWindowsXP)
     # remove some default plugins
     if base.is_dir(root_dir + "/editors/sdkjs-plugins/speech"):
       base.delete_dir(root_dir + "/editors/sdkjs-plugins/speech")
@@ -237,10 +235,10 @@ def make():
     #base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/common/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}", root_dir + "/editors/sdkjs-plugins/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}")
     #base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/engine/database/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}", root_dir + "/editors/sdkjs-plugins/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}")
     base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins", root_dir + "/editors/sdkjs-plugins", "sendto", True)
-    
-    deploy_marketplace_plugin(git_dir, root_dir)
-    
+  
     base.copy_file(base_dir + "/js/" + branding + "/desktop/index.html", root_dir + "/index.html")
+    base.create_dir(root_dir + "/editors/webext")
+    base.copy_file(base_dir + "/js/" + branding + "/desktop/noconnect.html", root_dir + "/editors/webext/noconnect.html")
 
     if isWindowsXP:
       base.create_dir(root_dir + "/providers")

scripts/deploy_mobile.py

@@ -6,6 +6,18 @@ import base
 def exclude_arch(directory, frameworks):
   for lib in frameworks:
     base.cmd("lipo", ["-remove", "arm64", directory + "/" + lib + ".framework/" + lib, "-o", directory + "/" + lib + ".framework/" + lib])
+  return
+
+def deploy_fonts(git_dir, root_dir, platform=""):
+  base.create_dir(root_dir + "/fonts")
+  base.copy_file(git_dir + "/core-fonts/ASC.ttf", root_dir + "/fonts/ASC.ttf")
+  base.copy_dir(git_dir + "/core-fonts/asana", root_dir + "/fonts/asana")
+  base.copy_dir(git_dir + "/core-fonts/caladea", root_dir + "/fonts/caladea")
+  base.copy_dir(git_dir + "/core-fonts/crosextra", root_dir + "/fonts/crosextra")
+  base.copy_dir(git_dir + "/core-fonts/openoffice", root_dir + "/fonts/openoffice")
+  if (platform == "android"):
+    base.copy_dir(git_dir + "/core-fonts/dejavu", root_dir + "/fonts/dejavu")
+    base.copy_dir(git_dir + "/core-fonts/liberation", root_dir + "/fonts/liberation")
   return 
 
 def make():
@@ -82,20 +94,12 @@ def make():
     # correct ios frameworks
     if ("ios" == platform):
       base.generate_plist(root_dir)
+      deploy_fonts(git_dir, root_dir)
+      base.copy_dictionaries(git_dir + "/dictionaries", root_dir + "/dictionaries", True, False)
 
     if (0 == platform.find("mac")):
       base.mac_correct_rpath_x2t(root_dir)
 
-    base.create_dir(root_dir + "/fonts")
-    base.copy_file(git_dir + "/core-fonts/ASC.ttf", root_dir + "/fonts/ASC.ttf")
-    base.copy_dir(git_dir + "/core-fonts/asana", root_dir + "/fonts/asana")
-    base.copy_dir(git_dir + "/core-fonts/caladea", root_dir + "/fonts/caladea")
-    base.copy_dir(git_dir + "/core-fonts/crosextra", root_dir + "/fonts/crosextra")
-    base.copy_dir(git_dir + "/core-fonts/openoffice", root_dir + "/fonts/openoffice")
-    if (0 == platform.find("android")):
-      base.copy_dir(git_dir + "/core-fonts/dejavu", root_dir + "/fonts/dejavu")
-      base.copy_dir(git_dir + "/core-fonts/liberation", root_dir + "/fonts/liberation")
-
   for native_platform in platforms:
     if native_platform == "android":
       # make full version
@@ -106,9 +110,10 @@ def make():
       # js
       base.copy_dir(base_dir + "/js/" + branding + "/mobile/sdkjs", root_dir + "/sdkjs")
       # fonts
-      base.copy_dir(base_dir + "/js/" + branding + "/mobile/fonts", root_dir + "/fonts")
+      deploy_fonts(git_dir, root_dir, "android")
+      base.copy_dictionaries(git_dir + "/dictionaries", root_dir + "/dictionaries", True, False)
       # app
-      base.generate_doctrenderer_config(root_dir + "/DoctRenderer.config", "./", "builder")      
+      base.generate_doctrenderer_config(root_dir + "/DoctRenderer.config", "./", "builder", "", "./dictionaries")      
       libs_dir = root_dir + "/lib"
       base.create_dir(libs_dir + "/arm64-v8a")
       base.copy_files(base_dir + "/android_arm64_v8a/" + branding + "/mobile/*.so", libs_dir + "/arm64-v8a")

scripts/deploy_osign.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+
+import config
+import base
+
+def make():
+  base_dir = base.get_script_dir() + "/../out"
+  git_dir = base.get_script_dir() + "/../.."
+  core_dir = git_dir + "/core"
+  branding = config.branding()
+
+  platforms = config.option("platform").split()
+  for native_platform in platforms:
+    if not native_platform in config.platforms:
+      continue
+
+    root_dir = base_dir + "/" + native_platform + "/" + branding + "/osign"
+
+    if base.get_env("DESTDIR_BUILD_OVERRIDE") != "":
+      return
+      
+    if (base.is_dir(root_dir)):
+      base.delete_dir(root_dir)
+    base.create_dir(root_dir)
+
+    qt_dir = base.qt_setup(native_platform)
+    platform = native_platform
+
+    core_build_dir = core_dir + "/build"
+    if ("" != config.option("branding")):
+      core_build_dir += ("/" + config.option("branding"))
+
+    platform_postfix = platform + base.qt_dst_postfix()
+
+    # x2t
+    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "osign")
+
+    # correct ios frameworks
+    if ("ios" == platform):
+      base.generate_plist(root_dir)
+
+  for native_platform in platforms:
+    if native_platform == "android":
+      # make full version
+      root_dir = base_dir + "/android/" + branding + "/osign"
+      if (base.is_dir(root_dir)):
+        base.delete_dir(root_dir)
+      base.create_dir(root_dir)
+      libs_dir = root_dir + "/lib"
+      base.create_dir(libs_dir + "/arm64-v8a")
+      base.copy_files(base_dir + "/android_arm64_v8a/" + branding + "/osign/*.so", libs_dir + "/arm64-v8a")
+      base.create_dir(libs_dir + "/armeabi-v7a")
+      base.copy_files(base_dir + "/android_armv7/" + branding + "/osign/*.so", libs_dir + "/armeabi-v7a")
+      base.create_dir(libs_dir + "/x86")
+      base.copy_files(base_dir + "/android_x86/" + branding + "/osign/*.so", libs_dir + "/x86")
+      base.create_dir(libs_dir + "/x86_64")
+      base.copy_files(base_dir + "/android_x86_64/" + branding + "/osign/*.so", libs_dir + "/x86_64")
+      break
+
+  return

scripts/deploy_server.py

@@ -40,24 +40,22 @@ def make():
 
     build_server_dir = root_dir + '/server'
     server_dir = base.get_script_dir() + "/../../server"
-    bin_server_dir = server_dir + "/build/server"
 
     base.create_dir(build_server_dir + '/DocService')
 
-    base.copy_dir(bin_server_dir + '/Common/config', build_server_dir + '/Common/config')
+    base.copy_dir(server_dir + '/Common/config', build_server_dir + '/Common/config')
 
     base.create_dir(build_server_dir + '/DocService')
-    base.copy_exe(bin_server_dir + "/DocService", build_server_dir + '/DocService', "docservice")
+    base.copy_exe(server_dir + "/DocService", build_server_dir + '/DocService', "docservice")
 
     base.create_dir(build_server_dir + '/FileConverter')
-    base.copy_exe(bin_server_dir + "/FileConverter", build_server_dir + '/FileConverter', "converter")
+    base.copy_exe(server_dir + "/FileConverter", build_server_dir + '/FileConverter', "converter")
 
     base.create_dir(build_server_dir + '/Metrics')
-    base.copy_exe(bin_server_dir + "/Metrics", build_server_dir + '/Metrics', "metrics")
-    base.copy_dir(bin_server_dir + '/Metrics/config', build_server_dir + '/Metrics/config')
+    base.copy_exe(server_dir + "/Metrics", build_server_dir + '/Metrics', "metrics")
+    base.copy_dir(server_dir + '/Metrics/config', build_server_dir + '/Metrics/config')
     base.create_dir(build_server_dir + '/Metrics/node_modules/modern-syslog/build/Release')
-    base.copy_file(bin_server_dir + "/Metrics/node_modules/modern-syslog/build/Release/core.node", build_server_dir + "/Metrics/node_modules/modern-syslog/build/Release/core.node")
-
+    base.copy_file(server_dir + "/Metrics/node_modules/modern-syslog/build/Release/core.node", build_server_dir + "/Metrics/node_modules/modern-syslog/build/Release/core.node")
 
     qt_dir = base.qt_setup(native_platform)
     platform = native_platform
@@ -90,7 +88,7 @@ def make():
     #if (native_platform == "linux_64"):
     #  base.generate_check_linux_system(git_dir + "/build_tools", converter_dir)
 
-    base.generate_doctrenderer_config(converter_dir + "/DoctRenderer.config", "../../../", "server")
+    base.generate_doctrenderer_config(converter_dir + "/DoctRenderer.config", "../../../", "server", "", "../../../dictionaries")
 
     # icu
     if (0 == platform.find("win")):
@@ -121,6 +119,7 @@ def make():
     
     # plugins
     base.create_dir(js_dir + "/sdkjs-plugins")
+    base.copy_marketplace_plugin(js_dir + "/sdkjs-plugins", False, True)
     if ("1" == config.option("preinstalled-plugins")):
       base.copy_sdkjs_plugins(js_dir + "/sdkjs-plugins", False, True)
       base.copy_sdkjs_plugins_server(js_dir + "/sdkjs-plugins", False, True)
@@ -132,8 +131,6 @@ def make():
     base.download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins.css", js_dir + "/sdkjs-plugins/v1/plugins.css")
     base.support_old_versions_plugins(js_dir + "/sdkjs-plugins")
 
-    base.clone_marketplace_plugin(root_dir + "/sdkjs-plugins")
-    
     # tools
     tools_dir = root_dir + "/server/tools"
     base.create_dir(tools_dir)
@@ -147,10 +144,7 @@ def make():
       branding_dir = git_dir + '/' + config.option("branding") + '/server'
 
     #dictionaries
-    spellchecker_dictionaries = root_dir + '/dictionaries'
-    spellchecker_dictionaries_files = server_dir + '/../dictionaries/*_*'
-    base.create_dir(spellchecker_dictionaries)
-    base.copy_files(spellchecker_dictionaries_files, spellchecker_dictionaries)
+    base.copy_dictionaries(server_dir + "/../dictionaries", root_dir + "/dictionaries")
 
     if (0 == platform.find("win")):
       exec_ext = '.exe'
@@ -209,15 +203,15 @@ def make():
         base.delete_dir(root_dir_snap)
       base.create_dir(root_dir_snap)
       base.copy_dir(root_dir, root_dir_snap)
-      base.copy_dir(bin_server_dir + '/DocService/node_modules', root_dir_snap + '/server/DocService/node_modules')
-      base.copy_dir(bin_server_dir + '/DocService/sources', root_dir_snap + '/server/DocService/sources')
-      base.copy_dir(bin_server_dir + '/DocService/public', root_dir_snap + '/server/DocService/public')
+      base.copy_dir(server_dir + '/DocService/node_modules', root_dir_snap + '/server/DocService/node_modules')
+      base.copy_dir(server_dir + '/DocService/sources', root_dir_snap + '/server/DocService/sources')
+      base.copy_dir(server_dir + '/DocService/public', root_dir_snap + '/server/DocService/public')
       base.delete_file(root_dir_snap + '/server/DocService/docservice')
-      base.copy_dir(bin_server_dir + '/FileConverter/node_modules', root_dir_snap + '/server/FileConverter/node_modules')
-      base.copy_dir(bin_server_dir + '/FileConverter/sources', root_dir_snap + '/server/FileConverter/sources')
+      base.copy_dir(server_dir + '/FileConverter/node_modules', root_dir_snap + '/server/FileConverter/node_modules')
+      base.copy_dir(server_dir + '/FileConverter/sources', root_dir_snap + '/server/FileConverter/sources')
       base.delete_file(root_dir_snap + '/server/FileConverter/converter')
-      base.copy_dir(bin_server_dir + '/Common/node_modules', root_dir_snap + '/server/Common/node_modules')
-      base.copy_dir(bin_server_dir + '/Common/sources', root_dir_snap + '/server/Common/sources')
+      base.copy_dir(server_dir + '/Common/node_modules', root_dir_snap + '/server/Common/node_modules')
+      base.copy_dir(server_dir + '/Common/sources', root_dir_snap + '/server/Common/sources')
       if (base.is_dir(root_dir_snap_example)):
         base.delete_dir(root_dir_snap_example)
       base.create_dir(root_dir_snap_example)

scripts/develop/config_server.py

@@ -61,13 +61,13 @@ def make():
     print("Core is up to date. ---------------------------------------")
     print("-----------------------------------------------------------")
 
-  base.generate_doctrenderer_config("./DoctRenderer.config", "../../../sdkjs/deploy/", "server", "../../../web-apps/vendor/")
+  base.generate_doctrenderer_config("./DoctRenderer.config", "../../../sdkjs/deploy/", "server", "../../../web-apps/vendor/", "../../../dictionaries")
 
   if not base.is_dir(git_dir + "/sdkjs-plugins"):
     base.create_dir(git_dir + "/sdkjs-plugins")
 
   base.support_old_versions_plugins(git_dir + "/sdkjs-plugins")
-  base.clone_marketplace_plugin(git_dir + "/sdkjs-plugins", False, False, False)
+  base.copy_marketplace_plugin(git_dir + "/sdkjs-plugins", False, False)
 
   if not base.is_dir(git_dir + "/fonts"):
     base.create_dir(git_dir + "/fonts")
@@ -144,8 +144,10 @@ def make():
   example_config["siteUrl"] = "http://" + config.option("siteUrl") + ":8000/"
   example_config["apiUrl"] = "web-apps/apps/api/documents/api.js"
   example_config["preloaderUrl"] = "web-apps/apps/api/documents/cache-scripts.html"
-  json_file = git_dir + "/document-server-integration/web/documentserver-example/nodejs/config/local-development-" + base.host_platform() + ".json"
-  base.writeFile(json_file, json.dumps({"server": example_config}, indent=2))
+  json_dir = git_dir + "/document-server-integration/web/documentserver-example/nodejs/config/"
+  json_file = json_dir + "/local-development-" + base.host_platform() + ".json"
+  if base.is_exist(json_dir):
+    base.writeFile(json_file, json.dumps({"server": example_config}, indent=2))
   
   os.chdir(old_cur)
   return

scripts/develop/dependence.py

@@ -66,6 +66,28 @@ class CDependencies:
       res += ['--remove-path', item]
     return res
 
+def check__docker_dependencies():
+  if (host_platform == 'windows' and not check_vc_components()):
+    return False
+  if (host_platform == 'mac'):
+    return True
+
+  checksResult = CDependencies()
+  checksResult.append(check_nodejs())
+  checksResult.append(check_7z())
+  if (len(checksResult.install) > 0):
+    install_args = ['install.py']
+    install_args += checksResult.get_uninstall()
+    install_args += checksResult.get_removepath()
+    install_args += checksResult.get_install()
+    base_dir = base.get_script_dir(__file__)
+    install_args[0] = './scripts/develop/' + install_args[0]
+    if (host_platform == 'windows'):
+      code = libwindows.sudo(unicode(sys.executable), install_args)
+    elif (host_platform == 'linux'):
+      get_updates()
+      base.cmd_in_dir(base_dir + "/../../", 'python', install_args, False)
+
 def check_dependencies():
   if (host_platform == 'windows' and not check_vc_components()):
     return False
@@ -168,21 +190,21 @@ def check_nodejs():
   nodejs_cur_version_major = int(nodejs_version.split('.')[0][1:])
   nodejs_cur_version_minor = int(nodejs_version.split('.')[1])
   print('Installed Node.js version: ' + nodejs_version[1:])
-  nodejs_min_version = '14.14'
+  nodejs_min_version = '18'
   nodejs_min_version_minor  = 0
   major_minor_min_version = nodejs_min_version.split('.')
   nodejs_min_version_major = int(major_minor_min_version[0])
   if len(major_minor_min_version) > 1:
     nodejs_min_version_minor = int(major_minor_min_version[1])
-  nodejs_max_version = '18'
+  nodejs_max_version = ""
   nodejs_max_version_minor = float("inf")
   major_minor_max_version = nodejs_max_version.split('.')
-  nodejs_max_version_major = int(major_minor_max_version[0])
+  # nodejs_max_version_major = int(major_minor_max_version[0])
+  nodejs_max_version_major = float("inf")
   if len(major_minor_max_version) > 1:
     nodejs_max_version_minor = int(major_minor_max_version[1])
 
   if (nodejs_min_version_major > nodejs_cur_version_major or nodejs_cur_version_major > nodejs_max_version_major):
-    print('Installed Node.js version must be 14.14 to 18.x')
     isNeedReinstall = True
   elif (nodejs_min_version_major == nodejs_cur_version_major):
     if (nodejs_min_version_minor > nodejs_cur_version_minor):
@@ -192,7 +214,7 @@ def check_nodejs():
       isNeedReinstall = True
 
   if (True == isNeedReinstall):
-    print('Installed Node.js version must be 14.14 to 14.x')
+    print('Installed Node.js version must be 18 or higher.')
     if (host_platform == 'windows'):
       dependence.append_uninstall('Node.js')
       dependence.append_install('Node.js')
@@ -906,7 +928,7 @@ def install_postgresql():
   return code
 
 def install_nodejs():
-  os.system('curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -')
+  os.system('curl -sSL https://deb.nodesource.com/setup_18.x | sudo -E bash -')
   base.print_info("Install node.js...")
   install_command = 'yes | sudo apt install nodejs'
   print(install_command)
@@ -915,7 +937,7 @@ def install_nodejs():
 downloads_list = {
   'Windows': {
     'Git': 'https://github.com/git-for-windows/git/releases/download/v2.29.0.windows.1/Git-2.29.0-64-bit.exe',
-    'Node.js': 'https://nodejs.org/download/release/v14.17.6/node-v14.17.6-x64.msi',
+    'Node.js': 'https://nodejs.org/dist/v18.17.1/node-v18.17.1-x64.msi',
     'Java': 'https://aka.ms/download-jdk/microsoft-jdk-11.0.18-windows-x64.msi',
     'RabbitMQ': 'https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.9/rabbitmq-server-3.8.9.exe',
     'Erlang': 'http://erlang.org/download/otp_win64_23.1.exe',

scripts/develop/develop.py

@@ -10,11 +10,15 @@ import config_server as develop_config_server
 
 base_dir = base.get_script_dir(__file__)
 
-def make():
-  if ("1" != config.option("develop")):
-    return
-  if not dependence.check_dependencies():
-    exit(1)
+def build_docker_server():
+  dependence.check__docker_dependencies()
+  build_develop_server()
+
+def build_docker_sdk_web_apps(dir):
+  dependence.check__docker_dependencies()
+  build_js.build_js_develop(dir)
+
+def build_develop_server():
   build_server.build_server_develop()
   build_js.build_js_develop(base_dir + "/../../..")
   develop_config_server.make()
@@ -22,5 +26,12 @@ def make():
     branding_develop_script_dir = base_dir + "/../../../" + config.option("branding") + "/build_tools/scripts"
     if base.is_file(branding_develop_script_dir + "/develop.py"):
       base.cmd_in_dir(branding_develop_script_dir, "python", ["develop.py"], True)
+
+def make():
+  if ("1" != config.option("develop")):
+    return
+  if not dependence.check_dependencies():
+    exit(1)
+  build_develop_server()
   exit(0)
   

scripts/develop/run_server.py

@@ -6,6 +6,9 @@ import os
 import base
 import dependence
 import traceback
+import develop
+
+base_dir = base.get_script_dir(__file__)
 
 def install_module(path):
   base.print_info('Install: ' + path)
@@ -41,56 +44,94 @@ def start_linux_services():
   os.system('sudo service rabbitmq-server restart')
   
 def run_integration_example():
-  base.cmd_in_dir('../../../document-server-integration/web/documentserver-example/nodejs', 'python', ['run-develop.py'])
+  if base.is_exist(base_dir + '/../../../document-server-integration/web/documentserver-example/nodejs'):
+    base.cmd_in_dir(base_dir + '/../../../document-server-integration/web/documentserver-example/nodejs', 'python', ['run-develop.py'])
 
 def start_linux_services():
   base.print_info('Restart MySQL Server')
   
+def make_start():
+  base.configure_common_apps()
+  
+  platform = base.host_platform()
+  if ("windows" == platform):
+    dependence.check_pythonPath()
+    dependence.check_gitPath()
+    restart_win_rabbit()
+  elif ("mac" == platform):
+    start_mac_services()
+  elif ("linux" == platform):
+    start_linux_services()
+
+def make_configure(args):
+  platform = base.host_platform()
+  branch = base.run_command('git rev-parse --abbrev-ref HEAD')['stdout']
+  
+  base.print_info('Build modules')
+  if ("linux" == platform):
+  	base.cmd_in_dir(base_dir + '/../../', 'python', ['configure.py', '--branch', branch or 'develop', '--develop', '1', '--module', 'server', '--update', '1', '--update-light', '1', '--clean', '0'] + args)
+  else:
+  	base.cmd_in_dir(base_dir + '/../../', 'python', ['configure.py', '--branch', branch or 'develop', '--develop', '1', '--module', 'server', '--update', '1', '--update-light', '1', '--clean', '0', '--sql-type', 'mysql', '--db-port', '3306', '--db-user', 'root', '--db-pass', 'onlyoffice'] + args)
+  	
+  base.cmd_in_dir(base_dir + '/../../', 'python', ['make.py'])
+def make_install():
+  platform = base.host_platform()
+  run_integration_example()
+  
+  base.create_dir(base_dir + '/../../../server/App_Data')
+  
+  install_module(base_dir + '/../../../server/DocService')
+  install_module(base_dir + '/../../../server/Common')
+  install_module(base_dir + '/../../../server/FileConverter')
+
+def make_run():
+  platform = base.host_platform()
+  base.set_env('NODE_ENV', 'development-' + platform)
+  base.set_env('NODE_CONFIG_DIR', '../Common/config')
+  
+  if ("mac" == platform):
+    base.set_env('DYLD_LIBRARY_PATH', '../FileConverter/bin/')
+  elif ("linux" == platform):
+    base.set_env('LD_LIBRARY_PATH', '../FileConverter/bin/')
+  
+  run_module(base_dir + '/../../../server/DocService', ['sources/server.js'])
+  #run_module(base_dir + '/../../../server/DocService', ['sources/gc.js'])
+  run_module(base_dir + '/../../../server/FileConverter', ['sources/convertermaster.js'])
+  #run_module(base_dir + '/../../../server/SpellChecker', ['sources/server.js'])
+
+def run_docker_server(args = []):
+  try:
+    make_start()
+    develop.build_docker_server()
+    make_install()
+
+  except SystemExit:
+    input("Ignoring SystemExit. Press Enter to continue...")
+    exit(0)
+  except KeyboardInterrupt:
+    pass
+  except:
+    input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+	
+def run_docker_sdk_web_apps(dir):
+  try:
+    develop.build_docker_sdk_web_apps(dir)
+
+  except SystemExit:
+    input("Ignoring SystemExit. Press Enter to continue...")
+    exit(0)
+  except KeyboardInterrupt:
+    pass
+  except:
+    input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+
 def make(args = []):
   try:
-    base.configure_common_apps()
-    
-    platform = base.host_platform()
-    if ("windows" == platform):
-      dependence.check_pythonPath()
-      dependence.check_gitPath()
-      restart_win_rabbit()
-    elif ("mac" == platform):
-      start_mac_services()
-    elif ("linux" == platform):
-      start_linux_services()
-      
+    make_start()
+    make_configure(args)
+    make_install()
+    make_run()
 
-    branch = base.run_command('git rev-parse --abbrev-ref HEAD')['stdout']
-    
-    base.print_info('Build modules')
-    if ("linux" == platform):
-    	base.cmd_in_dir('../../', 'python', ['configure.py', '--branch', branch or 'develop', '--develop', '1', '--module', 'server', '--update', '1', '--update-light', '1', '--clean', '0'] + args)
-    else:
-    	base.cmd_in_dir('../../', 'python', ['configure.py', '--branch', branch or 'develop', '--develop', '1', '--module', 'server', '--update', '1', '--update-light', '1', '--clean', '0', '--sql-type', 'mysql', '--db-port', '3306', '--db-user', 'root', '--db-pass', 'onlyoffice'] + args)
-    	
-    base.cmd_in_dir('../../', 'python', ['make.py'])
-  
-    run_integration_example()
-  
-    base.create_dir('../../../server/App_Data')
-
-    install_module('../../../server/DocService')
-    install_module('../../../server/Common')
-    install_module('../../../server/FileConverter')
-
-    base.set_env('NODE_ENV', 'development-' + platform)
-    base.set_env('NODE_CONFIG_DIR', '../Common/config')
-
-    if ("mac" == platform):
-      base.set_env('DYLD_LIBRARY_PATH', '../FileConverter/bin/')
-    elif ("linux" == platform):
-      base.set_env('LD_LIBRARY_PATH', '../FileConverter/bin/')
-
-    run_module('../../../server/DocService', ['sources/server.js'])
-#    run_module('../../../server/DocService', ['sources/gc.js'])
-    run_module('../../../server/FileConverter', ['sources/convertermaster.js'])
-#    run_module('../../../server/SpellChecker', ['sources/server.js'])
   except SystemExit:
     input("Ignoring SystemExit. Press Enter to continue...")
     exit(0)

scripts/license_checker/config.json

@@ -181,9 +181,6 @@
 			"startMultiComm": "/*",
 			"endMultiComm": " */",
 			"prefix": " *",
-			"ignoreListDir": [
-				"server/FileConverter/bin"
-			],
 			"ignoreListDirName": [
 				"node_modules"
 			]
@@ -194,9 +191,16 @@
 			"startMultiComm": "/*",
 			"endMultiComm": " */",
 			"prefix": " *",
-			"ignoreListDir": [
-				"server/FileConverter/bin"
-			],
+			"ignoreListDirName": [
+				"node_modules"
+			]
+		},
+		{
+			"dir": "server-license-key",
+			"fileExtensions": [".js"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
 			"ignoreListDirName": [
 				"node_modules"
 			]

scripts/package_builder.py

@@ -17,33 +17,16 @@ def make():
     utils.log("Unsupported host OS")
   return
 
-def aws_s3_upload(files, key, ptype=None):
-  if not files:
-    return False
+def s3_upload(files, dst):
+  if not files: return False
   ret = True
-  key = "builder/" + key
-  for file in files:
-    if not utils.is_file(file):
-      utils.log_err("file not exist: " + file)
-      ret &= False
-      continue
-    args = ["aws"]
-    if hasattr(branding, "s3_endpoint_url"):
-      args += ["--endpoint-url=" + branding.s3_endpoint_url]
-    args += [
-      "s3", "cp", "--no-progress", "--acl", "public-read",
-      "--metadata", "md5=" + utils.get_md5(file),
-      file, "s3://" + branding.s3_bucket + "/" + key
-    ]
-    if common.os_family == "windows":
-      upload = utils.cmd(*args, verbose=True)
-    else:
-      upload = utils.sh(" ".join(args), verbose=True)
+  for f in files:
+    key = dst + utils.get_basename(f) if dst.endswith("/") else dst
+    upload = utils.s3_upload(f, "s3://" + branding.s3_bucket + "/" + key)
+    if upload:
+      utils.add_deploy_data(key)
+      utils.log("URL: " + branding.s3_base_url + "/" + key)
     ret &= upload
-    if upload and ptype is not None:
-      full_key = key
-      if full_key.endswith("/"): full_key += utils.get_basename(file)
-      utils.add_deploy_data("builder", ptype, file, full_key)
   return ret
 
 def make_windows():
@@ -87,7 +70,7 @@ def make_zip():
 
   if common.deploy and ret:
     utils.log_h2("builder zip deploy")
-    ret = aws_s3_upload(["build\\" + zip_file], "win/generic/", "Portable")
+    ret = s3_upload(["build\\" + zip_file], "builder/win/generic/")
     utils.set_summary("builder zip deploy", ret)
   return
 
@@ -116,7 +99,7 @@ def make_inno():
 
   if common.deploy and ret:
     utils.log_h2("builder inno deploy")
-    ret = aws_s3_upload(["build\\" + inno_file], "win/inno/", "Installer")
+    ret = s3_upload(["build\\" + inno_file], "builder/win/inno/")
     utils.set_summary("builder inno deploy", ret)
   return
 
@@ -144,7 +127,7 @@ def make_macos():
 
   if common.deploy and ret:
     utils.log_h2("builder deploy")
-    ret = aws_s3_upload([builder_tar], "mac/", "Portable")
+    ret = s3_upload([builder_tar], "builder/mac/")
     utils.set_summary("builder deploy", ret)
 
   utils.set_cwd(common.workspace_dir)
@@ -162,32 +145,25 @@ def make_linux():
   ret = utils.sh("make clean && make " + " ".join(make_args), verbose=True)
   utils.set_summary("builder build", ret)
 
-  rpm_arch = "x86_64"
-  if common.platform == "linux_aarch64": rpm_arch = "aarch64"
-
   if common.deploy:
-    utils.log_h2("builder deploy")
     if ret:
       if "tar" in branding.builder_make_targets:
         utils.log_h2("builder tar deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("tar/*.tar.gz"),
-            "linux/generic/", "Portable"
-        )
+        ret = s3_upload(
+          utils.glob_path("tar/*.tar.gz"),
+          "builder/linux/generic/")
         utils.set_summary("builder tar deploy", ret)
       if "deb" in branding.builder_make_targets:
         utils.log_h2("builder deb deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("deb/*.deb"),
-            "linux/debian/", "Debian"
-        )
+        ret = s3_upload(
+          utils.glob_path("deb/*.deb"),
+          "builder/linux/debian/")
         utils.set_summary("builder deb deploy", ret)
       if "rpm" in branding.builder_make_targets:
         utils.log_h2("builder rpm deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
-            "linux/rhel/", "CentOS"
-        )
+        ret = s3_upload(
+          utils.glob_path("rpm/builddir/RPMS/*/*.rpm"),
+          "builder/linux/rhel/")
         utils.set_summary("builder rpm deploy", ret)
     else:
       if "tar" in branding.builder_make_targets:

scripts/package_common.py

@@ -1,19 +1,5 @@
 #!/usr/bin/env python
 
-platformTitles = {
-  "windows_x64":      "Windows x64",
-  "windows_x86":      "Windows x86",
-  "windows_x64_xp":   "Windows x64 XP",
-  "windows_x86_xp":   "Windows x86 XP",
-  "darwin_x86_64":    "macOS x86_64",
-  "darwin_arm64":     "macOS arm64",
-  "darwin_x86_64_v8": "macOS x86_64 V8",
-  "linux_x86_64":     "Linux x86_64",
-  "linux_aarch64":    "Linux aarch64",
-  "linux_x86_64_cef": "Linux x86_64 cef107",
-  "android":          "Android",
-}
-
 platformPrefixes = {
   "windows_x64":      "win_64",
   "windows_x86":      "win_32",
@@ -29,35 +15,3 @@ platformPrefixes = {
 
 out_dir = "build_tools/out"
 tsa_server = "http://timestamp.digicert.com"
-vcredist_links = {
-  "2022": {
-    "x64": {
-      "url": "https://aka.ms/vs/17/release/vc_redist.x64.exe",
-      "md5": "077f0abdc2a3881d5c6c774af821f787"
-    },
-    "x86": {
-      "url": "https://aka.ms/vs/17/release/vc_redist.x86.exe",
-      "md5": "ae427c1329c3b211a6d09f8d9506eb74"
-    }
-  },
-  "2015": {
-    "x64": {
-      "url": "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe",
-      "md5": "27b141aacc2777a82bb3fa9f6e5e5c1c"
-    },
-    "x86": {
-      "url": "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe",
-      "md5": "1a15e6606bac9647e7ad3caa543377cf"
-    }
-  },
-  "2013": {
-    "x64": {
-      "url": "https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe",
-      "md5": "96b61b8e069832e6b809f24ea74567ba"
-    },
-    "x86": {
-      "url": "https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe",
-      "md5": "0fc525b6b7b96a87523daa7a0013c69d"
-    }
-  }
-}

scripts/package_core.py

@@ -26,8 +26,8 @@ def make_core():
   repo = repos[common.platform]
   branch = utils.get_env("BRANCH_NAME")
   core_7z = utils.get_path("build_tools/out/%s/%s/core.7z" % (prefix, company))
-  dest_version = "%s/core/%s/%s/%s/" % (repo["repo"], branch, repo["version"], repo["arch"])
-  dest_latest = "%s/core/%s/%s/%s/" % (repo["repo"], branch, "latest", repo["arch"])
+  dest_version = "%s/core/%s/%s/%s" % (repo["repo"], branch, repo["version"], repo["arch"])
+  dest_latest = "%s/core/%s/%s/%s" % (repo["repo"], branch, "latest", repo["arch"])
 
   if branch is None:
     utils.log_err("BRANCH_NAME variable is undefined")
@@ -39,62 +39,40 @@ def make_core():
     return
 
   utils.log_h2("core deploy")
-  args = ["aws", "s3", "cp", "--acl", "public-read", "--no-progress",
-          "--metadata", "md5=" + utils.get_md5(core_7z),
-          core_7z, "s3://" + branding.s3_bucket + "/" + dest_version + "core.7z"]
-  if common.os_family == "windows":
-    ret = utils.cmd(*args, verbose=True)
-  else:
-    ret = utils.sh(" ".join(args), verbose=True)
+  ret = utils.s3_upload(
+    core_7z,
+    "s3://" + branding.s3_bucket + "/" + dest_version + "/core.7z")
   if ret:
-    utils.add_deploy_data("core", "Archive", core_7z, dest_version + "core.7z")
-    args = ["aws", "s3", "sync", "--delete",
-            "--acl", "public-read", "--no-progress",
-            "s3://" + branding.s3_bucket + "/" + dest_version,
-            "s3://" + branding.s3_bucket + "/" + dest_latest]
-    if common.os_family == "windows":
-      ret &= utils.cmd(*args, verbose=True)
-    else:
-      ret &= utils.sh(" ".join(args), verbose=True)
+    utils.log("URL: " + branding.s3_base_url + "/" + dest_version + "/core.7z")
+    utils.add_deploy_data(dest_version + "/core.7z")
+    ret = utils.s3_sync(
+      "s3://" + branding.s3_bucket + "/" + dest_version + "/",
+      "s3://" + branding.s3_bucket + "/" + dest_latest + "/",
+      delete=True)
+    utils.log("URL: " + branding.s3_base_url + "/" + dest_latest + "/core.7z")
   utils.set_summary("core deploy", ret)
   return
 
-def deploy_closure_maps(license):
+def deploy_closuremaps(license):
   if not common.deploy: return
   utils.log_h1("CLOSURE MAPS")
   utils.set_cwd(utils.get_path("sdkjs/build/maps"))
 
-  branch = utils.get_env("BRANCH_NAME")
   maps = utils.glob_path("*.js.map")
-
-  if branch is None:
-    utils.log_err("BRANCH_NAME variable is undefined")
-    utils.set_summary("closure maps " + license + " deploy", False)
-    return
-
   if not maps:
     utils.log_err("files do not exist")
     utils.set_summary("closure maps " + license + " deploy", False)
     return
 
   utils.log_h2("closure maps " + license + " deploy")
-  dest = "closure-maps/%s/%s/%s" % (common.version, common.build, license)
   ret = True
-  for file in maps:
-    args = ["aws"]
-    if hasattr(branding, "s3_endpoint_url"):
-      args += ["--endpoint-url=" + branding.s3_endpoint_url]
-    args += [
-      "s3", "cp", "--no-progress", "--metadata", "md5=" + utils.get_md5(file),
-      file, "s3://" + branding.s3_bucket + "/" + dest + "/"
-    ]
-    if common.os_family == "windows":
-      upload = utils.cmd(*args, verbose=True)
-    else:
-      upload = utils.sh(" ".join(args), verbose=True)
+  for f in maps:
+    key = "closure-maps/%s/%s/%s/%s" % (license, common.version, common.build, f)
+    upload = utils.s3_upload(f, "s3://" + branding.s3_bucket + "/" + key)
     ret &= upload
     if upload:
-      utils.add_deploy_data("core", "Closure maps " + license, file, dest + "/" + file)
+      utils.log("URL: " + branding.s3_base_url + "/" + key)
+      utils.add_deploy_data(key)
   utils.set_summary("closure maps " + license + " deploy", ret)
 
   utils.set_cwd(common.workspace_dir)

scripts/package_desktop.py

@@ -2,10 +2,10 @@
 # -*- coding: utf-8 -*-
 
 import os
+import re
 import package_utils as utils
 import package_common as common
 import package_branding as branding
-import config
 
 def make():
   utils.log_h1("DESKTOP")
@@ -19,33 +19,16 @@ def make():
     utils.log("Unsupported host OS")
   return
 
-def aws_s3_upload(files, key, ptype=None):
-  if not files:
-    return False
+def s3_upload(files, dst):
+  if not files: return False
   ret = True
-  key = "desktop/" + key
-  for file in files:
-    if not utils.is_file(file):
-      utils.log_err("file not exist: " + file)
-      ret &= False
-      continue
-    args = ["aws"]
-    if hasattr(branding, "s3_endpoint_url"):
-      args += ["--endpoint-url=" + branding.s3_endpoint_url]
-    args += [
-      "s3", "cp", "--no-progress", "--acl", "public-read",
-      "--metadata", "md5=" + utils.get_md5(file),
-      file, "s3://" + branding.s3_bucket + "/" + key
-    ]
-    if common.os_family == "windows":
-      upload = utils.cmd(*args, verbose=True)
-    else:
-      upload = utils.sh(" ".join(args), verbose=True)
+  for f in files:
+    key = dst + utils.get_basename(f) if dst.endswith("/") else dst
+    upload = utils.s3_upload(f, "s3://" + branding.s3_bucket + "/" + key)
+    if upload:
+      utils.add_deploy_data(key)
+      utils.log("URL: " + branding.s3_base_url + "/" + key)
     ret &= upload
-    if upload and ptype is not None:
-      full_key = key
-      if full_key.endswith("/"): full_key += utils.get_basename(file)
-      utils.add_deploy_data("desktop", ptype, file, full_key)
   return ret
 
 #
@@ -53,8 +36,8 @@ def aws_s3_upload(files, key, ptype=None):
 #
 
 def make_windows():
-  global package_version, arch_list, source_dir, desktop_dir, viewer_dir, \
-    inno_file, inno_help_file, inno_sa_file, inno_update_file, advinst_file, zip_file
+  global package_version, arch_list, source_dir, branding_dir, desktop_dir, viewer_dir, \
+    inno_file, inno_sa_file, inno_update_file, inno_update_file_new, advinst_file
   utils.set_cwd("desktop-apps\\win-linux\\package\\windows")
 
   package_name = branding.desktop_package_name
@@ -67,12 +50,15 @@ def make_windows():
   }
   suffix = arch_list[common.platform]
   if common.platform.endswith("_xp"): suffix += "-xp"
-  zip_file = "%s-%s-%s.zip" % (package_name, package_version, suffix)
   inno_file = "%s-%s-%s.exe" % (package_name, package_version, suffix)
-  inno_help_file = "%s-Help-%s-%s.exe" % (package_name, package_version, suffix)
   inno_sa_file = "%s-Standalone-%s-%s.exe" % (package_name, package_version, suffix)
   inno_update_file = "update\\editors_update_%s.exe" % suffix.replace("-","_")
+  inno_update_file_new = "%s-Update-%s-%s.exe" % (package_name, package_version, suffix)
   advinst_file = "%s-%s-%s.msi" % (package_name, package_version, suffix)
+  if branding.onlyoffice:
+    branding_dir = "."
+  else:
+    branding_dir = common.workspace_dir + "\\" + common.branding + "\\desktop-apps\\win-linux\\package\\windows"
 
   if common.clean:
     utils.log_h2("desktop clean")
@@ -100,11 +86,7 @@ def make_windows():
 
   make_zip()
 
-  vcdl = True
-  vcdl &= download_vcredist("2013")
-  vcdl &= download_vcredist("2022")
-
-  if not vcdl:
+  if not download_vcredist():
     utils.set_summary("desktop inno build", False)
     utils.set_summary("desktop inno standalone build", False)
     utils.set_summary("desktop inno update build", False)
@@ -126,34 +108,57 @@ def make_windows():
 def make_zip():
   utils.log_h2("desktop zip build")
 
-  args = ["-DesktopPath", desktop_dir, "-OutFile", zip_file]
-  if common.sign:
-    args += ["-Sign", "-CertName", branding.cert_name]
+  args = [
+    "-Target", common.platform,
+    "-BuildDir", "build",
+    "-DesktopDir", branding.desktop_product_name_s
+  ]
+  if not branding.onlyoffice:
+    args += ["-MultimediaDir", branding.viewer_product_name_s]
+    args += ["-BrandingDir", branding_dir]
   if branding.onlyoffice and not common.platform.endswith("_xp"):
     args += ["-ExcludeHelp"]
-  ret = utils.ps1(
-    "make_zip.ps1", args, creates=zip_file, verbose=True
-  )
+  if common.sign:
+    args += ["-Sign", "-CertName", branding.cert_name]
+  ret = utils.ps1("make_zip.ps1", args, verbose=True)
   utils.set_summary("desktop zip build", ret)
 
   if common.deploy and ret:
     utils.log_h2("desktop zip deploy")
-    ret = aws_s3_upload([zip_file], "win/generic/", "Portable")
+    ret = s3_upload(utils.glob_path("*.zip"), "desktop/win/generic/")
     utils.set_summary("desktop zip deploy", ret)
   return
 
-def download_vcredist(year):
-  utils.log_h2("vcredist " + year + " download")
+def download_vcredist():
+  vcredist = {
+    # Microsoft Visual C++ 2015-2022 Redistributable - 14.38.33130
+    "windows_x64": {
+      "url": "https://aka.ms/vs/17/release/vc_redist.x64.exe",
+      "md5": "101b0b9f74cdc6cdbd2570bfe92e302c"
+    },
+    "windows_x86": {
+      "url": "https://aka.ms/vs/17/release/vc_redist.x86.exe",
+      "md5": "0d762264d9765e21c15a58edc43f4706"
+    },
+    # Microsoft Visual C++ 2015-2019 Redistributable - 14.27.29114
+    "windows_x64_xp": {
+      "url": "https://download.visualstudio.microsoft.com/download/pr/722d59e4-0671-477e-b9b1-b8da7d4bd60b/591CBE3A269AFBCC025681B968A29CD191DF3C6204712CBDC9BA1CB632BA6068/VC_redist.x64.exe",
+      "md5": "bc8e3e714b727b3bb18614bd6a51a3d3"
+    },
+    "windows_x86_xp": {
+      "url": "https://download.visualstudio.microsoft.com/download/pr/c168313d-1754-40d4-8928-18632c2e2a71/D305BAA965C9CD1B44EBCD53635EE9ECC6D85B54210E2764C8836F4E9DEFA345/VC_redist.x86.exe",
+      "md5": "ec3bee79a85ae8e3581a8c181b336d1e"
+    }
+  }
+  vcredist_file = "data\\vcredist_%s.exe" % arch_list[common.platform]
 
-  arch = arch_list[common.platform]
-  link = common.vcredist_links[year][arch]["url"]
-  md5 = common.vcredist_links[year][arch]["md5"]
-  vcredist_file = "data\\vcredist\\vcredist_%s_%s.exe" % (year, arch)
-
-  utils.log_h2(vcredist_file)
-  utils.create_dir(utils.get_dirname(vcredist_file))
-  ret = utils.download_file(link, vcredist_file, md5, verbose=True)
-  utils.set_summary("vcredist " + year + " download", ret)
+  utils.log_h2("vcredist download " + vcredist_file)
+  ret = utils.download_file(
+    vcredist[common.platform]["url"],
+    vcredist_file,
+    vcredist[common.platform]["md5"],
+    verbose=True)
+  utils.set_summary("vcredist download", ret)
   return ret
 
 def make_inno():
@@ -189,10 +194,6 @@ def make_inno():
   utils.set_summary("desktop inno build", ret)
 
   if branding.onlyoffice and not common.platform.endswith("_xp"):
-    args = ["iscc"] + iscc_args + ["help.iss"]
-    ret = utils.cmd(*args, creates=inno_help_file, verbose=True)
-    utils.set_summary("desktop inno help build", ret)
-
     args = ["iscc"] + iscc_args + ["/DEMBED_HELP", "/DsPackageEdition=Standalone", "common.iss"]
     ret = utils.cmd(*args, creates=inno_sa_file, verbose=True)
     utils.set_summary("desktop inno standalone build", ret)
@@ -204,31 +205,21 @@ def make_inno():
 
   if common.deploy:
     utils.log_h2("desktop inno deploy")
-    ret = aws_s3_upload([inno_file], "win/inno/","Installer")
+    ret = s3_upload([inno_file], "desktop/win/inno/")
     utils.set_summary("desktop inno deploy", ret)
 
     if branding.onlyoffice and not common.platform.endswith("_xp"):
-      utils.log_h2("desktop inno help deploy")
-      ret = aws_s3_upload([inno_help_file], "win/inno/","Installer")
-      utils.set_summary("desktop inno help deploy", ret)
-
       utils.log_h2("desktop inno standalone deploy")
-      ret = aws_s3_upload([inno_sa_file], "win/inno/","Installer")
+      ret = s3_upload([inno_sa_file], "desktop/win/inno/")
       utils.set_summary("desktop inno standalone deploy", ret)
 
     utils.log_h2("desktop inno update deploy")
     if utils.is_file(inno_update_file):
-      ret = aws_s3_upload(
-        [inno_update_file],
-        "win/inno/%s/%s/" % (common.version, common.build),
-        "Update"
-      )
+      ret = s3_upload(
+        [inno_update_file], "desktop/win/inno/" + inno_update_file_new)
     elif utils.is_file(inno_file):
-      ret = aws_s3_upload(
-        [inno_file],
-        "win/inno/%s/%s/%s" % (common.version, common.build, utils.get_basename(inno_update_file)),
-        "Update"
-      )
+      ret = s3_upload(
+        [inno_file], "desktop/win/inno/" + inno_update_file_new)
     else:
       ret = False
     utils.set_summary("desktop inno update deploy", ret)
@@ -241,63 +232,46 @@ def make_update_files():
 
   if common.deploy and utils.glob_path(changes_dir + "\\*.html"):
     utils.log_h2("desktop update files deploy")
-    ret = aws_s3_upload(
-        utils.glob_path(changes_dir + "\\*.html"),
-        "win/update/%s/%s/" % (common.version, common.build),
-        "Update"
-    )
+    ret = s3_upload(
+      utils.glob_path(changes_dir + "\\*.html"),
+      "desktop/win/update/%s/%s/" % (common.version, common.build))
     utils.set_summary("desktop update files deploy", ret)
   return
 
 def make_advinst():
   utils.log_h2("desktop advinst build")
 
-  arch = arch_list[common.platform]
+  msi_build = {
+    "windows_x64": "MsiBuild64",
+    "windows_x86": "MsiBuild32"
+  }[common.platform]
 
   if not branding.onlyoffice:
-    branding_path = common.workspace_dir + "\\" + common.branding
+    multimedia_dir = common.workspace_dir + "\\" + common.branding + "\\multimedia"
+    utils.copy_file(branding_dir + "\\dictionary.ail", "dictionary.ail")
+    utils.copy_dir_content(branding_dir + "\\data", "data", ".bmp")
+    utils.copy_dir_content(branding_dir + "\\data", "data", ".png")
     utils.copy_dir_content(
-      branding_path + "\\desktop-apps\\win-linux\\package\\windows\\data", "data", ".bmp")
-    utils.copy_dir_content(
-      branding_path + "\\desktop-apps\\win-linux\\package\\windows\\data", "data", ".png")
-    utils.copy_dir_content(
-      branding_path + "\\desktop-apps\\win-linux\\extras\\projicons\\res",
-      "..\\..\\extras\\projicons\\res", ".ico")
+      branding_dir + "\\..\\..\\extras\\projicons\\res",
+      "..\\..\\extras\\projicons\\res",
+      ".ico")
     utils.copy_file(
-      branding_path + "\\desktop-apps\\win-linux\\package\\windows\\dictionary.ail",
-      "dictionary.ail")
-    utils.copy_file(
-      branding_path + "\\desktop-apps\\common\\package\\license\\eula_" + common.branding + ".rtf",
+      branding_dir + "\\..\\..\\..\\common\\package\\license\\eula_" + common.branding + ".rtf",
       "..\\..\\..\\common\\package\\license\\agpl-3.0.rtf")
     utils.copy_file(
-      branding_path + "\\multimedia\\videoplayer\\icons\\" + common.branding + ".ico",
-      "..\\..\\extras\\projicons\\res\\media.ico")
+      multimedia_dir + "\\imageviewer\\icons\\ico\\" + common.branding + ".ico",
+      "..\\..\\extras\\projicons\\res\\icons\\gallery.ico")
     utils.copy_file(
-      branding_path + "\\multimedia\\imageviewer\\icons\\ico\\" + common.branding + ".ico",
-      "..\\..\\extras\\projicons\\res\\gallery.ico")
+      multimedia_dir + "\\videoplayer\\icons\\" + common.branding + ".ico",
+      "..\\..\\extras\\projicons\\res\\icons\\media.ico")
+
+  utils.write_file(desktop_dir + "\\converter\\package.config", "package=msi")
 
   aic_content = [";aic"]
   if not common.sign:
     aic_content += [
       "ResetSig"
     ]
-  if arch == "x64": 
-    aic_content += [
-      "SetPackageType x64 -buildname DefaultBuild",
-      "AddOsLc -buildname DefaultBuild -arch x64",
-      "DelOsLc -buildname DefaultBuild -arch x86",
-      'DelPrerequisite "Microsoft Visual C++ 2015-2022 Redistributable (x86)"',
-      'DelPrerequisite "Microsoft Visual C++ 2013 Redistributable (x86)"'
-    ]
-  if arch == "x86": 
-    aic_content += [
-      "SetPackageType x86 -buildname DefaultBuild",
-      "AddOsLc -arch x86 -buildname DefaultBuild",
-      "DelOsLc -arch x64 -buildname DefaultBuild",
-      "SetAppdir -path [ProgramFilesFolder][MANUFACTURER_INSTALL_FOLDER]\\[PRODUCT_INSTALL_FOLDER] -buildname DefaultBuild",
-      'DelPrerequisite "Microsoft Visual C++ 2015-2022 Redistributable (x64)"',
-      'DelPrerequisite "Microsoft Visual C++ 2013 Redistributable (x64)"'
-    ]
   if branding.onlyoffice:
     for path in utils.glob_path(desktop_dir + "\\editors\\web-apps\\apps\\*\\main\\resources\\help"):
       utils.delete_dir(path)
@@ -305,22 +279,22 @@ def make_advinst():
       "DelFolder CUSTOM_PATH"
     ]
   else:
-    utils.replace_in_file('DesktopEditors.aip','(<ROW Property="UpgradeCode" Value=")(.*)("/>)', r'\1%s\3' % (branding.desktop_upgrade_code))
     aic_content += [
+      "SetProperty UpgradeCode=\"" + branding.desktop_upgrade_code + "\"",
       "AddUpgradeCode {47EEF706-B0E4-4C43-944B-E5F914B92B79} \
         -min_ver 7.1.1 -include_min_ver \
         -max_ver 7.2.2 -include_max_ver \
         -include_lang 1049 \
         -property_name UPGRADE_2 -enable_migrate",
-      "DelLanguage 1029 -buildname DefaultBuild",
-      "DelLanguage 1031 -buildname DefaultBuild",
-      "DelLanguage 1041 -buildname DefaultBuild",
-      "DelLanguage 1046 -buildname DefaultBuild",
-      "DelLanguage 2070 -buildname DefaultBuild",
-      "DelLanguage 1060 -buildname DefaultBuild",
-      "DelLanguage 1036 -buildname DefaultBuild",
-      "DelLanguage 3082 -buildname DefaultBuild",
-      "DelLanguage 1033 -buildname DefaultBuild",
+      "DelLanguage 1029 -buildname " + msi_build,
+      "DelLanguage 1031 -buildname " + msi_build,
+      "DelLanguage 1041 -buildname " + msi_build,
+      "DelLanguage 1046 -buildname " + msi_build,
+      "DelLanguage 2070 -buildname " + msi_build,
+      "DelLanguage 1060 -buildname " + msi_build,
+      "DelLanguage 1036 -buildname " + msi_build,
+      "DelLanguage 3082 -buildname " + msi_build,
+      "DelLanguage 1033 -buildname " + msi_build,
       "SetCurrentFeature ExtendedFeature",
       "NewSync CUSTOM_PATH " + viewer_dir,
       "UpdateFile CUSTOM_PATH\\ImageViewer.exe " + viewer_dir + "\\ImageViewer.exe",
@@ -328,14 +302,29 @@ def make_advinst():
       "SetProperty ProductName=\"" + branding.desktop_product_name_full + "\"",
       "SetProperty ASCC_REG_PREFIX=" + branding.ascc_reg_prefix
     ]
+    if common.platform == "windows_x86":
+      aic_content += [
+        "SetComponentAttribute -feature_name ExtendedFeature -unset -64bit_component"
+      ]
+  if common.platform == "windows_x86":
+    aic_content += [
+      "SetComponentAttribute -feature_name MainFeature -unset -64bit_component",
+      "SetComponentAttribute -feature_name FileProgIds -unset -64bit_component",
+      "SetComponentAttribute -feature_name FileOpenWith -unset -64bit_component",
+      "SetComponentAttribute -feature_name FileProgramCapatibilities -unset -64bit_component",
+      "SetComponentAttribute -feature_name FileTypeAssociations -unset -64bit_component",
+      "SetComponentAttribute -feature_name FileNewTemplates -unset -64bit_component"
+    ]
   aic_content += [
     "SetCurrentFeature MainFeature",
     "NewSync APPDIR " + desktop_dir,
     "UpdateFile APPDIR\\DesktopEditors.exe " + desktop_dir + "\\DesktopEditors.exe",
     "UpdateFile APPDIR\\updatesvc.exe " + desktop_dir + "\\updatesvc.exe",
+    "SetProperty VERSION=\"" + package_version + "\"",
+    "SetProperty VERSION_SHORT=\"" + re.sub(r"^(\d+\.\d+).+", "\\1", package_version) + "\"",
     "SetVersion " + package_version,
-    "SetPackageName " + advinst_file + " -buildname DefaultBuild",
-    "Rebuild -buildslist DefaultBuild"
+    "SetPackageName " + advinst_file + " -buildname " + msi_build,
+    "Rebuild -buildslist " + msi_build
   ]
   utils.write_file("DesktopEditors.aic", "\r\n".join(aic_content), "utf-8-sig")
   ret = utils.cmd("AdvancedInstaller.com", "/execute", \
@@ -344,7 +333,7 @@ def make_advinst():
 
   if common.deploy and ret:
     utils.log_h2("desktop advinst deploy")
-    ret = aws_s3_upload([advinst_file], "win/advinst/", "Installer")
+    ret = s3_upload([advinst_file], "desktop/win/advinst/")
     utils.set_summary("desktop advinst deploy", ret)
   return
 
@@ -354,7 +343,7 @@ def make_advinst():
 
 def make_macos():
   global package_name, build_dir, branding_dir, updates_dir, changes_dir, \
-    suffix, lane, scheme, app_version
+    suffix, lane, scheme, released_updates_dir
   package_name = branding.desktop_package_name
   build_dir = branding.desktop_build_dir
   branding_dir = branding.desktop_branding_dir
@@ -367,6 +356,7 @@ def make_macos():
   }[common.platform]
   lane = "release_" + suffix
   scheme = package_name + "-" + suffix
+  sparkle_updates = False
 
   utils.set_cwd(branding_dir)
 
@@ -375,6 +365,7 @@ def make_macos():
     utils.delete_dir(utils.get_env("HOME") + "/Library/Developer/Xcode/Archives")
     utils.delete_dir(utils.get_env("HOME") + "/Library/Caches/Sparkle_generate_appcast")
 
+  utils.log_h2("build")
   source_dir = "%s/build_tools/out/%s/%s" \
     % (common.workspace_dir, common.prefix, branding.company_name)
   if branding.onlyoffice:
@@ -382,32 +373,40 @@ def make_macos():
         + "/desktopeditors/editors/web-apps/apps/*/main/resources/help"):
       utils.delete_dir(path)
 
-  appcast_url = branding.sparkle_base_url + "/" + suffix + "/" + branding.desktop_package_name.lower() + ".xml"
-  release_bundle_version_string = utils.sh_output(
-    'curl -Ls ' + appcast_url + ' 2> /dev/null' \
-    + ' | xmllint --xpath "/rss/channel/item[1]/enclosure/@*[name()=\'sparkle:shortVersionString\']" -' \
-    + ' | cut -f2 -d\\\"',
-    verbose=True).rstrip()
-  release_bundle_version = utils.sh_output(
-    'curl -Ls ' + appcast_url + ' 2> /dev/null' \
-    + ' | xmllint --xpath "/rss/channel/item[1]/enclosure/@*[name()=\'sparkle:version\']" -' \
-    + ' | cut -f2 -d\\\"',
-    verbose=True).rstrip()
+  if utils.get_env("ARCHIVES_DIR"):
+    sparkle_updates = True
+    released_updates_dir = "%s/%s/_updates" % (utils.get_env("ARCHIVES_DIR"), scheme)
+    plistbuddy = "/usr/libexec/PlistBuddy"
+    plist_path = "%s/%s/ONLYOFFICE/Resources/%s-%s/Info.plist" \
+        % (common.workspace_dir, branding_dir, package_name, suffix)
 
-  app_version = common.version
-  bundle_version = str(int(release_bundle_version) + 1)
-  plist_path = "%s/%s/ONLYOFFICE/Resources/%s-%s/Info.plist" \
-      % (common.workspace_dir, branding.desktop_branding_dir, branding.desktop_package_name, suffix)
-  utils.sh('/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString %s" %s' \
-      % (common.version, plist_path), verbose=True)
-  utils.sh('/usr/libexec/PlistBuddy -c "Set :CFBundleVersion %s" %s' \
-      % (bundle_version, plist_path), verbose=True)
+    appcast = utils.sh_output('%s -c "Print :SUFeedURL" %s' \
+        % (plistbuddy, plist_path), verbose=True).rstrip()
+    appcast = released_updates_dir + "/" + appcast[appcast.rfind("/")+1:]
 
-  utils.log("RELEASE=" + release_bundle_version_string + "(" + release_bundle_version + ")" \
-        + "\nCURRENT=" + common.version + "(" + bundle_version + ")")
+    release_version_string = utils.sh_output(
+        'xmllint --xpath "/rss/channel/item[1]/*[name()=\'sparkle:shortVersionString\']/text()" ' + appcast,
+        verbose=True).rstrip()
+    release_version = utils.sh_output(
+        'xmllint --xpath "/rss/channel/item[1]/*[name()=\'sparkle:version\']/text()" ' + appcast,
+        verbose=True).rstrip()
+    bundle_version = str(int(release_version) + 1)
+    help_url = "https://download.onlyoffice.com/install/desktop/editors/help/v" + common.version + "/apps"
+
+    utils.sh('%s -c "Set :CFBundleShortVersionString %s" %s' \
+        % (plistbuddy, common.version, plist_path), verbose=True)
+    utils.sh('%s -c "Set :CFBundleVersion %s" %s' \
+        % (plistbuddy, bundle_version, plist_path), verbose=True)
+    utils.sh('%s -c "Set :ASCBundleBuildNumber %s" %s' \
+        % (plistbuddy, common.build, plist_path), verbose=True)
+    utils.sh('%s -c "Add :ASCWebappsHelpUrl string %s" %s' \
+        % (plistbuddy, help_url, plist_path), verbose=True)
+
+    utils.log("RELEASE=" + release_version_string + "(" + release_version + ")" \
+          + "\nCURRENT=" + common.version + "(" + bundle_version + ")")
 
   dmg = make_dmg()
-  if dmg:
+  if dmg and sparkle_updates:
     make_sparkle_updates()
 
   utils.set_cwd(common.workspace_dir)
@@ -425,33 +424,28 @@ def make_dmg():
 
   if common.deploy and dmg:
     utils.log_h2("desktop dmg deploy")
-    ret = aws_s3_upload(
-        utils.glob_path("build/*.dmg"),
-        "mac/%s/%s/%s/" % (common.version, common.build, suffix),
-        "Disk Image"
-    )
+    ret = s3_upload(
+      utils.glob_path("build/*.dmg"),
+      "desktop/mac/%s/%s/%s/" % (suffix, common.version, common.build))
     utils.set_summary("desktop dmg deploy", ret)
 
     utils.log_h2("desktop zip deploy")
-    ret = aws_s3_upload(
-        ["build/%s-%s.zip" % (scheme, app_version)],
-        "mac/%s/%s/%s/" % (common.version, common.build, suffix),
-        "Archive"
-    )
+    ret = s3_upload(
+      ["build/%s-%s.zip" % (scheme, common.version)],
+      "desktop/mac/%s/%s/%s/" % (suffix, common.version, common.build))
     utils.set_summary("desktop zip deploy", ret)
   return dmg
 
 def make_sparkle_updates():
   utils.log_h2("desktop sparkle files build")
 
-  zip_filename = scheme + '-' + app_version
+  zip_filename = scheme + '-' + common.version
   macos_zip = "build/" + zip_filename + ".zip"
-  updates_storage_dir = "%s/%s/_updates" % (utils.get_env('ARCHIVES_DIR'), scheme)
   utils.create_dir(updates_dir)
   utils.copy_file(macos_zip, updates_dir)
-  utils.copy_dir_content(updates_storage_dir, updates_dir, ".zip")
+  utils.copy_dir_content(released_updates_dir, updates_dir, ".zip")
 
-  for file in utils.glob_path(changes_dir + "/" + app_version + "/*.html"):
+  for file in utils.glob_path(changes_dir + "/" + common.version + "/*.html"):
     filename = utils.get_basename(file).replace("changes", zip_filename)
     utils.copy_file(file, updates_dir + "/" + filename)
 
@@ -466,19 +460,6 @@ def make_sparkle_updates():
   )
   utils.set_summary("desktop sparkle files build", ret)
 
-  # utils.log_h3("edit sparkle appcast links")
-  # appcast_url = branding.sparkle_base_url + "/" + suffix
-  # appcast = "%s/%s.xml" % (updates_dir, package_name.lower())
-  # for lang, base in update_changes_list.items():
-  #   if base == "ReleaseNotes":
-  #     utils.replace_in_file(appcast,
-  #         r'(<sparkle:releaseNotesLink>.+/).+(\.html</sparkle:releaseNotesLink>)',
-  #         "\\1" + base + "\\2")
-  #   else:
-  #     utils.replace_in_file(appcast,
-  #         r'(<sparkle:releaseNotesLink xml:lang="' + lang + r'">).+(\.html</sparkle:releaseNotesLink>)',
-  #         "\\1" + base + "\\2")
-
   utils.log("")
   utils.log_h3("generate checksums")
   utils.sh(
@@ -492,22 +473,12 @@ def make_sparkle_updates():
 
   if common.deploy:
     utils.log_h2("desktop sparkle files deploy")
-    ret = aws_s3_upload(
-        utils.glob_path("build/update/*.delta") \
-        + utils.glob_path("build/update/*.xml") \
-        + utils.glob_path("build/update/*.html"),
-        "mac/%s/%s/%s/" % (common.version, common.build, suffix),
-        "Sparkle"
-    )
+    ret = s3_upload(
+      utils.glob_path("build/update/*.delta") \
+      + utils.glob_path("build/update/*.xml") \
+      + utils.glob_path("build/update/*.html"),
+      "desktop/mac/%s/%s/%s/" % (suffix, common.version, common.build))
     utils.set_summary("desktop sparkle files deploy", ret)
-
-    utils.log_h2("desktop checksums deploy")
-    ret = aws_s3_upload(
-        utils.glob_path("build/update/*.txt"),
-        "mac/%s/%s/%s/" % (common.version, common.build, suffix),
-        "Checksums"
-    )
-    utils.set_summary("desktop checksums deploy", ret)
   return
 
 #
@@ -526,64 +497,52 @@ def make_linux():
   ret = utils.sh("make clean && make " + " ".join(make_args), verbose=True)
   utils.set_summary("desktop build", ret)
 
-  rpm_arch = "x86_64"
+  rpm_arch = "*"
   if common.platform == "linux_aarch64": rpm_arch = "aarch64"
 
   if common.deploy:
-    utils.log_h2("desktop deploy")
     if ret:
       utils.log_h2("desktop tar deploy")
       if "tar" in branding.desktop_make_targets:
-        ret = aws_s3_upload(
-            utils.glob_path("tar/*.tar*"),
-            "linux/generic/", "Portable"
-        )
+        ret = s3_upload(
+          utils.glob_path("tar/*.tar*"),
+          "desktop/linux/generic/")
         utils.set_summary("desktop tar deploy", ret)
       if "deb" in branding.desktop_make_targets:
         utils.log_h2("desktop deb deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("deb/*.deb"),
-            "linux/debian/", "Debian"
-        )
+        ret = s3_upload(
+          utils.glob_path("deb/*.deb"),
+          "desktop/linux/debian/")
         utils.set_summary("desktop deb deploy", ret)
       if "deb-astra" in branding.desktop_make_targets:
         utils.log_h2("desktop deb-astra deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("deb-astra/*.deb"),
-            "linux/astra/", "Astra Linux Special Edition"
-        )
+        ret = s3_upload(
+          utils.glob_path("deb-astra/*.deb"),
+          "desktop/linux/astra/")
         utils.set_summary("desktop deb-astra deploy", ret)
       if "rpm" in branding.desktop_make_targets:
         utils.log_h2("desktop rpm deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") \
-            + utils.glob_path("rpm/builddir/RPMS/noarch/*.rpm"),
-            "linux/rhel/", "CentOS"
-        )
+        ret = s3_upload(
+          utils.glob_path("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
+          "desktop/linux/rhel/")
         utils.set_summary("desktop rpm deploy", ret)
       if "suse-rpm" in branding.desktop_make_targets:
         utils.log_h2("desktop suse-rpm deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("suse-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") \
-            + utils.glob_path("suse-rpm/builddir/RPMS/noarch/*.rpm"),
-            "linux/suse/", "SUSE Linux"
-        )
+        ret = s3_upload(
+          utils.glob_path("suse-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
+          "desktop/linux/suse/")
         utils.set_summary("desktop suse-rpm deploy", ret)
       if "apt-rpm" in branding.desktop_make_targets:
         utils.log_h2("desktop apt-rpm deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("apt-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") \
-            + utils.glob_path("apt-rpm/builddir/RPMS/noarch/*.rpm"),
-            "linux/altlinux/", "ALT Linux"
-        )
+        ret = s3_upload(
+          utils.glob_path("apt-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
+          "desktop/linux/altlinux/")
         utils.set_summary("desktop apt-rpm deploy", ret)
       if "urpmi" in branding.desktop_make_targets:
         utils.log_h2("desktop urpmi deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("urpmi/builddir/RPMS/" + rpm_arch + "/*.rpm") \
-            + utils.glob_path("urpmi/builddir/RPMS/noarch/*.rpm"),
-            "linux/rosa/", "ROSA"
-        )
+        ret = s3_upload(
+          utils.glob_path("urpmi/builddir/RPMS/" + rpm_arch + "/*.rpm"),
+          "desktop/linux/rosa/")
         utils.set_summary("desktop urpmi deploy", ret)
     else:
       if "tar" in branding.desktop_make_targets:

scripts/package_mobile.py

@@ -15,31 +15,24 @@ def make():
 def make_mobile():
   utils.set_cwd("build_tools/out")
 
+  zip_file = "build-" + common.version + "-" + common.build + ".zip"
+
   if common.clean:
     utils.log_h2("mobile clean")
     utils.sh("rm -rfv *.zip", verbose=True)
 
-  zip_file = "build-" + common.version + "-" + common.build + ".zip"
-  s3_key = "mobile/android/" + zip_file
-
   utils.log_h2("mobile build")
   ret = utils.sh("zip -r " + zip_file + " ./android* ./js", verbose=True)
   utils.set_summary("mobile build", ret)
 
   if common.deploy:
-    utils.log_h2("mobile deploy")
-    if not utils.is_file(zip_file):
-      utils.log_err("file not exist: " + zip_file)
-      ret = False
-    elif ret:
-      ret = utils.sh(
-          "aws s3 cp --acl public-read --no-progress " \
-          + "--metadata md5=" + utils.get_md5(zip_file) + " " \
-          + zip_file + " s3://" + branding.s3_bucket + "/" + s3_key,
-          verbose=True
-      )
     if ret:
-      utils.add_deploy_data("mobile", "Android", zip_file, s3_key)
+      utils.log_h2("mobile deploy")
+      key = "mobile/android/" + zip_file
+      ret = utils.s3_upload(zip_file, "s3://" + branding.s3_bucket + "/" + key)
+      if ret:
+        utils.add_deploy_data(key)
+        utils.log("URL: " + branding.s3_base_url + "/" + key)
     utils.set_summary("mobile deploy", ret)
 
   utils.set_cwd(common.workspace_dir)

scripts/package_server.py

@@ -14,33 +14,16 @@ def make(edition):
     utils.log("Unsupported host OS")
   return
 
-def aws_s3_upload(files, key, edition, ptype=None):
-  if not files:
-    return False
+def s3_upload(files, dst):
+  if not files: return False
   ret = True
-  key = "server/" + key
-  for file in files:
-    if not utils.is_file(file):
-      utils.log_err("file not exist: " + file)
-      ret &= False
-      continue
-    args = ["aws"]
-    if hasattr(branding, "s3_endpoint_url"):
-      args += ["--endpoint-url=" + branding.s3_endpoint_url]
-    args += [
-      "s3", "cp", "--no-progress", "--acl", "public-read",
-      "--metadata", "md5=" + utils.get_md5(file),
-      file, "s3://" + branding.s3_bucket + "/" + key
-    ]
-    if common.os_family == "windows":
-      upload = utils.cmd(*args, verbose=True)
-    else:
-      upload = utils.sh(" ".join(args), verbose=True)
+  for f in files:
+    key = dst + utils.get_basename(f) if dst.endswith("/") else dst
+    upload = utils.s3_upload(f, "s3://" + branding.s3_bucket + "/" + key)
+    if upload:
+      utils.add_deploy_data(key)
+      utils.log("URL: " + branding.s3_base_url + "/" + key)
     ret &= upload
-    if upload and ptype is not None:
-      full_key = key
-      if full_key.endswith("/"): full_key += utils.get_basename(file)
-      utils.add_deploy_data("server_" + edition, ptype, file, full_key)
   return ret
 
 def make_windows(edition):
@@ -62,10 +45,7 @@ def make_windows(edition):
 
   if common.deploy and ret:
     utils.log_h2("server " + edition + " inno deploy")
-    ret = aws_s3_upload(
-        utils.glob_path("exe/*.exe"),
-        "win/inno/", edition, "Installer"
-    )
+    ret = s3_upload(utils.glob_path("exe/*.exe"), "server/win/inno/")
     utils.set_summary("server " + edition + " inno deploy", ret)
 
   utils.set_cwd(common.workspace_dir)
@@ -89,39 +69,31 @@ def make_linux(edition):
   ret = utils.sh("make clean && make " + " ".join(make_args), verbose=True)
   utils.set_summary("server " + edition + " build", ret)
 
-  rpm_arch = "x86_64"
-  if common.platform == "linux_aarch64": rpm_arch = "aarch64"
-
   if common.deploy:
-    utils.log_h2("server " + edition + " deploy")
     if ret:
       if "deb" in branding.server_make_targets:
         utils.log_h2("server " + edition + " deb deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("deb/*.deb"),
-            "linux/debian/", edition, "Debian"
-        )
+        ret = s3_upload(
+          utils.glob_path("deb/*.deb"),
+          "server/linux/debian/")
         utils.set_summary("server " + edition + " deb deploy", ret)
       if "rpm" in branding.server_make_targets:
         utils.log_h2("server " + edition + " rpm deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
-            "linux/rhel/", edition, "CentOS"
-        )
+        ret = s3_upload(
+          utils.glob_path("rpm/builddir/RPMS/*/*.rpm"),
+          "server/linux/rhel/")
         utils.set_summary("server " + edition + " rpm deploy", ret)
       if "apt-rpm" in branding.server_make_targets:
         utils.log_h2("server " + edition + " apt-rpm deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("apt-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
-            "linux/altlinux/", edition, "ALT Linux"
-        )
+        ret = s3_upload(
+          utils.glob_path("apt-rpm/builddir/RPMS/*/*.rpm"),
+          "server/linux/altlinux/")
         utils.set_summary("server " + edition + " apt-rpm deploy", ret)
       if "tar" in branding.server_make_targets:
         utils.log_h2("server " + edition + " snap deploy")
-        ret = aws_s3_upload(
-            utils.glob_path("*.tar.gz"),
-            "linux/generic/", edition, "Snap"
-        )
+        ret = s3_upload(
+          utils.glob_path("*.tar.gz"),
+          "server/linux/snap/")
         utils.set_summary("server " + edition + " snap deploy", ret)
     else:
       if "deb" in branding.server_make_targets:

scripts/package_utils.py

@@ -4,7 +4,6 @@
 import codecs
 import glob
 import hashlib
-import json
 import os
 import platform
 import re
@@ -13,6 +12,7 @@ import subprocess
 import sys
 import time
 import package_common as common
+import base
 
 def host_platform():
   return platform.system().lower()
@@ -107,11 +107,25 @@ def glob_file(path):
     return glob.glob(path)[0]
   return
 
-def get_md5(path):
+def get_hash_sha256(path):
   if os.path.exists(path):
-    md5_hash = hashlib.md5()
-    md5_hash.update(open(path, "rb").read())
-    return md5_hash.hexdigest()
+    h = hashlib.sha256()
+    h.update(open(path, "rb").read())
+    return h.hexdigest()
+  return
+
+def get_hash_sha1(path):
+  if os.path.exists(path):
+    h = hashlib.sha1()
+    h.update(open(path, "rb").read())
+    return h.hexdigest()
+  return
+
+def get_hash_md5(path):
+  if os.path.exists(path):
+    h = hashlib.md5()
+    h.update(open(path, "rb").read())
+    return h.hexdigest()
   return
 
 def create_dir(path, verbose=True):
@@ -158,7 +172,7 @@ def copy_file(src, dst, verbose=True):
     log("    src: " + src)
     log("    dst: " + dst)
   if is_file(dst):
-    delete_file(dst)
+    delete_file(dst, False)
   if not is_file(src):
     log_err("file not exist: " + src)
     return
@@ -191,12 +205,7 @@ def copy_dir(src, dst, override=True, verbose=True):
     log("    src: " + src)
     log("    dst: " + dst)
     log("    override: " + str(override))
-  if is_dir(dst):
-    delete_dir(dst)
-  try:
-    shutil.copytree(get_path(src), get_path(dst))    
-  except OSError as e:
-    log_err('directory not copied. Error: %s' % e)
+  base.copy_dir(src, dst)
   return
 
 def copy_dir_content(src, dst, filter_include = "", filter_exclude = "", verbose=True):
@@ -258,18 +267,9 @@ def set_summary(target, status):
   common.summary.append({target: status})
   return
 
-def add_deploy_data(product, ptype, src, dst):
-  common.deploy_data.append({
-    "platform": common.platformTitles[common.platform],
-    "product": product,
-    "type": ptype,
-    # "local": get_path(src),
-    "size": get_file_size(get_path(src)),
-    "key": dst
-  })
-  file = open(get_path(common.workspace_dir + "/deploy.json"), 'w')
-  file.write(json.dumps(common.deploy_data, sort_keys=True, indent=4))
-  file.close()
+def add_deploy_data(key):
+  with open(common.deploy_data, 'a+') as f:
+    f.write(key + "\n")
   return
 
 def cmd(*args, **kwargs):
@@ -285,12 +285,12 @@ def cmd(*args, **kwargs):
     return False
   if kwargs.get("chdir") and is_dir(kwargs["chdir"]):
     oldcwd = get_cwd()
-    set_cwd(kwargs["chdir"])
+    set_cwd(kwargs["chdir"], verbose=False)
   ret = subprocess.call(
       [i for i in args], stderr=subprocess.STDOUT, shell=True
   ) == 0
   if kwargs.get("chdir") and oldcwd:
-    set_cwd(oldcwd)
+    set_cwd(oldcwd, verbose=False)
   return ret
 
 def cmd_output(*args, **kwargs):
@@ -334,7 +334,7 @@ def download_file(url, path, md5, verbose=False):
     log("    path: " + url)
     log("    md5: " + md5)
   if is_file(path):
-    if get_md5(path) == md5:
+    if get_hash_md5(path) == md5:
       log_err("file already exist (match checksum)")
       return True
     else:
@@ -344,7 +344,7 @@ def download_file(url, path, md5, verbose=False):
       "(New-Object System.Net.WebClient).DownloadFile('%s','%s')" % (url, path),
       verbose=True
   )
-  md5_new = get_md5(path)
+  md5_new = get_hash_md5(path)
   if md5 != md5_new:
     log_err("checksum didn't match (%s != %s)" % (md5, md5_new))
     return False
@@ -363,18 +363,63 @@ def sh(command, **kwargs):
     return False
   if kwargs.get("chdir") and is_dir(kwargs["chdir"]):
     oldcwd = get_cwd()
-    set_cwd(kwargs["chdir"])
+    set_cwd(kwargs["chdir"], verbose=False)
   ret = subprocess.call(
       command, stderr=subprocess.STDOUT, shell=True
   ) == 0
   if kwargs.get("chdir") and oldcwd:
-    set_cwd(oldcwd)
+    set_cwd(oldcwd, verbose=False)
   return ret
 
 def sh_output(command, **kwargs):
   if kwargs.get("verbose"):
     log("- sh_output:")
     log("    command: " + command)
-  return subprocess.check_output(
+    if kwargs.get("chdir"):
+      log("    chdir: " + kwargs["chdir"])
+  if kwargs.get("chdir") and is_dir(kwargs["chdir"]):
+    oldcwd = get_cwd()
+    set_cwd(kwargs["chdir"], verbose=False)
+  ret = subprocess.check_output(
       command, stderr=subprocess.STDOUT, shell=True
   ).decode("utf-8")
+  log(ret)
+  if kwargs.get("chdir") and oldcwd:
+    set_cwd(oldcwd, verbose=False)
+  return ret
+
+def s3_upload(src, dst, **kwargs):
+  if not is_file(src):
+    log_err("file not exist: " + src)
+    return False
+  metadata = "sha256=" + get_hash_sha256(src) \
+          + ",sha1=" + get_hash_sha1(src) \
+          + ",md5=" + get_hash_md5(src)
+  args = ["aws"]
+  if kwargs.get("endpoint_url"):
+    args += ["--endpoint-url", kwargs["endpoint_url"]]
+  args += ["s3", "cp", "--no-progress"]
+  if kwargs.get("acl"):
+    args += ["--acl", kwargs["acl"]]
+  args += ["--metadata", metadata, src, dst]
+  if is_windows():
+    ret = cmd(*args, verbose=True)
+  else:
+    ret = sh(" ".join(args), verbose=True)
+  return ret
+
+def s3_sync(src, dst, **kwargs):
+  args = ["aws"]
+  if kwargs.get("endpoint_url"):
+    args += ["--endpoint-url", kwargs["endpoint_url"]]
+  args += ["s3", "sync", "--no-progress"]
+  if kwargs.get("acl"):
+    args += ["--acl", kwargs["acl"]]
+  if kwargs.get("delete") and kwargs["delete"]:
+    args += ["--delete"]
+  args += [src, dst]
+  if is_windows():
+    ret = cmd(*args, verbose=True)
+  else:
+    ret = sh(" ".join(args), verbose=True)
+  return ret

tools/common/convert_directory_test.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append('../../scripts')
+import base
+import os
+import glob
+import convert_common
+
+params = sys.argv[1:]
+
+if (5 > len(params)):
+  print("use: convert_directory.py path_to_builder_directory path_to_sdkjs_directory editor_type path_to_input_files_directory path_to_output_files_directory")
+  exit(0)
+
+cur_path = os.getcwd()
+base.configure_common_apps()
+
+directory_x2t = params[0].replace("\\", "/")
+directory_sdkjs = params[1].replace("\\", "/")
+editor_type = params[2].replace("\\", "/")
+directory_input = params[3].replace("\\", "/")
+directory_output = params[4].replace("\\", "/")
+
+input_files = [os.path.join(dirpath, f)
+    for dirpath, dirnames, files in os.walk(directory_input)
+    for f in files]
+
+output_len = len(input_files)
+output_cur = 1
+for input_file in input_files:
+  print("process [" + str(output_cur) + " of " + str(output_len) + "]: " + str(input_file.encode("utf-8")))
+  output_file = os.path.join(directory_output, os.path.basename(input_file))
+  base.cmd_in_dir(directory_x2t, "test", [directory_sdkjs, editor_type, input_file, output_file], True)
+  output_cur += 1

tools/mac/toolchain.prf

@@ -0,0 +1,445 @@
+defineTest(qtToolchainError) {
+    msg = \
+        $$1 \
+        "===================" \
+        $$2 \
+        "===================" \
+        $$3
+    error($$join(msg, $$escape_expand(\\n)))
+}
+
+defineTest(qtCompilerError) {
+    !cross_compile: \
+        what =
+    else: host_build: \
+        what = " host"
+    else: \
+        what = " target"
+    qtToolchainError("Cannot run$$what compiler '$$1'. Output:", $$2, \
+                     "Maybe you forgot to setup the environment?")
+}
+
+cross_compile:host_build: \
+    target_prefix = QMAKE_HOST_CXX
+else: \
+    target_prefix = QMAKE_CXX
+
+#
+# Determine and cache the compiler version
+#
+
+defineReplace(qtVariablesFromMSVC) {
+    ret = $$system("$$1 -nologo -E $$2 $$system_quote($$PWD/data/macros.cpp) 2>NUL", lines, ec)
+    !equals(ec, 0): qtCompilerError($$1, $$ret)
+    return($$ret)
+}
+
+defineReplace(qtVariablesFromGCC) {
+    ret = $$system("$$1 -E $$system_quote($$PWD/data/macros.cpp) \
+        2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec)
+    !equals(ec, 0): qtCompilerError($$1, $$ret)
+    return($$ret)
+}
+
+isEmpty($${target_prefix}.COMPILER_MACROS) {
+    msvc {
+        clang_cl {
+            # We need to obtain the cl.exe version first
+            vars = $$qtVariablesFromMSVC(cl)
+            for (v, vars) {
+                isEmpty(v)|contains(v, $${LITERAL_HASH}.*): next()
+                eval($$v)
+            }
+            isEmpty(QMAKE_MSC_FULL_VER): error("Could not determine the Visual Studio version")
+
+            QMAKE_CFLAGS_MSVC_COMPAT = $$replace(QMAKE_MSC_FULL_VER, "(..)(..)(.*)", \
+                                                 "-fms-compatibility-version=\\1.\\2.\\3")
+            cache($${target_prefix}.QMAKE_CFLAGS_MSVC_COMPAT, set stash, QMAKE_CFLAGS_MSVC_COMPAT)
+            $${target_prefix}.COMPILER_MACROS += QMAKE_CFLAGS_MSVC_COMPAT
+            vars = $$qtVariablesFromMSVC($$QMAKE_CXX, $$QMAKE_CFLAGS_MSVC_COMPAT)
+        } else {
+            vars = $$qtVariablesFromMSVC($$QMAKE_CXX)
+        }
+    } else: gcc|ghs {
+        vars = $$qtVariablesFromGCC($$QMAKE_CXX)
+    }
+    for (v, vars) {
+        !contains(v, "[A-Z_]+ = .*"): next()
+        # Set both <varname> for the outer scope ...
+        eval($$v)
+        v ~= s/ .*//
+        isEmpty($$v): error("Compiler produced empty value for $${v}.")
+        # ... and save QMAKE_(HOST_)?CXX.<varname> in the cache.
+        cache($${target_prefix}.$$v, set stash, $$v)
+        $${target_prefix}.COMPILER_MACROS += $$v
+    }
+    cache($${target_prefix}.COMPILER_MACROS, set stash)
+} else {
+    # load from the cache
+    for (i, $${target_prefix}.COMPILER_MACROS): \
+        $$i = $$eval($${target_prefix}.$$i)
+}
+
+# Populate QMAKE_COMPILER_DEFINES and some compatibility variables.
+# The $$format_number() calls strip leading zeros to avoid misinterpretation as octal.
+QMAKE_COMPILER_DEFINES += __cplusplus=$$QT_COMPILER_STDCXX
+!isEmpty(QMAKE_MSC_VER): \
+    QMAKE_COMPILER_DEFINES += _MSC_VER=$$QMAKE_MSC_VER _MSC_FULL_VER=$$QMAKE_MSC_FULL_VER
+!isEmpty(QMAKE_ICC_VER): \
+    QMAKE_COMPILER_DEFINES += __INTEL_COMPILER=$$QMAKE_ICC_VER __INTEL_COMPILER_UPDATE=$$QMAKE_ICC_UPDATE_VER
+!isEmpty(QMAKE_APPLE_CC): \
+    QMAKE_COMPILER_DEFINES += __APPLE_CC__=$$QMAKE_APPLE_CC
+!isEmpty(QMAKE_APPLE_CLANG_MAJOR_VERSION): \
+    QMAKE_COMPILER_DEFINES += __clang__ \
+        __clang_major__=$$QMAKE_APPLE_CLANG_MAJOR_VERSION \
+        __clang_minor__=$$QMAKE_APPLE_CLANG_MINOR_VERSION \
+        __clang_patchlevel__=$$QMAKE_APPLE_CLANG_PATCH_VERSION
+!isEmpty(QMAKE_CLANG_MAJOR_VERSION): \
+    QMAKE_COMPILER_DEFINES += __clang__ \
+        __clang_major__=$$QMAKE_CLANG_MAJOR_VERSION \
+        __clang_minor__=$$QMAKE_CLANG_MINOR_VERSION \
+        __clang_patchlevel__=$$QMAKE_CLANG_PATCH_VERSION
+!isEmpty(QMAKE_GCC_MAJOR_VERSION): \
+    QMAKE_COMPILER_DEFINES += \
+        __GNUC__=$$QMAKE_GCC_MAJOR_VERSION \
+        __GNUC_MINOR__=$$QMAKE_GCC_MINOR_VERSION \
+        __GNUC_PATCHLEVEL__=$$QMAKE_GCC_PATCH_VERSION
+!isEmpty(QMAKE_GHS_VERSION): \
+    QMAKE_COMPILER_DEFINES += __ghs__ __GHS_VERSION_NUMBER=$$QMAKE_GHS_VERSION
+
+QMAKE_CFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_MSVC_COMPAT
+
+clang_cl|intel_icl {
+    include(../common/msvc-based-version.conf)
+} else: msvc {
+    include(../common/msvc-version.conf)
+}
+
+#
+# Determine and cache the default search paths
+#
+
+defineReplace(qtMakeExpand) {
+    out = "$$1"
+    for(ever) {
+        m = $$replace(out, ".*\\$\\(EXPORT_([^)]+)\\).*", \\1)
+        equals(m, $$out): \
+            return($$out)
+        out = $$replace(out, "\\$\\(EXPORT_$$m\\)", $$eval($$m))
+    }
+}
+
+defineReplace(qtSplitPathList) {
+    paths = $$split(1, $$QMAKE_DIRLIST_SEP)
+    ret =
+    for (p, paths): \
+        ret += $$clean_path($$p)
+    return($$ret)
+}
+
+defineReplace(qtNmakePathList) {
+    paths =
+    for (p, 1): \
+        paths += $$shell_path($$p)
+    paths ~= s,$${LITERAL_HASH},^$${LITERAL_HASH},g
+    paths ~= s,\\$,\$\$,g
+    return($$join(paths, $$QMAKE_DIRLIST_SEP))
+}
+
+msvc {
+    arch = $$lower($$VCPROJ_ARCH)
+    equals(arch, x64): \  # may be "win32" or undefined
+        arch = amd64
+    else: !equals(arch, arm):!equals(arch, arm64): \  # may be "win32" or undefined
+        arch = x86
+    # Consider only ARM64 desktop builds to be cross-builds -
+    # the host is assumed to be Intel and capable of running the target
+    # executables (so building for x64 on x86 will break).
+    equals(arch, arm64): \
+        CONFIG += msvc_cross
+}
+
+isEmpty($${target_prefix}.INCDIRS) {
+    #
+    # Get default include and library paths from compiler
+    #
+    wasm {
+        # wasm compiler does not work here, just use defaults
+    } else: gcc {
+        cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE"
+        equals(QMAKE_HOST.os, Windows): \
+            cmd_prefix = "set LC_ALL=C&"
+        else: \
+            cmd_prefix = "LC_ALL=C"
+
+        cxx_flags = $$QMAKE_CXXFLAGS
+
+        # Manually inject the sysroot for Apple Platforms because its resolution
+        # normally does not happen until default_post.prf. This is especially
+        # important for moc to gain the correct default include directory list.
+        # While technically incorrect but without any likely practical effect,
+        # UIKit simulator platforms will see the device SDK's sysroot in
+        # QMAKE_DEFAULT_*DIRS, because they're handled in a single build pass.
+        darwin {
+            uikit {
+                # Clang doesn't automatically pick up the architecture, just because
+                # we're passing the iOS sysroot below, and we will end up building the
+                # test for the host architecture, resulting in linker errors when
+                # linking against the iOS libraries. We work around this by passing
+                # the architecture explicitly.
+                cxx_flags += -arch $$first(QMAKE_APPLE_DEVICE_ARCHS)
+            }
+
+            uikit:macx-xcode: \
+                cxx_flags += -isysroot $$sdk_path_device.value
+            else: \
+                cxx_flags += -isysroot $$QMAKE_MAC_SDK_PATH
+        }
+
+        rim_qcc: \
+            # Need the cc1plus and ld command lines to pick up the paths
+            cxx_flags += $$QMAKE_LFLAGS_SHLIB -o $$QMAKE_SYSTEM_NULL_DEVICE -v
+        else: darwin:clang: \
+            # Need to link to pick up library paths
+            cxx_flags += -g0 $$QMAKE_LFLAGS_SHLIB -o /dev/null -v -Wl,-v
+        else: \
+            # Just preprocess, might not pick up library paths
+            cxx_flags += -E -v
+
+        output = $$system("$$cmd_prefix $$QMAKE_CXX $$qtMakeExpand($$cxx_flags) -xc++ - 2>&1 $$cmd_suffix", lines, ec)
+        !equals(ec, 0): qtCompilerError($$QMAKE_CXX, $$output)
+
+        rim_qcc {
+            for (line, output) {
+                contains(line, "^[^ ]*cc1plus .*") {
+                    take_next = false
+                    for (parameter, $$list($$line)) {
+                        $$take_next {
+                            QMAKE_DEFAULT_INCDIRS += $$clean_path($$parameter)
+                            take_next = false
+                        } else: equals(parameter, "-isystem") {
+                            take_next = true
+                        }
+                    }
+                } else: contains(line, "^[^ ]*-ld .*") {
+                    for (parameter, $$list($$line)) {
+                        contains(parameter, "^-L.*") {
+                            parameter ~= s/^-L//
+                            QMAKE_DEFAULT_LIBDIRS += $$clean_path($$parameter)
+                        }
+                    }
+                }
+            }
+        } else {
+            add_includes = false
+            add_libraries = false
+            for (line, output) {
+                line ~= s/^[ \\t]*//  # remove leading spaces
+                contains(line, "LIBRARY_PATH=.*") {
+                    line ~= s/^LIBRARY_PATH=//  # remove leading LIBRARY_PATH=
+                    equals(QMAKE_HOST.os, Windows): \
+                        paths = $$split(line, ;)
+                    else: \
+                        paths = $$split(line, $$QMAKE_DIRLIST_SEP)
+                    for (path, paths): \
+                        QMAKE_DEFAULT_LIBDIRS += $$clean_path($$path)
+                } else: contains(line, "Library search paths:") {
+                    add_libraries = true
+                } else: contains(line, "$${LITERAL_HASH}include <.*") {  # #include <...> search starts here:
+                    add_includes = true
+                } else: contains(line, "End of search.*") {
+                    add_includes = false
+                } else: $$add_libraries {
+                    # We assume all library search paths are absolute
+                    !contains(line, "^/.*") {
+                        add_libraries = false
+                        next()
+                    }
+                    QMAKE_DEFAULT_LIBDIRS += $$clean_path($$line)
+                } else: $$add_includes {
+                    !contains(line, ".* \\(framework directory\\)"): \
+                        QMAKE_DEFAULT_INCDIRS += $$clean_path($$line)
+                }
+            }
+        }
+        if(!darwin:clang)|intel_icc {
+            # Clang on a non-Apple system (that is, a system without ld64 -- say, with GNU ld
+            # or gold under Linux) will not print any library search path. Need to use another
+            # invocation with different options (which in turn doesn't print include search
+            # paths, so it can't just be used in place of the above code).
+            # What's more, -print-search-dirs can't be used on clang on Apple because it
+            # won't print all the library paths (only the clang-internal ones).
+            output = $$system("$$cmd_prefix $$QMAKE_LINK $$QMAKE_LFLAGS -print-search-dirs", lines, ec)
+            !equals(ec, 0): qtCompilerError($$QMAKE_LINK, $$output)
+
+            for (line, output) {
+                contains(line, "^libraries: .*") {
+                    line ~= s,^libraries: ,,
+                    equals(QMAKE_HOST.os, Windows) {
+                        # clang (7.x) on Windows uses the wrong path list separator ...
+                        line ~= s,:(?![/\\\\]),;,
+                        paths = $$split(line, ;)
+                    } else {
+                        paths = $$split(line, $$QMAKE_DIRLIST_SEP)
+                    }
+                    for (path, paths): \
+                        QMAKE_DEFAULT_LIBDIRS += $$clean_path($$replace(path, ^=, $$[SYSROOT]))
+                }
+            }
+        }
+        isEmpty(QMAKE_DEFAULT_INCDIRS): \
+            !integrity: \
+                error("failed to parse default include paths from compiler output")
+        isEmpty(QMAKE_DEFAULT_LIBDIRS): \
+            !integrity:!darwin: \
+                error("failed to parse default library paths from compiler output")
+        QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
+    } else: ghs {
+        cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
+        output = $$system("$$cmd", blob, ec)
+        !equals(ec, 0): qtCompilerError($$QMAKE_CXX, $$output)
+        output ~= s/\\\\\\n {8}//g
+        output = $$split(output, $$escape_expand(\\n))
+        for (line, output) {
+            contains(line, "^[^ ]+/ecom[^ ]+ .* /tmp/fake_input\\.cpp") {
+                for (parameter, $$list($$line)) {
+                    contains(parameter, "^(-I|--include_no_mmd=|--sys_include=).*") {
+                        parameter ~= s/^(-I|--include_no_mmd=|--sys_include=)//
+                        QMAKE_DEFAULT_INCDIRS += $$clean_path($$parameter)
+                    }
+                }
+            } else: contains(line, "^[^ ]+/elxr .*") {
+                for (parameter, $$list($$line)) {
+                    contains(parameter, "^-L.*") {
+                        parameter ~= s/^-L//
+                        QMAKE_DEFAULT_LIBDIRS += $$clean_path($$parameter)
+                    }
+                }
+            }
+        }
+    } else: msvc_cross {
+        # Use a batch file, because %VAR% in the system() call expands to
+        # the pre-script-call value, and !VAR! cannot be enabled outside
+        # a batch file without invoking another shell instance.
+        cmd = $$system_quote($$system_path($$PWD/data/dumpvcvars.bat))
+
+        hostArch = $$QMAKE_HOST.arch
+        equals(hostArch, x86_64): \
+            hostArch = amd64
+        !equals(arch, $$hostArch): \
+            arch = $${hostArch}_$$arch
+
+        isEmpty(MSVC_VER): \
+            error("Mkspec does not specify MSVC_VER. Cannot continue.")
+        versionAtLeast(MSVC_VER, 15.0) {
+            dir = $$(VSINSTALLDIR)
+            isEmpty(dir) {
+                version_parts = $$split(MSVC_VER, .)
+                MSVC_NEXT_MAJOR = $$num_add($$first(version_parts), 1)
+                vswhere = "$$getenv(ProgramFiles\(x86\))/Microsoft Visual Studio/Installer/vswhere.exe"
+                !exists($$vswhere): \
+                    error("Could not find $$vswhere")
+                vswhere = $$system_quote($$system_path($$vswhere))
+                # -version parameter: A version range for instances to find. 15.0 will get all versions >= 15.0
+                # Example: [15.0,16.0) will find versions 15.*.
+                dir = $$system("$$vswhere -latest -version [$$MSVC_VER,$${MSVC_NEXT_MAJOR}.0] -property installationPath")
+            }
+            isEmpty(dir): \
+                error("Failed to find the Visual Studio installation directory.")
+            cmd += $$system_quote($$dir\\VC\\Auxiliary\\Build\\vcvarsall.bat) $$arch
+        } else {
+            dir = $$(VCINSTALLDIR)
+            isEmpty(dir): \
+                dir = $$read_registry(HKLM, \
+                    "Software\\Microsoft\\VisualStudio\\$$MSVC_VER\\Setup\\VC\\ProductDir", 32)
+            isEmpty(dir): \
+                error("Failed to find the Visual C installation directory.")
+            cmd += $$system_quote($$dir\\vcvarsall.bat) $$arch
+        }
+
+        isEmpty(WINSDK_VER): \
+            error("Mkspec does not specify WINSDK_VER. Cannot continue.")
+        # We prefer the environment variable, because that may work around
+        # a broken registry entry after uninstalling a newer SDK.
+        # However, we do that only if the major+minor SDK version matches
+        # the one requested by the mkspec, as we might be building for a
+        # newer target than the host.
+        winsdk_ver = $$(WindowsSDKVersion)
+        !isEmpty(winsdk_ver) {
+            winsdk_ver ~= s,\\\\$,,  # Work around SDK breakage.
+            !equals(WINSDK_VER, $$replace(winsdk_ver, ^(\\d+\\.\\d+).*$, \\1)): \
+                winsdk_ver =
+        }
+        !isEmpty(winsdk_ver) {
+            cmd += $$winsdk_ver
+        } else {
+            winsdk_ver = $$read_registry(HKLM, \
+                "Software\\Microsoft\\Microsoft SDKs\\Windows\\v$$WINSDK_VER\\ProductVersion", 32)
+            isEmpty(winsdk_ver): \
+                error("Windows SDK $$WINSDK_VER requested by mkspec is not installed. Cannot continue.")
+            cmd += $${winsdk_ver}.0
+        }
+
+        output = $$system("$$cmd 2>&1", lines, ec)
+        !equals(ec, 0): \
+            qtToolchainError("SDK setup script failed. Output:", $$output, \
+                             "Command was: $$cmd")
+        lines = $$output
+        for(ever) {
+            isEmpty(lines): \
+                break()
+            line = $$take_first(lines)
+            equals(line, "=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+="): \
+                break()
+        }
+        !count(lines, 3): \
+            qtToolchainError("SDK setup script returned unexpected output:", $$output, \
+                             "Command was: $$cmd")
+
+        # These contain only paths for the target.
+        QMAKE_DEFAULT_INCDIRS = $$qtSplitPathList($$member(lines, 0))
+        QMAKE_DEFAULT_LIBDIRS = $$qtSplitPathList($$member(lines, 1))
+        # PATH is inherently for the host, and paths that are not shadowed
+        # by vcvarsall.bat are assumed to contain only tools that work for
+        # both host and target builds.
+        QMAKE_DEFAULT_PATH = $$qtSplitPathList($$member(lines, 2))
+        # We de-duplicate, because the script just prepends to the paths for
+        # the host, some of which are identical to the ones for the target.
+        QMAKE_DEFAULT_PATH = $$unique(QMAKE_DEFAULT_PATH)
+    } else: msvc {
+        LIB = $$getenv("LIB")
+        QMAKE_DEFAULT_LIBDIRS = $$split(LIB, $$QMAKE_DIRLIST_SEP)
+        INCLUDE = $$getenv("INCLUDE")
+        QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
+    }
+
+    unix:!darwin:if(!cross_compile|host_build) {
+        isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
+        isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
+    }
+
+    # cache() complains about undefined variables and doesn't persist empty ones.
+    !isEmpty(QMAKE_DEFAULT_INCDIRS): \
+        cache($${target_prefix}.INCDIRS, set stash, QMAKE_DEFAULT_INCDIRS)
+    !isEmpty(QMAKE_DEFAULT_LIBDIRS): \
+        cache($${target_prefix}.LIBDIRS, set stash, QMAKE_DEFAULT_LIBDIRS)
+    !isEmpty(QMAKE_DEFAULT_PATH): \
+        cache($${target_prefix}.PATH, set stash, QMAKE_DEFAULT_PATH)
+} else {
+    QMAKE_DEFAULT_INCDIRS = $$eval($${target_prefix}.INCDIRS)
+    QMAKE_DEFAULT_LIBDIRS = $$eval($${target_prefix}.LIBDIRS)
+    QMAKE_DEFAULT_PATH = $$eval($${target_prefix}.PATH)
+}
+
+msvc_cross {
+    qmake_inc_exp.name = INCLUDE
+    qmake_inc_exp.value = $$qtNmakePathList($$QMAKE_DEFAULT_INCDIRS)
+    qmake_lib_exp.name = LIB
+    qmake_lib_exp.value = $$qtNmakePathList($$QMAKE_DEFAULT_LIBDIRS)
+    qmake_path_exp.name = PATH
+    qmake_path_exp.value = $$qtNmakePathList($$QMAKE_DEFAULT_PATH)
+    QMAKE_EXPORTED_VARIABLES += qmake_inc_exp qmake_lib_exp qmake_path_exp
+}
+
+unset(target_prefix)

version

@@ -1 +1 @@
-7.4.0
+8.0.0