Remove legacy desktop editors update build

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/build_tools/pulls/161

scripts/base.py

@@ -256,7 +256,10 @@ def delete_dir(path):
     shutil.rmtree(get_path(path), ignore_errors=True)
   return
 
-def copy_lib(src, dst, name):
+def copy_lib(src_folder, dst, name, subdir=""):
+  src = src_folder
+  if subdir != "":
+    src += ("/" + subdir)
   if (config.check_option("config", "bundle_dylibs")) and is_dir(src + "/" + name + ".framework"):
     copy_dir(src + "/" + name + ".framework", dst + "/" + name + ".framework", symlinks=True)
 
@@ -443,14 +446,14 @@ def cmd_in_dir_qemu(platform, directory, prog, args=[], is_no_errors=False):
       "default_libs": "/usr/arm-linux-gnueabi"
     }
   }
-  
+
   if platform not in platform_config:
     return 0
 
   libs_path = platform_config[platform]["default_libs"]
   if config.option("sysroot") != "":
     libs_path = config.option("sysroot_" + platform)
-  
+
   return cmd_in_dir(directory, platform_config[platform]["qemu"], ["-L", libs_path, prog] + args, is_no_errors)
 
 def create_qemu_wrapper(binary_path, platform):
@@ -458,19 +461,19 @@ def create_qemu_wrapper(binary_path, platform):
   binary_name = os.path.basename(binary_path)
   binary_bin = binary_path + '.bin'
   sysroot = config.option("sysroot_" + platform)
-  
+
   if os.path.exists(binary_path):
     os.rename(binary_path, binary_bin)
-  
+
   wrapper_content = f'''#!/bin/bash
 DIR="$(cd "$(dirname "${{BASH_SOURCE[0]}}")" && pwd)"
 export QEMU_LD_PREFIX={sysroot}
 exec qemu-aarch64 -L {sysroot} "$DIR/{binary_name}.bin" "$@"
 '''
-  
+
   with open(binary_path, 'w') as f:
     f.write(wrapper_content)
-  
+
   os.chmod(binary_path, 0o755)
   return binary_bin
 
@@ -962,7 +965,7 @@ def qt_copy_icu(out, platform):
     postfixes += ["/aarch64-linux-gnu"]
   elif ("linux_32" == platform):
     postfixes += ["/i386-linux-gnu"]
-    
+
   for postfix in postfixes:
     tests += [prefix + "/lib" + postfix]
     tests += [prefix + "/lib64" + postfix]
@@ -1393,6 +1396,7 @@ def mac_correct_rpath_x2t(dir):
   mac_correct_rpath_library("IWorkFile", ["UnicodeConverter", "kernel"])
   mac_correct_rpath_library("HWPFile", ["UnicodeConverter", "kernel", "graphics", "StarMathConverter"])
   mac_correct_rpath_library("StarMathConverter", ["kernel"])
+  mac_correct_rpath_library("ooxmlsignature", ["kernel"])
 
   def correct_core_executable(name, libs):
     cmd("chmod", ["-v", "+x", name])
@@ -1400,7 +1404,7 @@ def mac_correct_rpath_x2t(dir):
     mac_correct_rpath_binary(name, mac_icu_libs + libs)
     return
 
