user/onlyoffice-document-server: new aport #264

Closed
ayakael wants to merge 21 commits from onlyoffice/initial into edge
2 changed files with 9 additions and 10 deletions
Showing only changes of commit fd41656ba9 - Show all commits

View file

@ -93,7 +93,7 @@ build() {
export PATH="$PATH:$srcdir/npm_cache/bin"
msg "Building core"
cd "$builddir"/build_tools
./configure.py --update 0 --module "core server"
./configure.py --update 0 --module "server"
./make.py
}
@ -112,5 +112,5 @@ e4601334830932515e4ba165eeeab935059d80523fcb4888da0b88b5fe6b3a2feff1f9c60166f4db
dce838e901720cf18ccc8035e02b9f8fea0f38a448124321663612027058467de152bfc9c257a3bd14a0ab33a00962f604e1d6c5a7040d7f1b117d260e286839 server_fix-makefile.patch
7c70d7392040ed415da0cdce91c71926624c20a36f850ba9affaff3353368830cc172c243cebc608d72051627c7e44de232818c93453b8c7e58314f05e450b2d server_restore-mobile-editing.patch
5d5758b59c2e8e2b6a31d99efb7e3ad42c60ab035af3641be5f3d84f02a1ea5abf51a380cfc55e403569ebdf3620a9c67c81b8bd0ba4632fc0b5f0506e9cf57e web-apps_restore-mobile-editing.patch
37fd78d4baddd4331c9824dccbcada44a36c0abbada1b325d682b8f2b4e233a297ba8db49909833899674ecb2f2638857d9ac93ac500d35fef8f20f3a4a69e03 build_tools-untarget-pkg.patch
ad2ebbc5293ff3203b4fd84016910b4074f145febcbae28ba5ff5f8c4514c7da2a7b5b35d80ae37919a3794ff12e93af0bd9787175eda86bb546b13c98d3029e build_tools-untarget-pkg.patch
"

View file

@ -1,23 +1,22 @@
diff --git a/build_tools/scripts/build_server.py.orig b/build_tools/scripts/build_server.py
index 15a8ff4..37e7378 100644
index 15a8ff4..e5a8f28 100644
--- a/build_tools/scripts/build_server.py.orig
+++ b/build_tools/scripts/build_server.py
@@ -51,14 +51,14 @@ def make():
@@ -51,14 +51,9 @@ 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"])
-
- 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, "pkg", [".", "-t", pkg_target, "-o", "example"])
+ base.cmd_in_dir(server_build_dir + "/DocService", "pkg", [".", "--options", "max_old_space_size=4096", "-o", "docservice"])
+ base.cmd_in_dir(server_build_dir + "/FileConverter", "pkg", [".", "-o", "converter"])
+ base.cmd_in_dir(server_build_dir + "/Metrics", "pkg", [".", "-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, "pkg", [".", "-t", pkg_target, "-o", "example"])
+ base.cmd_in_dir(example_dir, "pkg", [".", "-o", "example"])
def build_server_develop():
server_dir = base.get_script_dir() + "/../../server"