From 8cccfb95d32ebef81b1cc76e5dbe96b4d904f8e9 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Mon, 16 Nov 2020 11:24:37 +0300 Subject: [PATCH 1/2] Fix builder build with branding --- scripts/build.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/build.py b/scripts/build.py index 09173c8..400d67f 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -90,5 +90,16 @@ def make(): is_no_brandind_build = base.is_file("config") make_pro_file("makefiles", "build.pro") if config.check_option("module", "builder") and base.is_windows() and is_no_brandind_build: + # check replace + replace_path_lib = "" + replace_path_lib_file = os.getcwd() + "/../core/DesktopEditor/doctrenderer/docbuilder.com/docbuilder.h" + if (config.branding() != ""): + replace_path_lib = "../../../build/" + config.branding() + "/lib/" + # replace + if (replace_path_lib != "") + base.replaceInFile(replace_path_lib_file, "../../../build/lib/", replace_path_lib) base.bash("../core/DesktopEditor/doctrenderer/docbuilder.com/build") + # restore + if (replace_path_lib != "") + base.replaceInFile(replace_path_lib_file, replace_path_lib, "../../../build/lib/") return From d78d457064ed37d1488a604d6eefa74da7976b41 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Mon, 16 Nov 2020 11:32:12 +0300 Subject: [PATCH 2/2] Fix previous commit --- scripts/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.py b/scripts/build.py index 400d67f..18a93b9 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -96,10 +96,10 @@ def make(): if (config.branding() != ""): replace_path_lib = "../../../build/" + config.branding() + "/lib/" # replace - if (replace_path_lib != "") + if (replace_path_lib != ""): base.replaceInFile(replace_path_lib_file, "../../../build/lib/", replace_path_lib) base.bash("../core/DesktopEditor/doctrenderer/docbuilder.com/build") # restore - if (replace_path_lib != "") + if (replace_path_lib != ""): base.replaceInFile(replace_path_lib_file, replace_path_lib, "../../../build/lib/") return