-  correct_core_executable("x2t", ["UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "OFDFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer", "DocxRenderer", "IWorkFile", "HWPFile", "StarMathConverter"])
+  correct_core_executable("x2t", ["UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "OFDFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer", "DocxRenderer", "IWorkFile", "HWPFile", "StarMathConverter", "ooxmlsignature"])
   if is_file("./allfontsgen"):
     correct_core_executable("allfontsgen", ["UnicodeConverter", "kernel", "graphics"])
   if is_file("./allthemesgen"):
@@ -1633,6 +1637,12 @@ def hack_xcode_ios():
     file.write(filedata)
   return
 
+def find_ios_sdk(sdk_name):
+  return run_command("xcrun --sdk " + sdk_name + " --show-sdk-path")['stdout']
+
+def find_xcode_toolchain(sdk_name):
+  return run_command("xcrun --sdk " + sdk_name + " --show-toolchain-path")['stdout']
+
 def find_mac_sdk_version():
   sdk_dir = run_command("xcode-select -print-path")['stdout']
   sdk_dir = os.path.join(sdk_dir, "Platforms/MacOSX.platform/Developer/SDKs")
@@ -1945,7 +1955,7 @@ def set_sysroot_env(platform):
   path = config.option("sysroot_" + platform)
   sysroot_path_bin = config.get_custom_sysroot_bin(platform)
   compiler_gcc_prefix = get_compiler_gcc_prefix(platform)
-  
+
   os.environ['PATH'] = sysroot_path_bin + ":" + get_env("PATH")
   os.environ['LD_LIBRARY_PATH'] = config.get_custom_sysroot_lib(platform)
 
@@ -1953,7 +1963,7 @@ def set_sysroot_env(platform):
   os.environ['CXX'] = compiler_gcc_prefix + "g++"
   os.environ['AR'] = compiler_gcc_prefix + "ar"
   os.environ['RANLIB'] = compiler_gcc_prefix + "ranlib"
-  
+
   os.environ['CFLAGS'] = "--sysroot=" + path
   os.environ['CXXFLAGS'] = "--sysroot=" + path
   os.environ['LDFLAGS'] = "--sysroot=" + path
@@ -1975,7 +1985,7 @@ def check_python():
     download('https://github.com/ONLYOFFICE-data/build_tools_data/raw/refs/heads/master/python/python3.tar.gz', directory + "/python3.tar.gz")
     download('https://github.com/ONLYOFFICE-data/build_tools_data/raw/refs/heads/master/python/extract.sh', directory + "/extract.sh")
     cmd_in_dir(directory, "chmod", ["+x", "./extract.sh"])
-    cmd_in_dir(directory, "./extract.sh")    
+    cmd_in_dir(directory, "./extract.sh")
   directory_bin = directory_bin.replace(" ", "\\ ")
   os.environ["PATH"] = directory_bin + os.pathsep + os.environ["PATH"]
   return

scripts/deploy_builder.py

@@ -48,6 +48,7 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HWPFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DocxRenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "StarMathConverter")
+    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "ooxmlsignature", "xp" if isWindowsXP else "")
     base.copy_file(git_dir + "/sdkjs/pdf/src/engine/cmap.bin", root_dir + "/cmap.bin")
 
     if ("ios" == platform):

scripts/deploy_core.py

@@ -25,6 +25,7 @@ def make():
 
     platform = native_platform
     platform_postfix = platform + base.qt_dst_postfix()
+    isWindowsXP = False if (-1 == native_platform.find("_xp")) else True
 
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "kernel")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "kernel_network")
@@ -43,6 +44,7 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "DocxRenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "hunspell")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "StarMathConverter")
+    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, archive_dir, "ooxmlsignature", "xp" if isWindowsXP else "")
     base.copy_file(git_dir + "/sdkjs/pdf/src/engine/cmap.bin", archive_dir + "/cmap.bin")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "x2t")
 

scripts/deploy_desktop.py

@@ -73,6 +73,7 @@ def make():
     base.copy_lib(build_libraries_path, root_dir + "/converter", "HWPFile")
     base.copy_lib(build_libraries_path, root_dir + "/converter", "DocxRenderer")
     base.copy_lib(build_libraries_path, root_dir + "/converter", "StarMathConverter")
+    base.copy_lib(build_libraries_path, root_dir + "/converter", "ooxmlsignature", "xp" if isWindowsXP else "")
 
     if ("ios" == platform):
       base.copy_lib(build_libraries_path, root_dir + "/converter", "x2t")
@@ -138,7 +139,6 @@ def make():
 
     # libraries
     base.copy_lib(build_libraries_path, root_dir, "hunspell")
-    base.copy_lib(build_libraries_path + ("/xp" if isWindowsXP else ""), root_dir, "ooxmlsignature")
     base.copy_lib(build_libraries_path + ("/xp" if isWindowsXP else ""), root_dir, "ascdocumentscore")
     if (0 != platform.find("mac")):
       base.copy_lib(build_libraries_path + ("/xp" if isWindowsXP else ""), root_dir, "qtascdocumentscore")

