Merge branch release/v6.2.0 into develop

Author: papacarlo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,25 @@
+---
+name: Bug Report
+about: Report an issue with build_tools you've discovered.
+---
+
+**Describe your problem**:
+
+*Be clear in your description of the problem.
+Open an issue with a descriptive title and a summary in complete sentences.*
+
+*Use the template below when reporting bugs. Please, make sure that
+you're fetched latest master of build_tools and that the problem you're reporting
+hasn't been reported (and potentially fixed) already.*
+
+*Before filing the ticket you should replace all cursive text with your own words.*
+
+**Steps to reproduce the problem**:
+
+*Please make sure your error can be reproduced, Docker can be a great help*
+
+**build_tools base repo version**:
+
+**Operating system**:
+
+**Compiler version**:

LICENSE.txt

@@ -23,6 +23,9 @@ OO_BRANDING_SUFFIX = $$(OO_BRANDING)
 	MAKEFILE=$$join(MAKEFILE, , , "$$OO_BRANDING_SUFFIX")
 }
 
+message(current_makefile)
+message($$MAKEFILE)
+
 CONFIG += ordered
 
 core_windows {

build.pro

@@ -307,6 +307,12 @@ def cmd_in_dir(directory, prog, args=[], is_no_errors=False):
   os.chdir(cur_dir)
   return ret
 
+def cmd_and_return_cwd(prog, args=[], is_no_errors=False):
+  cur_dir = os.getcwd()
+  ret = cmd(prog, args, is_no_errors)
+  os.chdir(cur_dir)
+  return ret
+
 def run_command(sCommand):
   popen = subprocess.Popen(sCommand, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
   result = {'stdout' : '', 'stderr' : ''}
@@ -452,15 +458,16 @@ def create_pull_request(branches_to, repo, is_no_errors=False, is_current_dir=Fa
     is_not_exit = True
   old_cur = os.getcwd()
   os.chdir(folder)
-  cmd("git", ["checkout", "-f", config.option("branch")], is_no_errors)
+  branch_from = config.option("branch")
+  cmd("git", ["checkout", "-f", branch_from], is_no_errors)
   cmd("git", ["pull"], is_no_errors)
   for branch_to in branches_to:
-    if "" != run_command("git log origin/" + branch_to + "..origin/" + config.option("branch"))["stdout"]:
+    if "" != run_command("git log origin/" + branch_to + "..origin/" + branch_from)["stdout"]:
       cmd("git", ["checkout", "-f", branch_to], is_no_errors)
       cmd("git", ["pull"], is_no_errors)
-      cmd("hub", ["pull-request", "--force", "--base", branch_to, "--head", config.option("branch"), "--no-edit"], is_no_errors)
-      if 0 != cmd("git", ["merge", "origin/" + config.option("branch"), "--no-ff", "--no-edit"], is_no_errors):
-        print_error("[git] Conflicts merge " + "origin/" + config.option("branch") + " to " + branch_to + " in repo " + url)
+      cmd("hub", ["pull-request", "--force", "--base", branch_to, "--head", branch_from, "--message", "Merge from " + branch_from + " to " + branch_to], is_no_errors)
+      if 0 != cmd("git", ["merge", "origin/" + branch_from, "--no-ff", "--no-edit"], is_no_errors):
+        print_error("[git] Conflicts merge " + "origin/" + branch_from + " to " + branch_to + " in repo " + url)
         cmd("git", ["merge", "--abort"], is_no_errors)
       else:
         cmd("git", ["push"], is_no_errors)

scripts/base.py

@@ -58,25 +58,26 @@ def make_pro_file(makefiles_dir, pro_file):
 
     # non windows platform
     if not base.is_windows():
-      if ("1" == config.option("clean")):
-        base.cmd(base.app_make(), ["clean", "-f", makefiles_dir + "/build.makefile_" + file_suff], True)
-        base.cmd(base.app_make(), ["distclean", "-f", makefiles_dir + "/build.makefile_" + file_suff], True)
-
       if base.is_file(makefiles_dir + "/build.makefile_" + file_suff):
         base.delete_file(makefiles_dir + "/build.makefile_" + file_suff)
-      base.cmd(qt_dir + "/bin/qmake", ["-nocache", pro_file, "CONFIG+=" + config_param] + qmake_addon)    
-      base.cmd(base.app_make(), ["-f", makefiles_dir + "/build.makefile_" + file_suff])
+      print("make file: " + makefiles_dir + "/build.makefile_" + file_suff)
+      base.cmd(qt_dir + "/bin/qmake", ["-nocache", pro_file, "CONFIG+=" + config_param] + qmake_addon)
+      if ("1" == config.option("clean")):
+        base.cmd_and_return_cwd(base.app_make(), ["clean", "-f", makefiles_dir + "/build.makefile_" + file_suff], True)
+        base.cmd_and_return_cwd(base.app_make(), ["distclean", "-f", makefiles_dir + "/build.makefile_" + file_suff], True)
+        base.cmd(qt_dir + "/bin/qmake", ["-nocache", pro_file, "CONFIG+=" + config_param] + qmake_addon)
+      base.cmd_and_return_cwd(base.app_make(), ["-f", makefiles_dir + "/build.makefile_" + file_suff])
     else:
       qmake_bat = []
       qmake_bat.append("call \"" + config.option("vs-path") + "/vcvarsall.bat\" " + ("x86" if base.platform_is_32(platform) else "x64"))
-      if ("1" == config.option("clean")):
-        qmake_bat.append("call nmake clean -f " + makefiles_dir + "/build.makefile_" + file_suff)
-        qmake_bat.append("call nmake distclean -f " + makefiles_dir + "/build.makefile_" + file_suff)
+      qmake_bat.append("if exist ./" + makefiles_dir + "/build.makefile_" + file_suff + " del /F ./" + makefiles_dir + "/build.makefile_" + file_suff)
       qmake_addon_string = ""
       if ("" != config.option("qmake_addon")):
         qmake_addon_string = " \"" + config.option("qmake_addon") + "\""
-      qmake_bat.append("if exist ./" + makefiles_dir + "/build.makefile_" + file_suff + " del /F ./" + makefiles_dir + "/build.makefile_" + file_suff)
       qmake_bat.append("call \"" + qt_dir + "/bin/qmake\" -nocache " + pro_file + " \"CONFIG+=" + config_param + "\"" + qmake_addon_string)
+      if ("1" == config.option("clean")):
+        qmake_bat.append("call nmake clean -f " + makefiles_dir + "/build.makefile_" + file_suff)
+        qmake_bat.append("call nmake distclean -f " + makefiles_dir + "/build.makefile_" + file_suff)
       qmake_bat.append("call nmake -f " + makefiles_dir + "/build.makefile_" + file_suff)
       base.run_as_bat(qmake_bat)
 

scripts/build.py

@@ -178,9 +178,7 @@ def make():
     base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt", root_dir + "/editors/sdkjs-plugins", "advanced2", True)
     #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}")
-
-    if (0 != platform.find("mac")):
-      base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins", root_dir + "/editors/sdkjs-plugins", "sendto", True)
+    base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins", root_dir + "/editors/sdkjs-plugins", "sendto", True)
 
     base.copy_file(base_dir + "/js/" + branding + "/desktop/index.html", root_dir + "/index.html")
     base.copy_dir(git_dir + "/desktop-apps/common/loginpage/providers", root_dir + "/providers")

scripts/deploy_desktop.py

@@ -55,7 +55,7 @@ def install_deps():
     base.download("https://deb.nodesource.com/setup_10.x", "./node_js_setup_10.x")
     base.cmd("sudo", ["bash", "./node_js_setup_10.x"])
     base.cmd("sudo", ["apt-get", "install", "-y", "nodejs"])
-    base.cmd("sudo", ["npm", "install", "-g", "npm"])
+    base.cmd("sudo", ["npm", "install", "-g", "npm@6"])
     base.cmd("sudo", ["npm", "install", "-g", "grunt-cli"])
     base.cmd("sudo", ["npm", "install", "-g", "pkg"])