Merge pull request #617 from ONLYOFFICE/hotfix/v7.3.1

Hotfix/v7.3.1

.github/workflows/check.yml

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

.markdownlint.jsonc

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

develop/Dockerfile

@@ -3,17 +3,11 @@ RUN apt-get update -y && \
 	apt-get install git -y \
 			python3 -y \
 			openjdk-11-jdk -y \
-			bzip2 -y \
 			npm -y && \
-	npm install -g grunt grunt-cli -y && \
+			npm install -g grunt-cli -y && \
 	ln -s /usr/bin/python3 /usr/bin/python && \
 	ln -s /usr/bin/pip3 /usr/bin/pip && \
-	git clone --depth 1 -b feature/docker-instruction https://github.com/ONLYOFFICE/build_tools.git var/www/onlyoffice/documentserver/build_tools && \
+	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,219 +1,50 @@
 # Docker
 
 This directory containing instruction for developers,
-who want to change something in sdkjs or web-apps or server module,
+who want to change something in sdkjs or web-apps module,
 but don't want to compile pretty compilcated core product to make those changes.
 
-## System requirements
+## Installing ONLYOFFICE Docs
 
-### Windows
+## How to use - Linux or macOS
 
-You need the latest
-[Docker Desktop for Windows](https://docs.docker.com/desktop/install/windows-install/)
-installed.
+**Note**: You need the latest Docker version installed.
 
-**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 -b feature/docker-instruction https://github.com/ONLYOFFICE/build_tools.git
-```
-
-### Modify Docker Images
+You might need to pull **onlyoffice/documentserver** image:
 
 **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
-cd build_tools/develop
 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 build -t documentserver-develop .
 ```
 
 **Note**: The dot at the end is required.
 
-**Note**: Sometimes script may fail due to network errors. Just restart it.
+### Connecting external folders
 
-## Clone development modules
-
-Clone development modules to the work dir
+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
 
 * `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
-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
+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
 ```

develop/run_build_js.py

@@ -2,56 +2,11 @@
 
 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
 
-git_dir = 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:])
-
+base.cmd_in_dir(sys.argv[1] + '/build_tools/', 'python3', ['configure.py'])
 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/")
-  
-  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)
-  
+build_js.build_js_develop(sys.argv[1])

scripts/base.py

@@ -769,7 +769,7 @@ def generate_doctrenderer_config(path, root, product, vendor = ""):
   file.close()
   return
 
-def generate_plist(path):
+def generate_plist_framework_folder(file):
   bundle_id_url = "com.onlyoffice."
   if ("" != get_env("PUBLISHER_BUNDLE_ID")):
     bundle_id_url = get_env("PUBLISHER_BUNDLE_ID")
@@ -782,43 +782,52 @@ def generate_plist(path):
   for n in bundle_version_natural:
     bundle_version.append(n)
 
-  for file in glob.glob(path + '/**/*.framework', recursive=True):
-    if not is_dir(file):
-      continue
-    name = os.path.basename(file)
-    name = name.replace(".framework", "")
+  name = os.path.basename(file)
+  name = name.replace(".framework", "")
 
-    content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-    content += "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-    content += "<plist version=\"1.0\">\n"
-    content += "<dict>\n"
-    content += "\t<key>CFBundleExecutable</key>\n"
-    content += ("\t<string>" + name + "</string>\n")
-    content += "\t<key>CFBundleGetInfoString</key>\n"
-    content += "\t<string>Created by " + bundle_creator + "</string>\n"
-    content += "\t<key>CFBundleIdentifier</key>\n"
-    content += "\t<string>" + bundle_id_url + correct_bundle_identifier(name) + "</string>\n"
-    content += "\t<key>CFBundlePackageType</key>\n"
-    content += "\t<string>FMWK</string>\n"
-    content += "\t<key>CFBundleShortVersionString</key>\n"
-    content += "\t<string>" + bundle_version[0] + "." + bundle_version[1] + "</string>\n"
-    content += "\t<key>CFBundleSignature</key>\n"
-    content += "\t<string>????</string>\n"
-    content += "\t<key>CFBundleVersion</key>\n"
-    content += "\t<string>" + bundle_version[0] + "." + bundle_version[1] + "." + bundle_version[2] + "</string>\n"
-    content += "\t<key>MinimumOSVersion</key>\n"
-    content += "\t<string>13.0</string>\n"
-    content += "</dict>\n"
-    content += "</plist>"
+  content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+  content += "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+  content += "<plist version=\"1.0\">\n"
+  content += "<dict>\n"
+  content += "\t<key>CFBundleExecutable</key>\n"
+  content += ("\t<string>" + name + "</string>\n")
+  content += "\t<key>CFBundleGetInfoString</key>\n"
+  content += "\t<string>Created by " + bundle_creator + "</string>\n"
+  content += "\t<key>CFBundleIdentifier</key>\n"
+  content += "\t<string>" + bundle_id_url + correct_bundle_identifier(name) + "</string>\n"
+  content += "\t<key>CFBundlePackageType</key>\n"
+  content += "\t<string>FMWK</string>\n"
+  content += "\t<key>CFBundleShortVersionString</key>\n"
+  content += "\t<string>" + bundle_version[0] + "." + bundle_version[1] + "</string>\n"
+  content += "\t<key>CFBundleSignature</key>\n"
+  content += "\t<string>????</string>\n"
+  content += "\t<key>CFBundleVersion</key>\n"
+  content += "\t<string>" + bundle_version[0] + "." + bundle_version[1] + "." + bundle_version[2] + "</string>\n"
+  content += "\t<key>MinimumOSVersion</key>\n"
+  content += "\t<string>13.0</string>\n"
+  content += "</dict>\n"
+  content += "</plist>"
 