scripts/deploy_mobile.py

@@ -66,6 +66,7 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "HWPFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "DocxRenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "StarMathConverter")
+    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, root_dir, "ooxmlsignature")
     base.copy_file(git_dir + "/sdkjs/pdf/src/engine/cmap.bin", root_dir + "/cmap.bin")
 
     if (0 == platform.find("win") or 0 == platform.find("linux") or 0 == platform.find("mac")):

scripts/deploy_server.py

@@ -94,6 +94,7 @@ def make():
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "HWPFile")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "DocxRenderer")
     base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "StarMathConverter")
+    base.copy_lib(core_build_dir + "/lib/" + platform_postfix, converter_dir, "ooxmlsignature")
     base.copy_file(git_dir + "/sdkjs/pdf/src/engine/cmap.bin", converter_dir + "/cmap.bin")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, converter_dir, "x2t")
 

scripts/package_desktop.py

@@ -36,7 +36,7 @@ def s3_upload(files, dst):
 
 def make_windows():
   global package_name, package_version, arch, xp
-  utils.set_cwd("desktop-apps\\win-linux\\package\\windows")
+  utils.set_cwd("desktop-apps\\package")
 
   package_name = branding.desktop_package_name
   package_version = common.version + "." + common.build
@@ -51,13 +51,14 @@ def make_windows():
 
   if common.clean:
     utils.log_h2("desktop clean")
-    utils.delete_dir("DesktopEditors-cache")
-    utils.delete_files("*.exe")
-    utils.delete_files("*.msi")
-    utils.delete_files("*.aic")
-    utils.delete_files("*.tmp")
-    utils.delete_files("*.zip")
-    utils.delete_files("data\\*.exe")
+    utils.delete_dir("build")
+    utils.delete_files("inno\\package.config")
+    utils.delete_files("inno\\*.exe")
+    utils.delete_dir("advinst\\DesktopEditors-cache")
+    utils.delete_files("advinst\\package.config")
+    utils.delete_files("advinst\\*.msi")
+    utils.delete_files("advinst\\*.aic")
+    utils.delete_dir("zip")
 
   if not xp:
     make_prepare()
@@ -65,8 +66,6 @@ def make_windows():
     if branding.onlyoffice:
       make_inno()
       make_inno("standalone")
-      if arch != "arm64":
-        make_inno("update")
       make_advinst()
 
       make_prepare("commercial")
@@ -100,7 +99,7 @@ def make_zip(edition = "opensource"):
   if   edition == "commercial": zip_file = "%s-Enterprise-%s-%s.zip"
   elif edition == "xp":         zip_file = "%s-XP-%s-%s.zip"
   else:                         zip_file = "%s-%s-%s.zip"
