From 2ecbd2ff7d480ac234eb3b91adee8b4c0628058c Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 14 Dec 2023 15:16:09 -0800 Subject: [PATCH] Rename `font-subset` to `font_subset`. (flutter/engine#49051) For consistency, I don't think we have any other tools with `-`'s. I'll be honest - this seemed easier than teaching the header guard tool how to handle `-`'s in directory names, but if you feel strongly about it I can revert. --- engine/src/flutter/BUILD.gn | 2 +- .../flutter/ci/builders/linux_arm_host_engine.json | 2 +- .../src/flutter/ci/builders/linux_host_engine.json | 2 +- engine/src/flutter/ci/builders/linux_unopt.json | 2 +- engine/src/flutter/ci/builders/mac_host_engine.json | 8 ++++---- .../ci/builders/windows_arm_host_engine.json | 2 +- .../flutter/ci/builders/windows_host_engine.json | 2 +- engine/src/flutter/testing/run_tests.py | 2 +- .../tools/{font-subset => font_subset}/.gitignore | 0 .../tools/{font-subset => font_subset}/BUILD.gn | 2 +- .../{font-subset => font_subset}/fixtures/1.ttf | Bin .../fixtures/1variable.ttf | Bin .../{font-subset => font_subset}/fixtures/2.ttf | Bin .../fixtures/2variable.ttf | Bin .../{font-subset => font_subset}/fixtures/3.ttf | Bin .../fixtures/3variable.ttf | Bin .../fixtures/MaterialIcons-Regular.ttf | Bin .../fixtures/MaterialSymbols-Variable.ttf | Bin .../tools/{font-subset => font_subset}/gen/.gitkeep | 0 .../{font-subset => font_subset}/hb_wrappers.h | 0 .../tools/{font-subset => font_subset}/main.cc | 0 .../tools/{font-subset => font_subset}/test.py | 0 22 files changed, 12 insertions(+), 12 deletions(-) rename engine/src/flutter/tools/{font-subset => font_subset}/.gitignore (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/BUILD.gn (98%) rename engine/src/flutter/tools/{font-subset => font_subset}/fixtures/1.ttf (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/fixtures/1variable.ttf (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/fixtures/2.ttf (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/fixtures/2variable.ttf (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/fixtures/3.ttf (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/fixtures/3variable.ttf (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/fixtures/MaterialIcons-Regular.ttf (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/fixtures/MaterialSymbols-Variable.ttf (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/gen/.gitkeep (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/hb_wrappers.h (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/main.cc (100%) rename engine/src/flutter/tools/{font-subset => font_subset}/test.py (100%) diff --git a/engine/src/flutter/BUILD.gn b/engine/src/flutter/BUILD.gn index 10c84c6da6a..fd0073127c4 100644 --- a/engine/src/flutter/BUILD.gn +++ b/engine/src/flutter/BUILD.gn @@ -114,7 +114,7 @@ group("flutter") { public_deps += [ "//flutter/shell/testing", "//flutter/tools/const_finder", - "//flutter/tools/font-subset", + "//flutter/tools/font_subset", ] } diff --git a/engine/src/flutter/ci/builders/linux_arm_host_engine.json b/engine/src/flutter/ci/builders/linux_arm_host_engine.json index 2c85d9b84a6..c2cb264b24a 100644 --- a/engine/src/flutter/ci/builders/linux_arm_host_engine.json +++ b/engine/src/flutter/ci/builders/linux_arm_host_engine.json @@ -70,7 +70,7 @@ "targets": [ "flutter/build/archives:artifacts", "flutter/build/archives:dart_sdk_archive", - "flutter/tools/font-subset", + "flutter/tools/font_subset", "flutter/shell/platform/linux:flutter_gtk" ] } diff --git a/engine/src/flutter/ci/builders/linux_host_engine.json b/engine/src/flutter/ci/builders/linux_host_engine.json index 23fa252dc4e..cd612ae28a8 100644 --- a/engine/src/flutter/ci/builders/linux_host_engine.json +++ b/engine/src/flutter/ci/builders/linux_host_engine.json @@ -103,7 +103,7 @@ "flutter/build/archives:embedder", "flutter/build/archives:flutter_patched_sdk", "flutter/build/dart:copy_dart_sdk", - "flutter/tools/font-subset" + "flutter/tools/font_subset" ] }, "tests": [ diff --git a/engine/src/flutter/ci/builders/linux_unopt.json b/engine/src/flutter/ci/builders/linux_unopt.json index bdc93f08164..78db15b09e0 100644 --- a/engine/src/flutter/ci/builders/linux_unopt.json +++ b/engine/src/flutter/ci/builders/linux_unopt.json @@ -21,7 +21,7 @@ "ninja": { "config": "host_debug_unopt", "targets": [ - "flutter/tools/font-subset", + "flutter/tools/font_subset", "flutter:unittests", "flutter/build/dart:copy_dart_sdk", "flutter/shell/platform/common/client_wrapper:client_wrapper_unittests", diff --git a/engine/src/flutter/ci/builders/mac_host_engine.json b/engine/src/flutter/ci/builders/mac_host_engine.json index 8642c1b3e82..6e4aa33e6b9 100644 --- a/engine/src/flutter/ci/builders/mac_host_engine.json +++ b/engine/src/flutter/ci/builders/mac_host_engine.json @@ -41,7 +41,7 @@ "flutter/build/archives:flutter_embedder_framework", "flutter/build/dart:copy_dart_sdk", "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework", - "flutter/tools/font-subset", + "flutter/tools/font_subset", "flutter:unittests" ] }, @@ -170,7 +170,7 @@ "flutter/build/dart:copy_dart_sdk", "flutter/impeller/golden_tests:impeller_golden_tests", "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework", - "flutter/tools/font-subset", + "flutter/tools/font_subset", "flutter:unittests" ] }, @@ -227,7 +227,7 @@ "ninja": { "config": "mac_debug_arm64", "targets": [ - "flutter/tools/font-subset", + "flutter/tools/font_subset", "flutter/build/archives:archive_gen_snapshot", "flutter/build/archives:artifacts", "flutter/build/archives:dart_sdk_archive", @@ -318,7 +318,7 @@ "ninja": { "config": "mac_release_arm64", "targets": [ - "flutter/tools/font-subset", + "flutter/tools/font_subset", "flutter/build/archives:artifacts", "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework" ] diff --git a/engine/src/flutter/ci/builders/windows_arm_host_engine.json b/engine/src/flutter/ci/builders/windows_arm_host_engine.json index 8fad758cc73..406533a6d6f 100644 --- a/engine/src/flutter/ci/builders/windows_arm_host_engine.json +++ b/engine/src/flutter/ci/builders/windows_arm_host_engine.json @@ -37,7 +37,7 @@ "targets": [ "flutter/build/archives:artifacts", "flutter/build/archives:embedder", - "flutter/tools/font-subset", + "flutter/tools/font_subset", "flutter/build/archives:dart_sdk_archive", "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive", "flutter/build/archives:windows_flutter" diff --git a/engine/src/flutter/ci/builders/windows_host_engine.json b/engine/src/flutter/ci/builders/windows_host_engine.json index 12c4542b854..1a9903e22cb 100644 --- a/engine/src/flutter/ci/builders/windows_host_engine.json +++ b/engine/src/flutter/ci/builders/windows_host_engine.json @@ -36,7 +36,7 @@ "flutter:unittests", "flutter/build/archives:artifacts", "flutter/build/archives:embedder", - "flutter/tools/font-subset", + "flutter/tools/font_subset", "flutter/build/archives:dart_sdk_archive", "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive", "flutter/build/archives:windows_flutter" diff --git a/engine/src/flutter/testing/run_tests.py b/engine/src/flutter/testing/run_tests.py index 3e24850ba75..0a3cf277cf7 100755 --- a/engine/src/flutter/testing/run_tests.py +++ b/engine/src/flutter/testing/run_tests.py @@ -39,7 +39,7 @@ FONTS_DIR = os.path.join( BUILDROOT_DIR, 'flutter', 'third_party', 'txt', 'third_party', 'fonts' ) ROBOTO_FONT_PATH = os.path.join(FONTS_DIR, 'Roboto-Regular.ttf') -FONT_SUBSET_DIR = os.path.join(BUILDROOT_DIR, 'flutter', 'tools', 'font-subset') +FONT_SUBSET_DIR = os.path.join(BUILDROOT_DIR, 'flutter', 'tools', 'font_subset') ENCODING = 'UTF-8' diff --git a/engine/src/flutter/tools/font-subset/.gitignore b/engine/src/flutter/tools/font_subset/.gitignore similarity index 100% rename from engine/src/flutter/tools/font-subset/.gitignore rename to engine/src/flutter/tools/font_subset/.gitignore diff --git a/engine/src/flutter/tools/font-subset/BUILD.gn b/engine/src/flutter/tools/font_subset/BUILD.gn similarity index 98% rename from engine/src/flutter/tools/font-subset/BUILD.gn rename to engine/src/flutter/tools/font_subset/BUILD.gn index db8fd7f434f..ef202a6f938 100644 --- a/engine/src/flutter/tools/font-subset/BUILD.gn +++ b/engine/src/flutter/tools/font_subset/BUILD.gn @@ -35,7 +35,7 @@ generated_file("font_entitlement_config") { deps = [ ":_font-subset" ] } -zip_bundle("font-subset") { +zip_bundle("font_subset") { if (is_mac) { # Mac artifacts sometimes use mac and sometimes darwin. Standardizing the # names will require changes in the list of artifacts the tool is downloading. diff --git a/engine/src/flutter/tools/font-subset/fixtures/1.ttf b/engine/src/flutter/tools/font_subset/fixtures/1.ttf similarity index 100% rename from engine/src/flutter/tools/font-subset/fixtures/1.ttf rename to engine/src/flutter/tools/font_subset/fixtures/1.ttf diff --git a/engine/src/flutter/tools/font-subset/fixtures/1variable.ttf b/engine/src/flutter/tools/font_subset/fixtures/1variable.ttf similarity index 100% rename from engine/src/flutter/tools/font-subset/fixtures/1variable.ttf rename to engine/src/flutter/tools/font_subset/fixtures/1variable.ttf diff --git a/engine/src/flutter/tools/font-subset/fixtures/2.ttf b/engine/src/flutter/tools/font_subset/fixtures/2.ttf similarity index 100% rename from engine/src/flutter/tools/font-subset/fixtures/2.ttf rename to engine/src/flutter/tools/font_subset/fixtures/2.ttf diff --git a/engine/src/flutter/tools/font-subset/fixtures/2variable.ttf b/engine/src/flutter/tools/font_subset/fixtures/2variable.ttf similarity index 100% rename from engine/src/flutter/tools/font-subset/fixtures/2variable.ttf rename to engine/src/flutter/tools/font_subset/fixtures/2variable.ttf diff --git a/engine/src/flutter/tools/font-subset/fixtures/3.ttf b/engine/src/flutter/tools/font_subset/fixtures/3.ttf similarity index 100% rename from engine/src/flutter/tools/font-subset/fixtures/3.ttf rename to engine/src/flutter/tools/font_subset/fixtures/3.ttf diff --git a/engine/src/flutter/tools/font-subset/fixtures/3variable.ttf b/engine/src/flutter/tools/font_subset/fixtures/3variable.ttf similarity index 100% rename from engine/src/flutter/tools/font-subset/fixtures/3variable.ttf rename to engine/src/flutter/tools/font_subset/fixtures/3variable.ttf diff --git a/engine/src/flutter/tools/font-subset/fixtures/MaterialIcons-Regular.ttf b/engine/src/flutter/tools/font_subset/fixtures/MaterialIcons-Regular.ttf similarity index 100% rename from engine/src/flutter/tools/font-subset/fixtures/MaterialIcons-Regular.ttf rename to engine/src/flutter/tools/font_subset/fixtures/MaterialIcons-Regular.ttf diff --git a/engine/src/flutter/tools/font-subset/fixtures/MaterialSymbols-Variable.ttf b/engine/src/flutter/tools/font_subset/fixtures/MaterialSymbols-Variable.ttf similarity index 100% rename from engine/src/flutter/tools/font-subset/fixtures/MaterialSymbols-Variable.ttf rename to engine/src/flutter/tools/font_subset/fixtures/MaterialSymbols-Variable.ttf diff --git a/engine/src/flutter/tools/font-subset/gen/.gitkeep b/engine/src/flutter/tools/font_subset/gen/.gitkeep similarity index 100% rename from engine/src/flutter/tools/font-subset/gen/.gitkeep rename to engine/src/flutter/tools/font_subset/gen/.gitkeep diff --git a/engine/src/flutter/tools/font-subset/hb_wrappers.h b/engine/src/flutter/tools/font_subset/hb_wrappers.h similarity index 100% rename from engine/src/flutter/tools/font-subset/hb_wrappers.h rename to engine/src/flutter/tools/font_subset/hb_wrappers.h diff --git a/engine/src/flutter/tools/font-subset/main.cc b/engine/src/flutter/tools/font_subset/main.cc similarity index 100% rename from engine/src/flutter/tools/font-subset/main.cc rename to engine/src/flutter/tools/font_subset/main.cc diff --git a/engine/src/flutter/tools/font-subset/test.py b/engine/src/flutter/tools/font_subset/test.py similarity index 100% rename from engine/src/flutter/tools/font-subset/test.py rename to engine/src/flutter/tools/font_subset/test.py