Don't build unnecessary ICU4X components (#867)

dart-lang · Aug 14, 2024 · 519f0ff · 519f0ff
1 parent 1fb3117
commit 519f0ff
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/intl4x.yml b/.github/workflows/intl4x.yml
@@ -118,7 +118,7 @@ jobs:
  cd ffi/dart
  dart pub get
  cd ../..
- dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic default_components,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
 
  - name: Build Mac
  if: matrix.os == 'macos-latest'
@@ -130,7 +130,7 @@ jobs:
  cd ffi/dart
  dart pub get
  cd ../..
- dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic default_components,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
 
  - name: Build Windows
  if: matrix.os == 'windows-latest'
@@ -142,7 +142,7 @@ jobs:
  cd ffi/dart
  dart pub get
  cd ../..
- dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic default_components,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
 
  - run: echo "LOCAL_ICU4X_BINARY=$(realpath submodules/icu4x/bin/linux_x64)" >> $GITHUB_ENV
  if: matrix.os == 'ubuntu-latest'

diff --git a/.github/workflows/intl4x_artifacts.yml b/.github/workflows/intl4x_artifacts.yml
@@ -65,14 +65,14 @@ jobs:
  cd ffi/dart
  dart pub get
  cd ../..
- dart run ffi/dart/tool/build_libs.dart bin/android_arm android_arm dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/android_arm64 android_arm64 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/android_ia32 android_ia32 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/android_x64 android_x64 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/linux_arm linux_arm dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/linux_arm64 linux_arm64 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/linux_riscv64 linux_riscv64 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic default_components,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/android_arm android_arm dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/android_arm64 android_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/android_ia32 android_ia32 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/android_x64 android_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/linux_arm linux_arm dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/linux_arm64 linux_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/linux_riscv64 linux_riscv64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
 
  cargo run -p icu_datagen -- --locales full --keys all --format blob --out bin/full.postcard
 
@@ -99,11 +99,11 @@ jobs:
  cd ffi/dart
  dart pub get
  cd ../..
- dart run ffi/dart/tool/build_libs.dart bin/ios_arm ios_arm dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/ios_arm64 ios_arm64 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/ios_x64 ios_x64 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/macos_x64 macos_x64 dynamic default_components,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/ios_arm ios_arm dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/ios_arm64 ios_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/ios_x64 ios_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/macos_x64 macos_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
 
  cd provider/datagen # avoid global feature resolution
  rustup target add aarch64-apple-darwin
@@ -125,9 +125,9 @@ jobs:
  cd ffi/dart
  dart pub get
  cd ../..
- dart run ffi/dart/tool/build_libs.dart bin/windows_arm64 windows_arm64 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/windows_ia32 windows_ia32 dynamic default_components,experimental_components
- dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic default_components,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/windows_arm64 windows_arm64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/windows_ia32 windows_ia32 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
+ dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals,experimental_components
 
  cd provider/datagen # avoid global feature resolution
  rustup target add aarch64-pc-windows-msvc

diff --git a/pkgs/intl4x/hook/build.dart b/pkgs/intl4x/hook/build.dart
@@ -189,15 +189,15 @@ Future<Uri> buildLib(BuildConfig config, String workingDirectory) async {
  final tempDir = await Directory.systemTemp.createTemp();
 
  final stdFeatures = [
- 'default_components',
+ 'icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals',
  'compiled_data',
  'buffer_provider',
  'logging',
  'simple_logger',
  'experimental_components',
  ];
  final noStdFeatures = [
- 'default_components',
+ 'icu_collator,icu_datetime,icu_list,icu_decimal,icu_plurals',
  'compiled_data',
  'buffer_provider',
  'libc-alloc',