-    fileDst = file + "/Info.plist"
-    if is_file(fileDst):
-      delete_file(fileDst)
+  fileDst = file + "/Info.plist"
+  if is_file(fileDst):
+    delete_file(fileDst)
 
-    fileInfo = codecs.open(fileDst, "w", "utf-8")
-    fileInfo.write(content)
-    fileInfo.close()
-      
+  fileInfo = codecs.open(fileDst, "w", "utf-8")
+  fileInfo.write(content)
+  fileInfo.close()
+  return
+
+def generate_plist(path):
+  src_folder = path
+  if ("/" != path[-1:]):
+    src_folder += "/"
+  src_folder += "*"
+  for file in glob.glob(src_folder):
+    if (is_dir(file)):
+      if file.endswith(".framework"):
+        generate_plist_framework_folder(file)
+      else:
+        generate_plist(file)
   return
 
 def correct_bundle_identifier(bundle_identifier):

scripts/core_common/make_common.py

@@ -20,7 +20,6 @@ import hunspell
 import glew
 import harfbuzz
 import hyphen
-import socket_io
 
 def check_android_ndk_macos_arm(dir):
   if base.is_dir(dir + "/darwin-x86_64") and not base.is_dir(dir + "/darwin-arm64"):
@@ -44,10 +43,10 @@ def make():
   hunspell.make(False)
   harfbuzz.make()
   glew.make()
-  hyphen.make()
-  socket_io.make()
+  hyphen.make()  
   
   if config.check_option("module", "mobile"):
-    curl.make()
+    if (config.check_option("platform", "android")):
+      curl.make()
     websocket.make()
   return

scripts/core_common/modules/socket_io.py

@@ -6,6 +6,22 @@ import config
 import base
 import os
 import subprocess
+import glob
+
+def correct_namespace(dir):
+  folder = dir
+  if ("/" != folder[-1:]):
+    folder += "/"
+  folder += "*"
+  for file in glob.glob(folder):
+    if base.is_file(file):
+      base.replaceInFile(file, "namespace sio", "namespace sio_no_tls")
+      base.replaceInFile(file, "asio::", "asio_no_tls::")
+      base.replaceInFile(file, "sio::", "sio_no_tls::")
+      base.replaceInFile(file, "asio_no_tls::", "asio::")
+    elif base.is_dir(file):
+      correct_namespace(file)
+  return
 
 def make():
   base_dir = base.get_script_dir() + "/../../core/Common/3dParty/socketio"
@@ -13,4 +29,16 @@ def make():
     base.cmd_in_dir(base_dir, "git", ["clone", "https://github.com/socketio/socket.io-client-cpp.git"])
     base.cmd_in_dir(base_dir + "/socket.io-client-cpp", "git", ["submodule", "init"])
     base.cmd_in_dir(base_dir + "/socket.io-client-cpp", "git", ["submodule", "update"])
