Changeset 259863 in webkit

Timestamp:

Apr 10, 2020, 4:04:47 AM (6 years ago)

Author:

Philippe Normand

Message:

[Flatpak SDK] Generate one IceCC archive per toolchain
​https://bugs.webkit.org/show_bug.cgi?id=210189

Reviewed by Žan Doberšek.

Add a utility option to webkit-flatpak so it regenerated
toolchains without needing a full SDK reinstall. Also we now
generate a self-contained toolchain archive embedding GCC and one
embedding CLang.

• flatpak/flatpakutils.py:

(WebkitFlatpak.load_from_args):
(WebkitFlatpak.init):
(WebkitFlatpak.run_in_sandbox):
(WebkitFlatpak.setup_icecc):
(WebkitFlatpak.setup_dev_env):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-10  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Generate one IceCC archive per toolchain
+        https://bugs.webkit.org/show_bug.cgi?id=210189
+
+        Reviewed by Žan Doberšek.
+
+        Add a utility option to webkit-flatpak so it regenerated
+        toolchains without needing a full SDK reinstall. Also we now
+        generate a self-contained toolchain archive embedding GCC and one
+        embedding CLang.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.load_from_args):
+        (WebkitFlatpak.__init__):
+        (WebkitFlatpak.run_in_sandbox):
+        (WebkitFlatpak.setup_icecc):
+        (WebkitFlatpak.setup_dev_env):
+
 2020-04-10  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -394 +394 @@
         general.add_argument('--available', action='store_true', dest="check_available", help='Check if required dependencies are available.'),
         general.add_argument("--use-icecream", dest="use_icecream", help="Use the distributed icecream (icecc) compiler.", action="store_true")
+        general.add_argument("-r", "--regenerate-toolchains", dest="regenerate_toolchains", action="store_true",
+                             help="Regenerate IceCC distribuable toolchain archives")
 
         debugoptions = parser.add_argument_group("Debugging")
@@ -445 +447 @@
 
         self.use_icecream = False
-        self.icc_version = None
+        self.icc_version = {}
+        self.regenerate_toolchains = False
 
     def execute_command(self, args, stdout=None, stderr=None):
@@ -486 +489 @@
         self.flatpak_build_path = os.environ["FLATPAK_USER_DIR"]
 
-        build_root = os.path.join(self.source_root, 'WebKitBuild')
-        self.build_path = os.path.join(build_root, self.platform, self.build_type)
+        self.build_root = os.path.join(self.source_root, 'WebKitBuild')
+        self.build_path = os.path.join(self.build_root, self.platform, self.build_type)
         self.config_file = os.path.join(self.flatpak_build_path, 'webkit_flatpak_config.json')
 
@@ -536 +539 @@
 
         gst_builddir = os.path.join(self.sandbox_source_root, "WebKitBuild", 'gst-build')
-        if not os.path.exists(os.path.join(self.source_root, 'WebKitBuild', 'gst-build', 'build.ninja')):
+        if not os.path.exists(os.path.join(self.build_root, 'gst-build', 'build.ninja')):
             if not building:
                 raise RuntimeError('Trying to enter gst-build env from %s but it is not built, make sure to rebuild webkit.' % gst_dir)
@@ -688 +691 @@
             flatpak_command.append(share_network_option)
 
-        if self.use_icecream:
+        if self.use_icecream and not self.regenerate_toolchains:
             _log.debug('Enabling the icecream compiler')
             if share_network_option not in flatpak_command:
@@ -696 +699 @@
             n_cores = multiprocessing.cpu_count() * 3
             _log.debug('Following icecream recommendation for the number of cores to use: %d' % n_cores)
+            toolchain_name = os.environ.get("CC", "gcc")
+            toolchain_path = self.icc_version[toolchain_name]
+            if not os.path.isfile(toolchain_path):
+                Console.error_message("%s is not a valid IceCC toolchain. Please run webkit-flatpak -r")
+                return 1
             forwarded.update({
                 "CCACHE_PREFIX": "icecc",
-                "ICECC_VERSION": self.icc_version,
+                "ICECC_VERSION": toolchain_path,
                 "NUMBER_OF_PROCESSORS": n_cores,
             })
@@ -758 +766 @@
             json.dump(json_config, config)
 
-    def setup_icecc(self):
+    def setup_icecc(self, name):
         with tempfile.NamedTemporaryFile() as tmpfile:
-            self.run_in_sandbox('icecc', '--build-native', stdout=tmpfile, cwd=self.source_root)
+            toolchain_path = "/usr/bin/%s" % name
+            self.run_in_sandbox('icecc', '--build-native', toolchain_path, stdout=tmpfile, cwd=self.source_root)
             tmpfile.flush()
             tmpfile.seek(0)
             icc_version_filename, = re.findall(r'.*creating (.*)', tmpfile.read())
-            self.icc_version = os.path.join(self.source_root, icc_version_filename)
+            toolchains_directory = os.path.join(self.build_root, "Toolchains")
+            if not os.path.isdir(toolchains_directory):
+                os.makedirs(toolchains_directory)
+            archive_filename = os.path.join(toolchains_directory, "webkit-sdk-%s-%s" % (name, icc_version_filename))
+            os.rename(icc_version_filename, archive_filename)
+            self.icc_version[name] = archive_filename
+            Console.message("Created %s self-contained toolchain archive", archive_filename)
 
     def setup_dev_env(self):
         if not os.path.exists(os.path.join(self.flatpak_build_path, "runtime", "org.webkit.Sdk")) or self.update:
             self.install_all()
-            if self.use_icecream:
-                self.setup_icecc()
+            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()