Baked data for FFI examples (#3630)

unicode-org · Jul 5, 2023 · 350b598 · 350b598
1 parent 67ff684
commit 350b598
Show file tree

Hide file tree

Showing 18 changed files with 109 additions and 169 deletions.
diff --git a/.github/workflows/artifacts-build.yml b/.github/workflows/artifacts-build.yml
@@ -158,11 +158,7 @@ jobs:
     - name: Init node package
       run: |
         cd ffi/diplomat/js/examples/node
-        make lib
-        make icu_capi.wasm
-        # Manually running datagen with the required keys
-        cargo run -p icu_datagen -- --key-file ../wasm-demo/required-keys.txt --locales full --format blob --out data.postcard
-        cd ../wasm-demo
+        make
         npm ci
 
     - name: Run Webpack

diff --git a/components/locid_transform/src/provider/mod.rs b/components/locid_transform/src/provider/mod.rs
@@ -39,6 +39,7 @@ const _: () = {
     icu_locid_transform_data::impl_locid_transform_likelysubtags_ext_v1!(Baked);
     icu_locid_transform_data::impl_locid_transform_likelysubtags_l_v1!(Baked);
     icu_locid_transform_data::impl_locid_transform_likelysubtags_sr_v1!(Baked);
+    #[cfg(feature = "experimental")]
     icu_locid_transform_data::impl_locid_transform_script_dir_v1!(Baked);
 };
 

diff --git a/ffi/capi_cdylib/Cargo.toml b/ffi/capi_cdylib/Cargo.toml
@@ -50,6 +50,7 @@ logging = ["icu_capi/logging"]
 simple_logger = ["icu_capi/simple_logger"]
 wasm_default = ["icu_capi/wasm_default"]
 cpp_default = ["icu_capi/cpp_default"]
+default_components = ["icu_capi/default_components"]
 
 [package.metadata.cargo-all-features]
 # Tested by icu_capi

diff --git a/ffi/capi_staticlib/Cargo.toml b/ffi/capi_staticlib/Cargo.toml
@@ -50,6 +50,7 @@ logging = ["icu_capi/logging"]
 simple_logger = ["icu_capi/simple_logger"]
 wasm_default = ["icu_capi/wasm_default"]
 cpp_default = ["icu_capi/cpp_default"]
+default_components = ["icu_capi/default_components"]
 
 [package.metadata.cargo-all-features]
 # Tested by icu_capi

diff --git a/ffi/diplomat/Cargo.toml b/ffi/diplomat/Cargo.toml
@@ -69,7 +69,7 @@ simple_logger = ["dep:simple_logger"]
 cpp_default = ["logging", "simple_logger"]
 
 # meta feature for things we enable by default in wasm
-wasm_default = ["buffer_provider", "logging"]
+wasm_default = ["logging"]
 
 # Components
 default_components = ["icu_calendar", "icu_collator", "icu_datetime", "icu_decimal",

diff --git a/ffi/diplomat/c/examples/fixeddecimal_tiny/.gitignore b/ffi/diplomat/c/examples/fixeddecimal_tiny/.gitignore
@@ -5,5 +5,4 @@ optim*
 *.elf
 *.o
 a.out.dSYM
-decimal-bn-en.postcard
-decimal_bn_en.h
+baked_data
diff --git a/ffi/diplomat/c/examples/fixeddecimal_tiny/Makefile b/ffi/diplomat/c/examples/fixeddecimal_tiny/Makefile
@@ -15,54 +15,51 @@ GCC := gcc
 CLANG := clang-14
 LLD := lld-14
 
+baked_data/macros.rs:
+	cargo run -p icu_datagen -- --locales en bn --keys all --fallback expand --format mod --use-separate-crates --out baked_data
+
 ../../../../../target/debug/libicu_capi_staticlib.a: FORCE
-	cargo build -p icu_capi_staticlib --no-default-features --features buffer_provider,icu_capi/default_components
+	cargo build -p icu_capi_staticlib --no-default-features --features compiled_data,default_components
 
-icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a: FORCE
+icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a: FORCE baked_data/macros.rs
 	rustup toolchain install ${ICU4X_NIGHTLY_TOOLCHAIN}
 	rustup component add rust-src --toolchain ${ICU4X_NIGHTLY_TOOLCHAIN}
 	cd icu_capi_staticlib_tiny && \
-	RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" cargo +${ICU4X_NIGHTLY_TOOLCHAIN} panic-abort-build --target x86_64-unknown-linux-gnu
+	RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" ICU4X_DATA_DIR=$(shell pwd)/baked_data cargo +${ICU4X_NIGHTLY_TOOLCHAIN} panic-abort-build --target x86_64-unknown-linux-gnu
 
-icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a: FORCE
+icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a: FORCE baked_data/macros.rs
 	rustup toolchain install ${ICU4X_NIGHTLY_TOOLCHAIN}
 	rustup component add rust-src --toolchain ${ICU4X_NIGHTLY_TOOLCHAIN}
 	cd icu_capi_staticlib_tiny && \
-	RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" cargo +${ICU4X_NIGHTLY_TOOLCHAIN} panic-abort-build --target x86_64-unknown-linux-gnu --profile=release-opt-size
-
-decimal-bn-en.postcard:
-	cargo run -p icu_datagen -- --locales en bn --keys "decimal/symbols@1" --format blob --out decimal-bn-en.postcard
-
-decimal_bn_en.h: decimal-bn-en.postcard
-	xxd -i -C decimal-bn-en.postcard > decimal_bn_en.h
+	RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" ICU4X_DATA_DIR=$(shell pwd)/baked_data cargo +${ICU4X_NIGHTLY_TOOLCHAIN} panic-abort-build --target x86_64-unknown-linux-gnu --profile=release-opt-size
 
 # Naive target: no optimizations, full std
-optim0.elf: ../../../../../target/debug/libicu_capi_staticlib.a $(ALL_HEADERS) test.c decimal_bn_en.h
+optim0.elf: ../../../../../target/debug/libicu_capi_staticlib.a $(ALL_HEADERS) test.c
 	$(GCC) test.c ../../../../../target/debug/libicu_capi_staticlib.a -ldl -lpthread -lm -g -o optim0.elf
 
 # optim.elf: gcc with maximum link-time code stripping (gc-sections and strip-all)
-optim1.elf: ../../../../../target/debug/libicu_capi_staticlib.a $(ALL_HEADERS) test.c decimal_bn_en.h
+optim1.elf: ../../../../../target/debug/libicu_capi_staticlib.a $(ALL_HEADERS) test.c
 	$(GCC) -fdata-sections -ffunction-sections test.c ../../../../../target/debug/libicu_capi_staticlib.a -ldl -lpthread -lm -g -o optim1.elf -Wl,--gc-sections -Wl,--strip-all
 
 # optim2.elf: clang single-step with gc-sections
-optim2.elf: icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a $(ALL_HEADERS) test.c decimal_bn_en.h
+optim2.elf: icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a $(ALL_HEADERS) test.c
 	$(CLANG) -flto -fdata-sections -ffunction-sections test.c icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a -g -o optim2.elf -Wl,--gc-sections
 
-optim3.o: $(ALL_HEADERS) test.c decimal_bn_en.h
+optim3.o: $(ALL_HEADERS) test.c
 	$(CLANG) -c -flto=thin -fdata-sections -ffunction-sections --target=x86_64-unknown-linux-gnu test.c -g -o optim3.o
 
 # optim3.elf: clang two-step with lld, debug mode
 optim3.elf: optim3.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a
 	$(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim3.elf optim3.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a -Wl,--gc-sections
 
-optim4.o: $(ALL_HEADERS) test.c decimal_bn_en.h
+optim4.o: $(ALL_HEADERS) test.c
 	$(CLANG) -c -flto=thin -fdata-sections -ffunction-sections --target=x86_64-unknown-linux-gnu test.c -g -o optim4.o
 
 # optim4.elf: clang two-step with lld, release mode with debug symbols
 optim4.elf: optim4.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a
 	$(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim4.elf optim4.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a -Wl,--gc-sections
 
-optim5.o: $(ALL_HEADERS) test.c decimal_bn_en.h
+optim5.o: $(ALL_HEADERS) test.c
 	$(CLANG) -c -flto=thin -fdata-sections -ffunction-sections --target=x86_64-unknown-linux-gnu test.c -o optim5.o
 
 # optim5.elf: clang two-step with lld, release mode stripped of debug symbols