+
+    # no tls realization (remove if socket.io fix this)
+    dst_dir = base_dir + "/socket.io-client-cpp/src_no_tls"
+    base.copy_dir(base_dir + "/socket.io-client-cpp/src", dst_dir)
+    correct_namespace(dst_dir)
+    base.replaceInFile(dst_dir + "/internal/sio_client_impl.h", "SIO_TLS", "SIO_TLS_NO")
+    base.replaceInFile(dst_dir + "/internal/sio_client_impl.cpp", "SIO_TLS", "SIO_TLS_NO")
+
+    base.replaceInFile(dst_dir + "/sio_socket.h", "SIO_SOCKET_H", "SIO_SOCKET_NO_TLS_H")
+    base.replaceInFile(dst_dir + "/sio_client.h", "SIO_CLIENT_H", "SIO_CLIENT_NO_TLS_H")
+    base.replaceInFile(dst_dir + "/sio_message.h", "__SIO_MESSAGE_H__", "__SIO_MESSAGE_NO_TLS_H__")
+    base.replaceInFile(dst_dir + "/internal/sio_packet.h", "SIO_PACKET_H", "SIO_PACKET_NO_TLS_H")
   return

scripts/core_common/modules/v8_89.py

@@ -70,12 +70,14 @@ def make():
 
   if not base.is_dir("v8"):
     base.cmd("./depot_tools/fetch", ["v8"], True)
+    base.copy_dir("./v8/third_party", "./v8/third_party_new")
     if ("windows" == base.host_platform()):
       os.chdir("v8")
       base.cmd("git", ["config", "--system", "core.longpaths", "true"])
       os.chdir("../")
     base.cmd("./depot_tools/gclient", ["sync", "-r", "remotes/branch-heads/8.9"], True)
     base.cmd("gclient", ["sync", "--force"], True)
+    base.copy_dir("./v8/third_party_new/ninja", "./v8/third_party/ninja")
 
   if ("windows" == base.host_platform()):
     base.replaceInFile("v8/build/config/win/BUILD.gn", ":static_crt", ":dynamic_crt")

scripts/core_common/modules/websocket.py

@@ -6,11 +6,13 @@ import config
 import base
 import ixwebsocket
 import socketrocket
+import socket_io
 
 config_file = base.get_script_dir() + "/../../core/Common/WebSocket/websocket.pri"
 
 def make():
-  ixwebsocket.make()
-  socketrocket.make()
+  #ixwebsocket.make()
+  #socketrocket.make()
+  socket_io.make()
 
   return

scripts/develop/config_server.py

@@ -144,10 +144,8 @@ 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_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))
+  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))
   
   os.chdir(old_cur)
   return

scripts/develop/dependence.py

@@ -66,28 +66,6 @@ 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

scripts/develop/develop.py

@@ -10,15 +10,11 @@ import config_server as develop_config_server
 
 base_dir = base.get_script_dir(__file__)
 
-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():
+def make():
+  if ("1" != config.option("develop")):
+    return
+  if not dependence.check_dependencies():
+    exit(1)
   build_server.build_server_develop()
   build_js.build_js_develop(base_dir + "/../../..")
   develop_config_server.make()
@@ -26,12 +22,5 @@ def build_develop_server():
     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,9 +6,6 @@ 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)
@@ -44,94 +41,56 @@ def start_linux_services():
   os.system('sudo service rabbitmq-server restart')
   
 def run_integration_example():
-  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'])
+  base.cmd_in_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:
-    make_start()
-    make_configure(args)
-    make_install()
-    make_run()
+    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()
+      
 
+    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/package_desktop.py

@@ -61,6 +61,7 @@ def make_windows():
   package_name = branding.desktop_package_name
   package_version = common.version + "." + common.build
   source_dir = "..\\..\\..\\..\\build_tools\\out\\%s\\%s\\%s" % (prefix, company, product)
+  source_help_dir = source_dir + "-help"
   arch_list = {
     "windows_x64":    "x64",
     "windows_x64_xp": "x64",
@@ -102,14 +103,17 @@ def make_windows():
 
   if not vcdl:
     utils.set_summary("desktop inno build", False)
-    # utils.set_summary("desktop inno help build", False)
+    utils.set_summary("desktop inno help build", False)
     utils.set_summary("desktop inno update build", False)
     utils.set_summary("desktop advinst build", False)
     utils.set_cwd(common.workspace_dir)
     return
 
   make_inno()
-  # make_inno_help()
+
+  if branding.onlyoffice and common.platform in ["windows_x64", "windows_x86"]:
+    make_inno_help()
+
   make_inno_update()
 
   if common.platform == "windows_x64":

version

@@ -1 +1 @@
-7.3.0
+7.3.1