diff --git a/tools/cefbuilds/cef_json_builder.py b/tools/cefbuilds/cef_json_builder.py index 2ac6eb4ff..5edc12afa 100644 --- a/tools/cefbuilds/cef_json_builder.py +++ b/tools/cefbuilds/cef_json_builder.py @@ -99,13 +99,14 @@ class cef_json_builder: @staticmethod def get_platforms(): """ Returns the list of supported platforms. """ - return ('linux32', 'linux64', 'linuxarm', 'linuxarm64', 'macosarm64', 'macosx64', - 'windows32', 'windows64', 'windowsarm64') + return ('linux32', 'linux64', 'linuxarm', 'linuxarm64', 'macosarm64', + 'macosx64', 'windows32', 'windows64', 'windowsarm64') @staticmethod def get_distrib_types(): """ Returns the list of supported distribution types. """ - return ('standard', 'minimal', 'client', 'release_symbols', 'debug_symbols') + return ('standard', 'minimal', 'client', 'tools', 'release_symbols', + 'debug_symbols') @staticmethod def is_valid_version(version): @@ -360,6 +361,11 @@ class cef_json_builder: type = 'client' del name_parts[-1] + # Might be '__tools'. + if name_parts[-1] == 'tools': + type = 'tools' + del name_parts[-1] + # Might be '__beta'. if name_parts[-1] == 'beta': del name_parts[-1] diff --git a/tools/cefbuilds/cef_json_builder_example.py b/tools/cefbuilds/cef_json_builder_example.py index 2033775cd..f9468b1af 100644 --- a/tools/cefbuilds/cef_json_builder_example.py +++ b/tools/cefbuilds/cef_json_builder_example.py @@ -52,10 +52,11 @@ def make_fake_file_info(platform, version, type): def create_fake_files(platform, version): files = [] - # All platforms create standard, minimal and client distributions. + # All platforms create standard, minimal, client and tools distributions. files.append(make_fake_file_info(platform, version, 'standard')) files.append(make_fake_file_info(platform, version, 'minimal')) files.append(make_fake_file_info(platform, version, 'client')) + files.append(make_fake_file_info(platform, version, 'tools')) # Windows and OS X platforms create debug and release symbols. if platform.find('windows') == 0 or platform.find('macosx') == 0: diff --git a/tools/cefbuilds/cef_json_builder_test.py b/tools/cefbuilds/cef_json_builder_test.py index f8080d8ea..db348a761 100644 --- a/tools/cefbuilds/cef_json_builder_test.py +++ b/tools/cefbuilds/cef_json_builder_test.py @@ -152,6 +152,10 @@ class TestCefJSONBuilder(unittest.TestCase): def test_add_client_file(self): self._test_add_file('client') + # Test add/get of a tools type file. + def test_add_tools_file(self): + self._test_add_file('tools') + # Test add/get of a debug_symbols type file. def test_add_debug_symbols_file(self): self._test_add_file('debug_symbols') @@ -172,6 +176,10 @@ class TestCefJSONBuilder(unittest.TestCase): def test_add_client_file_beta(self): self._test_add_file('client', channel='beta') + # Test add/get of a tools type file in beta channel. + def test_add_tools_file_beta(self): + self._test_add_file('tools', channel='beta') + # Test add/get of a debug_symbols type file in beta channel. def test_add_debug_symbols_file_beta(self): self._test_add_file('debug_symbols', channel='beta')