Skip to content

Commit

Permalink
Rename font-subset to font_subset. (flutter#49051)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
matanlurey authored Dec 14, 2023
1 parent 765ba27 commit 47e5480
Show file tree
Hide file tree
Showing 22 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ group("flutter") {
public_deps += [
"//flutter/shell/testing",
"//flutter/tools/const_finder",
"//flutter/tools/font-subset",
"//flutter/tools/font_subset",
]
}

Expand Down
2 changes: 1 addition & 1 deletion ci/builders/linux_arm_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
Expand Down
2 changes: 1 addition & 1 deletion ci/builders/linux_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion ci/builders/linux_unopt.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions ci/builders/mac_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
Expand Down Expand Up @@ -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"
]
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
]
Expand Down
2 changes: 1 addition & 1 deletion ci/builders/windows_arm_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ci/builders/windows_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion testing/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
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'

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/font-subset/BUILD.gn → tools/font_subset/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 47e5480

Please sign in to comment.