From f3145e0d06b171e2bf34b3d92b25b019cd51cfc4 Mon Sep 17 00:00:00 2001
From: Semyon Bezrukov <semen.bezrukov@onlyoffice.com>
Date: Thu, 7 Jul 2022 14:52:12 +0300
Subject: [PATCH] Fix branding (#489)

---
 make_package.py            |  9 +++++----
 scripts/package_desktop.py | 16 ++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/make_package.py b/make_package.py
index 60566ab..86d1d67 100755
--- a/make_package.py
+++ b/make_package.py
@@ -6,10 +6,6 @@ sys.path.append("scripts")
 import argparse
 import package_common as common
 import package_utils as utils
-import package_core
-import package_desktop
-import package_server
-import package_builder
 
 # parse
 parser = argparse.ArgumentParser(description="Build packages.")
@@ -56,6 +52,11 @@ utils.set_cwd(common.workspace_dir, verbose=True)
 if common.branding is not None:
   sys.path.insert(-1, utils.get_path(common.branding + "/build_tools/scripts"))
 
+import package_core
+import package_desktop
+import package_server
+import package_builder
+
 # build
 if "core" in common.targets:
   package_core.make()
diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py
index 27f5224..7feda75 100644
--- a/scripts/package_desktop.py
+++ b/scripts/package_desktop.py
@@ -127,8 +127,8 @@ def make_inno():
   if branding.onlyoffice:
     iscc_args.append("/D_ONLYOFFICE=1")
   else:
-    iscc_args.append("/DsBrandingFolder=..\\..\\..\\..\\" + common.branding + \
-        "\\desktop-apps\\win-linux\\package\\windows")
+    iscc_args.append("/DsBrandingFolder=" + \
+        utils.get_abspath(common.workspace_dir + "\\" + common.branding + "\\desktop-apps"))
   if common.platform in ["windows_x64_xp", "windows_x86_xp"]:
     iscc_args.append("/D_WIN_XP=1")
   if common.sign:
@@ -214,12 +214,12 @@ def make_msi():
         "\\desktop-apps\\win-linux\\package\\windows\\data", "data", ".png")
     aic_content += [
       "SetProperty ProductName=\"%s\"" % branding.desktop_product_name_full,
-      "SetProperty Manufacturer=\"%s\"" % branding.desktop_publisher_name.replace('"', '""'),
-      "SetProperty ARPURLINFOABOUT=\"%s\"" % branding.desktop_info_about_url,
-      "SetProperty ARPURLUPDATEINFO=\"%s\"" % branding.desktop_update_info_url,
-      "SetProperty ARPHELPLINK=\"%s\"" % branding.desktop_help_url,
-      "SetProperty ARPHELPTELEPHONE=\"%s\"" % branding.desktop_help_phone,
-      "SetProperty ARPCONTACT=\"%s\"" % branding.desktop_publisher_address,
+      "SetProperty Manufacturer=\"%s\"" % branding.publisher_name.replace('"', '""'),
+      "SetProperty ARPURLINFOABOUT=\"%s\"" % branding.info_about_url,
+      "SetProperty ARPURLUPDATEINFO=\"%s\"" % branding.update_info_url,
+      "SetProperty ARPHELPLINK=\"%s\"" % branding.help_url,
+      "SetProperty ARPHELPTELEPHONE=\"%s\"" % branding.help_phone,
+      "SetProperty ARPCONTACT=\"%s\"" % branding.publisher_address,
       "DelLanguage 1029 -buildname DefaultBuild",
       "DelLanguage 1031 -buildname DefaultBuild",
       "DelLanguage 1041 -buildname DefaultBuild",