Skip to content
This repository has been archived by the owner on Feb 25, 2025. It is now read-only.

Rename font-subset to font_subset. #49051

Merged
merged 2 commits into from
Dec 14, 2023
Merged

Rename font-subset to font_subset. #49051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
779f926
Reapply.
matanlurey Dec 14, 2023
3029fff
++
matanlurey Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BUILD.gn
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 @@ -174,7 +174,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 @@ -233,7 +233,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 @@ -328,7 +328,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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
0 tools/font-subset/.gitignore → tools/font_subset/.gitignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/font-subset/BUILD.gn → tools/font_subset/BUILD.gn
View file
Open in desktop
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
0 tools/font-subset/fixtures/1.ttf → tools/font_subset/fixtures/1.ttf
View file
Open in desktop
File renamed without changes.
0 tools/font-subset/fixtures/1variable.ttf → tools/font_subset/fixtures/1variable.ttf
View file
Open in desktop
File renamed without changes.
0 tools/font-subset/fixtures/2.ttf → tools/font_subset/fixtures/2.ttf
View file
Open in desktop
File renamed without changes.
0 tools/font-subset/fixtures/2variable.ttf → tools/font_subset/fixtures/2variable.ttf
View file
Open in desktop
File renamed without changes.
0 tools/font-subset/fixtures/3.ttf → tools/font_subset/fixtures/3.ttf
View file
Open in desktop
File renamed without changes.
0 tools/font-subset/fixtures/3variable.ttf → tools/font_subset/fixtures/3variable.ttf
View file
Open in desktop
File renamed without changes.
0 ...subset/fixtures/MaterialIcons-Regular.ttf → ...subset/fixtures/MaterialIcons-Regular.ttf
View file
Open in desktop
File renamed without changes.
0 ...set/fixtures/MaterialSymbols-Variable.ttf → ...set/fixtures/MaterialSymbols-Variable.ttf
View file
Open in desktop
File renamed without changes.
0 tools/font-subset/gen/.gitkeep → tools/font_subset/gen/.gitkeep
View file
Open in desktop
File renamed without changes.
0 tools/font-subset/hb_wrappers.h → tools/font_subset/hb_wrappers.h
View file
Open in desktop
File renamed without changes.
0 tools/font-subset/main.cc → tools/font_subset/main.cc
View file
Open in desktop
File renamed without changes.
0 tools/font-subset/test.py → tools/font_subset/test.py
View file
Open in desktop
File renamed without changes.