From 14c358e04ade63d315fd36b08732fef4653fc8ba Mon Sep 17 00:00:00 2001
From: Roman Demidov <58073444+romandemidov@users.noreply.github.com>
Date: Thu, 12 Dec 2019 18:21:24 +0300
Subject: [PATCH] Add update git server if needed (#20)

---
 make.py                  | 2 +-
 scripts/build_server.py  | 4 ++++
 scripts/deploy_server.py | 7 -------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/make.py b/make.py
index 53d9c8d..d7b692c 100755
--- a/make.py
+++ b/make.py
@@ -57,7 +57,7 @@ if ("1" == config.option("update")):
   if config.check_option("module", "desktop"):
     base.git_update("desktop-apps")
 
-  if config.check_option("module", "develop"):
+  if(config.check_option("module", "develop") or config.check_option("module", "server")):
     base.git_update("server")
     base.git_update("document-server-integration")
     base.git_update("core-fonts")
diff --git a/scripts/build_server.py b/scripts/build_server.py
index 3cbc38b..5b47955 100644
--- a/scripts/build_server.py
+++ b/scripts/build_server.py
@@ -5,6 +5,10 @@ import base
 
 
 def make():
+  #check server module to build
+  if(not config.check_option("module", "server")):
+    return
+
   server_dir = base.get_script_dir() + "/../../server"
 
   base.cmd_in_dir(server_dir, "npm", ["install"])
diff --git a/scripts/deploy_server.py b/scripts/deploy_server.py
index 8f74ef2..a507fd3 100644
--- a/scripts/deploy_server.py
+++ b/scripts/deploy_server.py
@@ -165,7 +165,6 @@ def make():
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, tools_dir, "allfontsgen")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, tools_dir, "allthemesgen")
 
-
     #env variables
     product_version = base.get_env('PRODUCT_VERSION')
     if(not product_version):
@@ -196,12 +195,6 @@ def make():
     if(not branding_dir):
       branding_dir = 'branding'
 
-    #build_server_dir = root_dir + '/server'
-    #server_dir = base.get_script_dir() + "/../../server"
-
-    #base.copy_dir(server_dir + '/build/server', build_server_dir)
-    #base.copy_files(server_dir + '/build/server/*', build_server_dir)
-
     #dictionaries
     spellchecker_dictionaries = build_server_dir + '/SpellChecker/dictionaries'
     spellchecker_dictionaries_files = server_dir + '/../dictionaries/*_*'