-  zip_file = zip_file % (package_name, package_version, arch)
+  zip_file = "zip\\" + zip_file % (package_name, package_version, arch)
   args = [
     "-Version", package_version,
     "-Arch", arch,
@@ -126,7 +125,7 @@ def make_inno(edition = "opensource"):
   elif edition == "update":     inno_file = "%s-Update-%s-%s.exe"
   elif edition == "xp":         inno_file = "%s-XP-%s-%s.exe"
   else:                         inno_file = "%s-%s-%s.exe"
-  inno_file = inno_file % (package_name, package_version, arch)
+  inno_file = "inno\\" + inno_file % (package_name, package_version, arch)
   args = [
     "-Version", package_version,
     "-Arch", arch,
@@ -151,7 +150,7 @@ def make_inno(edition = "opensource"):
 def make_advinst(edition = "opensource"):
   if edition == "commercial": advinst_file = "%s-Enterprise-%s-%s.msi"
   else:                       advinst_file = "%s-%s-%s.msi"
-  advinst_file = advinst_file % (package_name, package_version, arch)
+  advinst_file = "advinst\\" + advinst_file % (package_name, package_version, arch)
   args = [
     "-Version", package_version,
     "-Arch", arch,
@@ -316,7 +315,7 @@ def make_sparkle_updates():
 #
 
 def make_linux():
-  utils.set_cwd("desktop-apps/win-linux/package/linux")
+  utils.set_cwd("desktop-apps/package")
 
   for edition in ["opensource", "commercial"]:
     utils.log_h2("desktop " + edition + " build")
@@ -326,7 +325,7 @@ def make_linux():
     if common.platform == "linux_aarch64":
       make_args += ["-e", "UNAME_M=aarch64"]
     if not branding.onlyoffice:
-      make_args += ["-e", "BRANDING_DIR=../../../../" + common.branding + "/desktop-apps/win-linux/package/linux"]
+      make_args += ["-e", "BRANDING_DIR=../../" + common.branding + "/desktop-apps/package"]
     ret = utils.sh("make clean && make " + " ".join(make_args), verbose=True)
     utils.set_summary("desktop " + edition + " build", ret)
 

scripts/qmake.py

@@ -36,7 +36,7 @@ def make(platform, project, qmake_config_addon="", is_no_errors=False):
     return
 
   old_env = dict(os.environ)
-  
+
   # qt
   qt_dir = base.qt_setup(platform)
   base.set_env("OS_DEPLOY", platform)
@@ -50,7 +50,7 @@ def make(platform, project, qmake_config_addon="", is_no_errors=False):
   if (pro_dir.endswith("/")):
     pro_dir = pro_dir[:-1]
 
-  makefile_name = "Makefile." + get_make_file_suffix(platform) 
+  makefile_name = "Makefile." + get_make_file_suffix(platform)
   makefile = pro_dir + "/" + makefile_name
   stash_file = pro_dir + "/.qmake.stash"
 
@@ -73,6 +73,11 @@ def make(platform, project, qmake_config_addon="", is_no_errors=False):
   # setup ios env
   if (-1 != platform.find("ios")):
     base.hack_xcode_ios()
+    sdk_name = "iphoneos"
+    if qmake_config_addon.find("ios_simulator") != -1:
+      sdk_name = "iphonesimulator"
+    base.set_env("SDK_PATH", base.find_ios_sdk(sdk_name))
+    base.set_env("XCODE_TOOLCHAIN_PATH", base.find_xcode_toolchain(sdk_name))
 
   if base.is_file(makefile):
     base.delete_file(makefile)
@@ -100,16 +105,16 @@ def make(platform, project, qmake_config_addon="", is_no_errors=False):
     if "1" == config.option("use-clang"):
       build_params.append("-spec")
       build_params.append("linux-clang-libc++")
-      
+
     if "" != config.option("sysroot"):
       sysroot_path = config.option("sysroot_" + platform)
       os.environ['QMAKE_CUSTOM_SYSROOT'] = sysroot_path
       os.environ['QMAKE_CUSTOM_SYSROOT_BIN'] = config.get_custom_sysroot_bin(platform)
       os.environ['PKG_CONFIG_PATH'] = config.get_custom_sysroot_lib(platform, True) + "/pkgconfig"
       os.environ['PKG_CONFIG_SYSROOT_DIR'] = sysroot_path
-      
+
     base.cmd_exe(qmake_app, build_params)
-    
+
     if "" != config.option("sysroot"):
       base.set_sysroot_env(platform)
 

sln.json

@@ -33,6 +33,8 @@
 
     "core/DesktopEditor/doctrenderer/doctrenderer.pro",
 
+    "core/DesktopEditor/xmlsec/src/ooxmlsignature.pro",
+
     "[!no_x2t]core/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro",
     "[!no_x2t]core/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro",
     "[!no_x2t]core/OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro",
@@ -86,8 +88,6 @@
     "core",
     "multimedia",
 
-    "core/DesktopEditor/xmlsec/src/ooxmlsignature.pro",
-
     "desktop-sdk/ChromiumBasedEditors/lib/ascdocumentscore.pro",
     "desktop-sdk/ChromiumBasedEditors/lib/ascdocumentscore_helper.pro",