Skip to content

We no longer need pre-built ICU libraries #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 20, 2024
Merged

We no longer need pre-built ICU libraries #439

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
d1ab7d2
We no longer need pre-built ICU libraries
kateinoigakukun Sep 19, 2024
2a17ade
Copy ICU libraries only for old channels
kateinoigakukun Sep 20, 2024
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
5 changes: 1 addition & 4 deletions schemes/main/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-09-17-a",
"build-compiler": false,
"icu4c": [
"https://github.com/swiftwasm/icu4c-wasi/releases/download/0.10.0/icu4c-wasm32-unknown-wasi.tar.xz",
"https://github.com/swiftwasm/icu4c-wasi/releases/download/0.10.0/icu4c-wasm32-unknown-wasip1-threads.tar.xz"
],
"icu4c": [],
"libxml2": [
"https://github.com/swiftwasm/libxml2-wasm/releases/download/2.0.0/libxml2-wasm32-unknown-wasi.tar.gz",
"https://github.com/swiftwasm/libxml2-wasm/releases/download/2.0.0/libxml2-wasm32-unknown-wasip1-threads.tar.gz"
Expand Down
2 changes: 2 additions & 0 deletions tools/build/install-build-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CURRENT_SCHEME_FILE="$BUILD_SDK_PATH/scheme"

install_libxml2() {
read -r -a LIBXML2_URLS <<< "$(python3 -c 'import sys, json; print(" ".join(json.load(sys.stdin)["libxml2"]))' < "$SCHEME_DIR/manifest.json")"
[ -z "${LIBXML2_URLS+x}" ] && return
for url in "${LIBXML2_URLS[@]}"; do
curl -L "$url" | tar xz -C "$BUILD_SDK_PATH"
done
Expand All @@ -22,6 +23,7 @@ install_libxml2() {

install_icu() {
read -r -a ICU_URLS <<< "$(python3 -c 'import sys, json; print(" ".join(json.load(sys.stdin)["icu4c"]))' < "$SCHEME_DIR/manifest.json")"
[ -z "${ICU_URLS+x}" ] && return
rm -rf "$BUILD_SDK_PATH/icu"
for url in "${ICU_URLS[@]}"; do
curl -L "$url" | tar Jx -C "$BUILD_SDK_PATH"
Expand Down
9 changes: 6 additions & 3 deletions tools/build/package-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ def derive_wasi_sysroot(options, packaging_dir: str, target_triple: str) -> str:
return os.path.join(packaging_dir, 'wasi-sysroot', target_triple)


def copy_icu_libs(build_sdk_path, dist_toolchain_path, target_triple):
def copy_icu_libs(scheme, build_sdk_path, dist_toolchain_path, target_triple):
if scheme not in ["release-5.9", "release-5.10", "release-6.0"]:
# We don't need to copy ICU libraries for recent channels
return
import shutil
icu_lib_dir = os.path.join(build_sdk_path, f"icu-{target_triple}", 'lib')
if not os.path.exists(icu_lib_dir):
Expand Down Expand Up @@ -96,7 +99,7 @@ class PackageAction(Action):
print(f"=====> Copying base snapshot {base_toolchain_path} to {dist_toolchain_path}")
self.rsync("-a", base_toolchain_path + "/", dist_toolchain_path)

copy_icu_libs(build_sdk_path, target_toolchain_path, self.target_triple)
copy_icu_libs(self.options.scheme, build_sdk_path, target_toolchain_path, self.target_triple)
copy_libxml2_libs(build_sdk_path, target_toolchain_path, self.target_triple)
# Copying target stdlib to dist toolchain, and cross compiler if
# host compiler is built with patches by ourselves.
Expand Down Expand Up @@ -215,7 +218,7 @@ class PackageSwiftSDKAction(Action):

def run(self):
build_sdk_path = os.path.join('..', 'build-sdk')
copy_icu_libs(build_sdk_path, self.target_toolchain_path, self.target_triple)
copy_icu_libs(self.options.scheme, build_sdk_path, self.target_toolchain_path, self.target_triple)
copy_libxml2_libs(build_sdk_path, self.target_toolchain_path, self.target_triple)
self.make_swift_sdk(
self.base_toolchain_path,
Expand Down
Loading