test

Author: abrisco

krita/private/toolchain_repo.bzl

@@ -10,24 +10,24 @@ KRITA_DEFAULT_VERSION = "5.2.6"
 KRITA_VERSIONS = _KRITA_VERSIONS
 
 KRITA_PATHS = {
-    "linux_x86_64": "krita",
+    "linux_x86_64": "usr/bin/krita",
     "macos_aarch64": "krita.app/Contents/MacOS/krita",
     "macos_x86_64": "krita.app/Contents/MacOS/krita",
     "windows_x86_64": "krita.exe",
 }
 
 KRITARUNNER_PATHS = {
-    "linux_x86_64": "kritarunner",
+    "linux_x86_64": "usr/bin/kritarunner",
     "macos_aarch64": "krita.app/Contents/MacOS/kritarunner",
     "macos_x86_64": "krita.app/Contents/MacOS/kritarunner",
     "windows_x86_64": "kritarunner.exe",
 }
 
 KRITA_STRIP_PREFIX = {
-    "linux_x86_64": "krita-{version}",
+    "linux_x86_64": "",
     "macos_aarch64": "",
     "macos_x86_64": "",
-    "windows_x86_64": "",
+    "windows_x86_64": "krita-x64-{version}",
 }
 
 CONSTRAINTS = {
@@ -45,11 +45,15 @@ load("@rules_venv//python:py_library.bzl", "py_library")
 DATA = glob(
     include = ["**"],
     exclude = [
-        "WORKSPACE",
-        "BUILD",
+        ".DirIcon",
         "*.bazel",
+        "*.desktop",
         "**/*:*",
+        "AppRun",
+        "BUILD",
+        "krita.png",
         "Terms Of Use/**",
+        "WORKSPACE",
     ],
 )
 
@@ -94,7 +98,7 @@ alias(
 """
 
 _PYKRITA_PLATFORM_IMPORT = {
-    "linux_x86_64": "{major_minor}/scripts/modules",
+    "linux_x86_64": "usr/lib/krita-python-libs",
     "macos_aarch64": "Krita.app/Contents/Resources",
     "macos_x86_64": "Krita.app/Contents/Resources",
     "windows_x86_64": "lib/krita-python-libs",
@@ -145,7 +149,7 @@ def krita_tools_repository(*, name, version, platform, urls, integrity, **kwargs
     py_imports = [py_import]
     py_srcs_glob_template = "{}/krita/**/*.py"
     py_data_glob_template = "{}/krita/**/*.{}"
-    if "windows" in platform:
+    if "macos" not in platform:
         py_srcs_glob_template = "{}/**/*.py"
         py_data_glob_template = "{}/**/{}"
     py_srcs_globs = [py_srcs_glob_template.format(py_import)]
@@ -188,7 +192,6 @@ def krita_tools_repository(*, name, version, platform, urls, integrity, **kwargs
         ]
     ]
 
-    print(urls)
     archive_rule(
         name = name,
         urls = urls,

tools/http_appimage/http_appimage.bzl

@@ -44,7 +44,7 @@ def _extract_appimage(
 
     temp_out_dir = repository_ctx.path("squashfs-root")
 
-    command = [appimage, "--appimage-extract", temp_out_dir]
+    command = [appimage, "--appimage-extract"]
     result = repository_ctx.execute(command)
     if result.return_code != 0:
         fail("appimage command failed with exit code {}\n{}\n\nstdout:\n{}\nstderr:\n{}".format(