Changeset 260747 in webkit

Timestamp:

Apr 27, 2020 3:00:24 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[Flatpak SDK] Regenerate toolchains only if new updates were downloaded
​https://bugs.webkit.org/show_bug.cgi?id=210804

Patch by Philippe Normand <​pnormand@igalia.com> on 2020-04-27
Reviewed by Žan Doberšek.

The SDK toolchain archives are now regenerated only if an actual
update was downloaded from the Flatpak repository. Some redundant
flatpak calls were removed as well, such as the GL extension and
Debug reinstalls that were happening during webkit-flatpak
updates.

• flatpak/flatpakutils.py:

(FlatpakObject.flatpak):
(FlatpakRepo.init):
(WebkitFlatpak.main):
(WebkitFlatpak.setup_dev_env):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (7 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-27  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Regenerate toolchains only if new updates were downloaded
+        https://bugs.webkit.org/show_bug.cgi?id=210804
+
+        Reviewed by Žan Doberšek.
+
+        The SDK toolchain archives are now regenerated only if an actual
+        update was downloaded from the Flatpak repository. Some redundant
+        flatpak calls were removed as well, such as the GL extension and
+        Debug reinstalls that were happening during webkit-flatpak
+        updates.
+
+        * flatpak/flatpakutils.py:
+        (FlatpakObject.flatpak):
+        (FlatpakRepo.__init__):
+        (WebkitFlatpak.main):
+        (WebkitFlatpak.setup_dev_env):
+
 2020-04-27  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -157 +157 @@
         show_output = kwargs.pop("show_output", False)
         comment = kwargs.pop("comment", None)
+        gather_output = kwargs.get("gather_output", False)
         if comment:
             Console.message(comment)
 
         command = ["flatpak", command]
-        res = subprocess.check_output(command + ["--help"]).decode("utf-8")
-        if self.user and "--user" in res:
+        help_output = subprocess.check_output(command + ["--help"]).decode("utf-8")
+        if self.user and "--user" in help_output:
             command.append("--user")
-        if "--assumeyes" in res:
+        if "--assumeyes" in help_output:
             command.append("--assumeyes")
+        if "--noninteractive" and gather_output:
+            command.append("--noninteractive")
+
         command.extend(args)
 
@@ -172 +176 @@
             return subprocess.check_output(command).decode("utf-8")
 
-        return subprocess.check_call(command)
+        if not gather_output:
+            return subprocess.check_call(command)
+        else:
+            p = subprocess.Popen(command, stdout=subprocess.PIPE)
+            output = p.communicate()
+            return output
 
 
@@ -273 +282 @@
 
         self._app_registry = {}
-        output = self.flatpak("list", "--columns=application,branch,origin")
+        output = self.flatpak("list", "--columns=application,branch", "-a")
         for line in output.splitlines():
-            name, branch, origin = line.split("\t")
-            if origin != self.name:
-                continue
+            name, branch = line.split("\t")
             self._app_registry[name] = branch
 
@@ -762 +769 @@
         if self.update:
             repo = self.sdk_repo
-            repo.flatpak("update", show_output=True, comment="Updating Flatpak %s environment" % self.build_type)
+            update_output = repo.flatpak("update", gather_output=True, comment="Updating Flatpak %s environment" % self.build_type)
+            regenerate_toolchains = update_output.find("Nothing to do") == -1
+
             for package in self._get_packages():
                 if package.name.startswith("org.webkit") and repo.is_app_installed(package.name) \
@@ -769 +778 @@
                     shutil.rmtree(self.flatpak_build_path)
                     self._reset_repository()
+                    regenerate_toolchains = True
                     break
                 elif not repo.is_app_installed(package.name):
                     package.install()
+                    regenerate_toolchains = True
+        else:
+            regenerate_toolchains = self.regenerate_toolchains
+
+        if regenerate_toolchains:
+            self.icc_version = {}
+            self.setup_icecc("gcc")
+            self.setup_icecc("clang")
+            self.save_config()
 
         return self.setup_dev_env()
@@ -810 +829 @@
         if not os.path.exists(os.path.join(self.flatpak_build_path, "runtime", "org.webkit.Sdk")) or self.update:
             self.install_all()
-            regenerate_toolchains = True
-        else:
-            regenerate_toolchains = self.regenerate_toolchains
-
-        if regenerate_toolchains:
-            self.icc_version = {}
-            self.setup_icecc("gcc")
-            self.setup_icecc("clang")
-            self.save_config()
 
         if not self.update:
@@ -834 +844 @@
 
             return self.run_in_sandbox(*self.user_command)
-        elif not self.update and not self.build_gst:
+        elif not self.update and not self.build_gst and not self.regenerate_toolchains:
             return self.run_in_sandbox()