diff --git a/lib/DriverTool/autolink_extract_main.cpp b/lib/DriverTool/autolink_extract_main.cpp index 8c4381dfddd6c..332778d581d95 100644 --- a/lib/DriverTool/autolink_extract_main.cpp +++ b/lib/DriverTool/autolink_extract_main.cpp @@ -228,7 +228,7 @@ int autolink_extract_main(ArrayRef Args, const char *Argv0, "-lswiftCore", "-lswift_Concurrency", "-lswift_StringProcessing", - "-lswift_RegexBuilder", + "-lswiftRegexBuilder", "-lswift_RegexParser", "-lswift_Backtracing", "-lswiftSynchronization", @@ -250,12 +250,9 @@ int autolink_extract_main(ArrayRef Args, const char *Argv0, "-lcurl", "-lxml2", "-luuid", + "-lTesting", // XCTest runtime libs (must be first due to http://github.com/apple/swift-corelibs-xctest/issues/432) "-lXCTest", - // ICU Swift runtime libs - "-licui18nswift", - "-licuucswift", - "-licudataswift", // Common-use ordering-agnostic Linux system libs "-lm", "-lpthread", diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 27f68b58ac955..532f99adcb60a 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -842,7 +842,6 @@ swift-driver swift-testing swift-testing-macros xctest -libicu swiftdocc swiftformat @@ -858,7 +857,6 @@ install-swiftsyntax install-swift-testing install-swift-testing-macros install-xctest -install-libicu install-prefix=/usr install-sourcekit-lsp install-swiftformat @@ -952,7 +950,6 @@ skip-test-xctest skip-test-foundation skip-test-libdispatch skip-test-playgroundsupport -skip-test-libicu skip-test-indexstore-db skip-test-sourcekit-lsp skip-test-swiftdocc @@ -1172,7 +1169,6 @@ mixin-preset= mixin_linux_install_components_with_clang build-subdir=buildbot_incremental -libicu llbuild swiftpm swift-driver @@ -1190,7 +1186,6 @@ install-llvm install-static-linux-config install-swift install-llbuild -install-libicu install-swiftpm install-swift-driver install-swiftsyntax @@ -1770,7 +1765,6 @@ skip-test-osx llvm-cmake-options=-DCLANG_DEFAULT_LINKER=gold foundation -libicu libdispatch test @@ -1814,17 +1808,14 @@ mixin-preset= mixin_linux_install_components_with_clang libdispatch -libicu foundation xctest libcxx=false -install-libicu install-foundation install-libdispatch install-xctest -skip-test-libicu skip-test-foundation skip-test-libdispatch skip-test-xctest @@ -2090,7 +2081,6 @@ mixin-preset=buildbot_indexstoredb_linux,sanitize mixin-preset= mixin_linux_install_components_with_clang -libicu llbuild swiftpm xctest @@ -2106,7 +2096,6 @@ reconfigure install-foundation install-libdispatch -install-libicu install-libcxx install-llvm install-static-linux-config @@ -3027,7 +3016,6 @@ mixin-preset= [preset: linux_lldb] lldb foundation -libicu libdispatch build-ninja diff --git a/utils/build-script-impl b/utils/build-script-impl index 8cf7ce8a9049c..ecf63d4706cdd 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -299,7 +299,6 @@ components=( foundation libcxx libdispatch - libicu libxml2 zlib curl @@ -1260,7 +1259,6 @@ FOUNDATION_SWIFTFOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-foundation" FOUNDATION_SWIFTFOUNDATIONICU_SOURCE_DIR="${WORKSPACE}/swift-foundation-icu" LIBDISPATCH_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch" LIBDISPATCH_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch" -LIBICU_SOURCE_DIR="${WORKSPACE}/icu" LIBCXX_SOURCE_DIR="${WORKSPACE}/llvm-project/runtimes" SWIFT_COLLECTIONS_SOURCE_DIR="${WORKSPACE}/swift-collections" SWIFT_PATH_TO_STRING_PROCESSING_SOURCE="${WORKSPACE}/swift-experimental-string-processing" @@ -1268,7 +1266,6 @@ SWIFTSYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax" SWIFT_SYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax" [[ "${SKIP_BUILD_LIBCXX}" ]] || PRODUCTS+=(libcxx) -[[ "${SKIP_BUILD_LIBICU}" ]] || PRODUCTS+=(libicu) [[ "${SKIP_BUILD_SWIFT}" ]] || PRODUCTS+=(swift) [[ "${SKIP_BUILD_LLDB}" ]] || PRODUCTS+=(lldb) [[ "${SKIP_BUILD_LIBDISPATCH}" ]] || PRODUCTS+=(libdispatch) @@ -1357,8 +1354,6 @@ function build_directory_bin() { libdispatch|libdispatch_static) echo "${root}/${LIBDISPATCH_BUILD_TYPE}/bin" ;; - libicu) - ;; *) echo "error: unknown product: ${product}" exit 1 @@ -1497,8 +1492,6 @@ function cmake_config_opt() { libdispatch|libdispatch_static) echo "--config ${LIBDISPATCH_BUILD_TYPE}" ;; - libicu) - ;; *) echo "error: unknown product: ${product}" exit 1 @@ -2457,29 +2450,6 @@ for host in "${ALL_HOSTS[@]}"; do continue fi - if [[ ! "${SKIP_BUILD_LIBICU}" ]] ; then - ICU_ROOT=$(build_directory ${host} libicu)/tmp_install - ICU_LIBDIR="$(build_directory ${host} swift)/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" - LIBICU_BUILD_ARGS=( - -DICU_ROOT:PATH=${ICU_ROOT} - -DICU_INCLUDE_DIR:PATH=${ICU_ROOT}/include - -DICU_DATA_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicudataswift.so - -DICU_DATA_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicudataswift.so - -DICU_DATA_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicudataswift.so - -DICU_DATA_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR}/libicudataswift.so - -DICU_UC_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicuucswift.so - -DICU_UC_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicuucswift.so - -DICU_UC_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicuucswift.so - -DICU_UC_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR}/libicuucswift.so - -DICU_I18N_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicui18nswift.so - -DICU_I18N_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicui18nswift.so - -DICU_I18N_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicui18nswift.so - -DICU_I18N_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR}/libicui18nswift.so - ) - else - LIBICU_BUILD_ARGS=() - fi - if [[ ! "${SKIP_BUILD_LIBXML2}" ]]; then BASE_INSTALL_DIR="$(get_host_install_destdir ${host})" LIBXML2_HEADERS="${BASE_INSTALL_DIR}/usr/include/libxml2" @@ -2543,12 +2513,6 @@ for host in "${ALL_HOSTS[@]}"; do call rm -rf "${build_dir}" fi - # Set the PKG_CONFIG_PATH so that core-foundation can find the libraries and - # header files - LIBICU_BUILD_DIR="$(build_directory ${host} libicu)" - export PKG_CONFIG_PATH="${LIBICU_BUILD_DIR}/config:${PKG_CONFIG_PATH}" - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}":"${LIBICU_BUILD_DIR}/lib" - cmake_options=( ${cmake_options[@]} -DCMAKE_BUILD_TYPE:STRING=${FOUNDATION_BUILD_TYPE} @@ -2559,8 +2523,6 @@ for host in "${ALL_HOSTS[@]}"; do -DCMAKE_Swift_FLAGS:STRING="$(common_swift_flags)" -DCMAKE_INSTALL_PREFIX:PATH=$(get_host_install_prefix ${host}) - ${LIBICU_BUILD_ARGS[@]} - ${LIBXML2_BUILD_ARGS[@]} ${ZLIB_BUILD_ARGS[@]} @@ -2588,7 +2550,7 @@ for host in "${ALL_HOSTS[@]}"; do if [[ $(is_cross_tools_host ${host}) ]] ; then cmake_options+=("${SWIFT_TARGET_CMAKE_OPTIONS[@]}") - # Foundation looks for the ICU, libXML2 and libcurl libraries + # Foundation looks for the libXML2 and libcurl libraries # using find_package(), so search for them in # CROSS_COMPILE_DEPS_PATH using the CMake process for doing # so, see the linked CMake docs for more info: @@ -2648,62 +2610,6 @@ for host in "${ALL_HOSTS[@]}"; do ;; esac - ;; - libicu) - SWIFT_BUILD_PATH=$(build_directory ${host} swift) - LIBICU_BUILD_DIR=$(build_directory ${host} ${product}) - ICU_TMPINSTALL=$LIBICU_BUILD_DIR/tmp_install - ICU_TMPLIBDIR="${SWIFT_BUILD_PATH}/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" - if [[ "${RECONFIGURE}" || ! -f "${LIBICU_BUILD_DIR}"/config.status ]]; then - echo "Reconfiguring libicu" - if [[ "$LIBICU_BUILD_TYPE" != "Release" ]] ; then - libicu_enable_debug="--enable-debug" - else - libicu_enable_debug="" - fi - call mkdir -p "${LIBICU_BUILD_DIR}" - - if [ $(true_false "${BUILD_SWIFT_STATIC_STDLIB}") == "TRUE" ]; then - libicu_enable_static="--enable-static" - else - libicu_enable_static="" - fi - - with_pushd "${LIBICU_BUILD_DIR}" \ - call env CXXFLAGS=-fPIC LDFLAGS='-Wl,-rpath=\$$ORIGIN' \ - "${LIBICU_SOURCE_DIR}"/icu4c/source/runConfigureICU Linux \ - ${icu_build_variant_arg} --prefix=${ICU_TMPINSTALL} \ - ${libicu_enable_debug} \ - --enable-renaming --with-library-suffix=swift \ - --libdir=${ICU_TMPLIBDIR} \ - --enable-shared --enable-static \ - --enable-strict --disable-icuio \ - --disable-plugins --disable-dyload --disable-extras \ - --disable-samples --disable-layoutex --with-data-packaging=auto - else - echo "Skipping reconfiguration of libicu" - fi - with_pushd "${LIBICU_BUILD_DIR}" \ - call make -j ${BUILD_JOBS} install - ICU_LIBDIR="$(build_directory ${host} swift)/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" - ICU_LIBDIR_STATIC="$(build_directory ${host} swift)/lib/swift_static/${SWIFT_HOST_VARIANT}" - ICU_LIBDIR_STATIC_ARCH="$(build_directory ${host} swift)/lib/swift_static/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" - # Add in the ICU renaming config into uconfig.h - call sed -e "/^#define __UCONFIG_H__/ r ${LIBICU_BUILD_DIR}/uconfig.h.prepend" -i ${ICU_TMPINSTALL}/include/unicode/uconfig.h - - if [ $(true_false "${BUILD_SWIFT_STATIC_STDLIB}") == "TRUE" ]; then - # Copy the static libs into the swift_static directory - call mkdir -p "${ICU_LIBDIR_STATIC_ARCH}" - for l in uc i18n data - do - lib="${ICU_LIBDIR}/libicu${l}swift.a" - call cp "${lib}" "${ICU_LIBDIR_STATIC}" - call cp "${lib}" "${ICU_LIBDIR_STATIC_ARCH}" - done - fi - - # libicu builds itself and doesn't use cmake - continue ;; *) echo "error: unknown product: ${product}" @@ -2979,17 +2885,6 @@ for host in "${ALL_HOSTS[@]}"; do # libdispatch_static continue ;; - libicu) - if [[ "${SKIP_TEST_LIBICU}" ]]; then - continue - fi - LIBICU_BUILD_DIR=$(build_directory ${host} ${product}) - echo "--- Running tests for ${product} ---" - with_pushd "${LIBICU_BUILD_DIR}/test" \ - call make -j ${BUILD_JOBS} - echo "--- Finished tests for ${product} ---" - continue - ;; *) echo "error: unknown product: ${product}" exit 1 @@ -3151,42 +3046,6 @@ for host in "${ALL_HOSTS[@]}"; do ;; esac ;; - libicu) - if [[ -z "${INSTALL_LIBICU}" ]]; then - continue - fi - echo "--- Installing ${product} ---" - ICU_BUILD_DIR=$(build_directory ${host} ${product}) - ICU_INSTALL_DIR="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})" - ICU_LIBDIR="$(build_directory ${host} swift)/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" - LIBICU_DEST_DIR="${ICU_INSTALL_DIR}lib/swift/${SWIFT_HOST_VARIANT}" - call mkdir -p ${LIBICU_DEST_DIR} - - for l in uc i18n data - do - lib=${ICU_LIBDIR}/libicu${l}swift - echo "${lib} => ${LIBICU_DEST_DIR}" - call cp -d ${lib}.so ${lib}.so.* ${LIBICU_DEST_DIR} - done - - if [ $(true_false "${BUILD_SWIFT_STATIC_STDLIB}") == "TRUE" ]; then - LIBICU_DEST_DIR_STATIC="${ICU_INSTALL_DIR}lib/swift_static/${SWIFT_HOST_VARIANT}" - call mkdir -p ${LIBICU_DEST_DIR_STATIC} - for l in uc i18n data - do - lib=${ICU_LIBDIR}/libicu${l}swift - echo "${lib} => ${LIBICU_DEST_DIR_STATIC}" - call cp -d ${lib}.a ${LIBICU_DEST_DIR_STATIC} - done - fi - - ICU_TMP_INSTALL_DIR="${ICU_BUILD_DIR}/tmp_install" - call mkdir -p "${ICU_INSTALL_DIR}include" - call cp -a "${ICU_TMP_INSTALL_DIR}/include/unicode" "${ICU_INSTALL_DIR}include" - call mkdir -p "${ICU_INSTALL_DIR}share/icuswift" - call cp -a "${ICU_TMP_INSTALL_DIR}/share/icuswift" "${ICU_INSTALL_DIR}share" - continue - ;; *) echo "error: unknown product: ${product}" exit 1 diff --git a/utils/build.ps1 b/utils/build.ps1 index eeeeb0e57cd60..bef8d477c6c46 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -1320,41 +1320,6 @@ function Build-CURL([Platform]$Platform, $Arch) { }) } -function Build-ICU([Platform]$Platform, $Arch) { - $ArchName = $Arch.LLVMName - - if (-not $ToBatch) { - if (-not (Test-Path -Path "$SourceCache\icu\icu4c\CMakeLists.txt")) { - Copy-Item $SourceCache\swift-installer-scripts\shared\ICU\CMakeLists.txt $SourceCache\icu\icu4c\ - Copy-Item $SourceCache\swift-installer-scripts\shared\ICU\icupkg.inc.cmake $SourceCache\icu\icu4c\ - } - } - - if ($Platform -eq "Windows" -and (($Arch.CMakeName -eq $BuildArch.CMakeName) -or ($Arch.CMakeName -ne "ARM64"))) { - $BuildToolsDefines = @{BUILD_TOOLS = "YES"} - } else { - $BuildToolsDefines = @{ - BUILD_TOOLS = "NO"; - ICU_TOOLS_DIR = "$($BuildArch.BinaryCache)\windows\icu-69.1" - } - } - - Build-CMakeProject ` - -Src $SourceCache\icu\icu4c ` - -Bin "$($Arch.BinaryCache)\$Platform\icu-69.1" ` - -InstallTo "$LibraryRoot\icu-69.1\usr" ` - -Arch $Arch ` - -Platform $Platform ` - -UseMSVCCompilers C,CXX ` - -BuildTargets default ` - -Defines ($BuildToolsDefines + @{ - BUILD_SHARED_LIBS = "NO"; - CMAKE_SYSTEM_NAME = if ($Platform -eq "Windows") { "Windows" } else { "Android" }; - CMAKE_INSTALL_BINDIR = "bin/$Platform/$ArchName"; - CMAKE_INSTALL_LIBDIR = "lib/$Platform/$ArchName"; - }) -} - function Build-Runtime([Platform]$Platform, $Arch) { Isolate-EnvVars { $env:Path = "$($BuildArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$(Get-PinnedToolchainRuntime);${env:Path}" @@ -1443,15 +1408,7 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) { -UseBuiltCompilers ASM,C,CXX,Swift ` -BuildTargets $Targets ` -Defines (@{ - # Turn off safeseh for lld as it has safeseh enabled by default - # and fails with an ICU data object file icudt69l_dat.obj. This - # matters to X86 only. - CMAKE_Swift_FLAGS = if ($Arch -eq $ArchX86) { @("-Xlinker", "/SAFESEH:NO") } else { "" }; CURL_DIR = "$LibraryRoot\curl-8.4.0\usr\lib\$Platform\$ShortArch\cmake\CURL"; - ICU_DATA_LIBRARY_RELEASE = "$LibraryRoot\icu-69.1\usr\lib\$Platform\$ShortArch\sicudt69.lib"; - ICU_I18N_LIBRARY_RELEASE = "$LibraryRoot\icu-69.1\usr\lib\$Platform\$ShortArch\sicuin69.lib"; - ICU_ROOT = "$LibraryRoot\icu-69.1\usr"; - ICU_UC_LIBRARY_RELEASE = "$LibraryRoot\icu-69.1\usr\lib\$Platform\$ShortArch\sicuuc69.lib"; LIBXML2_LIBRARY = "$LibraryRoot\libxml2-2.11.5\usr\lib\$Platform\$ShortArch\libxml2s.lib"; LIBXML2_INCLUDE_DIR = "$LibraryRoot\libxml2-2.11.5\usr\include\libxml2"; LIBXML2_DEFINITIONS = "/DLIBXML_STATIC"; @@ -2159,7 +2116,6 @@ if (-not $SkipBuild) { Invoke-BuildStep Build-ZLib Windows $Arch Invoke-BuildStep Build-XML2 Windows $Arch Invoke-BuildStep Build-CURL Windows $Arch - Invoke-BuildStep Build-ICU Windows $Arch Invoke-BuildStep Build-LLVM Windows $Arch # Build platform: SDK, Redist and XCTest diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py index 4345cb43d6d03..37d6487b57d64 100644 --- a/utils/build_swift/build_swift/driver_arguments.py +++ b/utils/build_swift/build_swift/driver_arguments.py @@ -100,9 +100,6 @@ def _apply_default_arguments(args): if args.libdispatch_build_variant is None: args.libdispatch_build_variant = args.build_variant - if args.libicu_build_variant is None: - args.libicu_build_variant = args.build_variant - if args.libxml2_build_variant is None: args.libxml2_build_variant = args.build_variant @@ -831,9 +828,6 @@ def create_argument_parser(): option('--libdispatch', toggle_true('build_libdispatch'), help='build libdispatch') - option('--libicu', toggle_true('build_libicu'), - help='build libicu') - option('--static-libxml2', toggle_true('build_libxml2'), default=False, help='build static libxml2') @@ -957,10 +951,6 @@ def create_argument_parser(): const='Debug', help='build the Debug variant of libdispatch') - option('--debug-libicu', store('libicu_build_variant'), - const='Debug', - help='build the Debug variant of libicu') - option('--debug-libxml2', store('libxml2_build_variant'), const='Debug', help='build the Debug variant of libxml2') @@ -1591,7 +1581,6 @@ def create_argument_parser(): /swift-corelibs-xctest (optional) /swift-corelibs-foundation (optional) /swift-corelibs-libdispatch (optional) - /icu (optional) /libxml2 (optional) /zlib (optional) /curl (optional) diff --git a/utils/build_swift/tests/build_swift/test_driver_arguments.py b/utils/build_swift/tests/build_swift/test_driver_arguments.py index fdcd3ed086225..6ea1992f4b1a8 100644 --- a/utils/build_swift/tests/build_swift/test_driver_arguments.py +++ b/utils/build_swift/tests/build_swift/test_driver_arguments.py @@ -534,7 +534,6 @@ def test_implied_defaults_build_variant(self): self.assertEqual(namespace.cmark_build_variant, 'Debug') self.assertEqual(namespace.foundation_build_variant, 'Debug') self.assertEqual(namespace.libdispatch_build_variant, 'Debug') - self.assertEqual(namespace.libicu_build_variant, 'Debug') self.assertEqual(namespace.lldb_build_variant, 'Debug') self.assertEqual(namespace.llvm_build_variant, 'Debug') self.assertEqual(namespace.swift_build_variant, 'Debug') diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py index 72687e27fd257..b32b3eb7ea560 100644 --- a/utils/build_swift/tests/expected_options.py +++ b/utils/build_swift/tests/expected_options.py @@ -65,7 +65,6 @@ 'build_ios_simulator': False, 'build_jobs': multiprocessing.cpu_count(), 'build_libdispatch': False, - 'build_libicu': False, 'build_libxml2': False, 'build_zlib': False, 'build_curl': False, @@ -218,7 +217,6 @@ 'ios_all': False, 'legacy_impl': False, 'libdispatch_build_variant': 'Debug', - 'libicu_build_variant': 'Debug', 'libxml2_build_variant': 'Debug', 'linux_archs': None, 'lit_jobs': multiprocessing.cpu_count(), @@ -483,7 +481,6 @@ class BuildScriptImplOption(_BaseOption): dest='foundation_build_variant', value='Debug'), SetOption('--debug-libdispatch', dest='libdispatch_build_variant', value='Debug'), - SetOption('--debug-libicu', dest='libicu_build_variant', value='Debug'), SetOption('--debug-libxml2', dest='libxml2_build_variant', value='Debug'), SetOption('--debug-zlib', dest='zlib_build_variant', value='Debug'), SetOption('--debug-curl', dest='curl_build_variant', value='Debug'), @@ -636,7 +633,6 @@ class BuildScriptImplOption(_BaseOption): EnableOption('--only-executable-test'), EnableOption('--only-non-executable-test'), EnableOption('--libdispatch', dest='build_libdispatch'), - EnableOption('--libicu', dest='build_libicu'), EnableOption('--static-libxml2', dest='build_libxml2'), EnableOption('--static-zlib', dest='build_zlib'), EnableOption('--static-curl', dest='build_curl'), diff --git a/utils/swift_build_support/swift_build_support/build_script_invocation.py b/utils/swift_build_support/swift_build_support/build_script_invocation.py index 772c6e0f15988..e7b960f9d786d 100644 --- a/utils/swift_build_support/swift_build_support/build_script_invocation.py +++ b/utils/swift_build_support/swift_build_support/build_script_invocation.py @@ -112,7 +112,6 @@ def convert_to_impl_arguments(self): "--lldb-build-type", args.lldb_build_variant, "--foundation-build-type", args.foundation_build_variant, "--libdispatch-build-type", args.libdispatch_build_variant, - "--libicu-build-type", args.libicu_build_variant, "--xctest-build-type", args.build_variant, "--llbuild-build-type", args.build_variant, "--swift-enable-assertions", str(args.swift_assertions).lower(), @@ -276,7 +275,6 @@ def convert_to_impl_arguments(self): (args.build_llbuild, "llbuild"), (args.build_libcxx, "libcxx"), (args.build_libdispatch, "libdispatch"), - (args.build_libicu, "libicu"), (args.build_libxml2, 'libxml2'), (args.build_zlib, 'zlib'), (args.build_curl, 'curl') @@ -312,7 +310,6 @@ def convert_to_impl_arguments(self): "--skip-test-xctest", "--skip-test-foundation", "--skip-test-libdispatch", - "--skip-test-libicu", ] if args.build_runtime_with_host_compiler: impl_args += ["--build-runtime-with-host-compiler"] @@ -639,8 +636,6 @@ def compute_product_pipelines(self): builder.add_impl_product(products.LibCXX, is_enabled=self.args.build_libcxx) - builder.add_impl_product(products.LibICU, - is_enabled=self.args.build_libicu) builder.add_impl_product(products.Swift, is_enabled=self.args.build_swift) builder.add_impl_product(products.LLDB, diff --git a/utils/swift_build_support/swift_build_support/products/__init__.py b/utils/swift_build_support/swift_build_support/products/__init__.py index e2d657702b169..59bbc747a7089 100644 --- a/utils/swift_build_support/swift_build_support/products/__init__.py +++ b/utils/swift_build_support/swift_build_support/products/__init__.py @@ -18,7 +18,6 @@ from .indexstoredb import IndexStoreDB from .libcxx import LibCXX from .libdispatch import LibDispatch -from .libicu import LibICU from .libxml2 import LibXML2 from .llbuild import LLBuild from .lldb import LLDB @@ -51,7 +50,6 @@ 'Foundation', 'LibCXX', 'LibDispatch', - 'LibICU', 'LibXML2', 'Zlib', 'LibCurl', diff --git a/utils/swift_build_support/swift_build_support/products/benchmarks.py b/utils/swift_build_support/swift_build_support/products/benchmarks.py index 0ec3f4c897e28..337ecd64e0d56 100644 --- a/utils/swift_build_support/swift_build_support/products/benchmarks.py +++ b/utils/swift_build_support/swift_build_support/products/benchmarks.py @@ -17,7 +17,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -90,7 +89,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/foundation.py b/utils/swift_build_support/swift_build_support/products/foundation.py index 12057fe560d5c..38759f5223d37 100644 --- a/utils/swift_build_support/swift_build_support/products/foundation.py +++ b/utils/swift_build_support/swift_build_support/products/foundation.py @@ -14,7 +14,6 @@ from . import curl from . import libcxx from . import libdispatch -from . import libicu from . import libxml2 from . import llvm from . import product @@ -52,7 +51,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, libxml2.LibXML2, diff --git a/utils/swift_build_support/swift_build_support/products/indexstoredb.py b/utils/swift_build_support/swift_build_support/products/indexstoredb.py index 804c881e8038a..fc7445d86b9a9 100644 --- a/utils/swift_build_support/swift_build_support/products/indexstoredb.py +++ b/utils/swift_build_support/swift_build_support/products/indexstoredb.py @@ -18,7 +18,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -74,7 +73,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/libicu.py b/utils/swift_build_support/swift_build_support/products/libicu.py deleted file mode 100644 index 4daefced485d7..0000000000000 --- a/utils/swift_build_support/swift_build_support/products/libicu.py +++ /dev/null @@ -1,52 +0,0 @@ -# swift_build_support/products/libicu.py ------------------------------------- -# -# This source file is part of the Swift.org open source project -# -# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors -# Licensed under Apache License v2.0 with Runtime Library Exception -# -# See https://swift.org/LICENSE.txt for license information -# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors -# -# ---------------------------------------------------------------------------- - -from . import cmark -from . import libcxx -from . import llvm -from . import product - - -class LibICU(product.Product): - @classmethod - def is_build_script_impl_product(cls): - """is_build_script_impl_product -> bool - - Whether this product is produced by build-script-impl. - """ - return True - - @classmethod - def is_before_build_script_impl_product(cls): - """is_before_build_script_impl_product -> bool - - Whether this product is built before any build-script-impl products. - """ - return False - - @classmethod - def product_source_name(cls): - """product_source_name() -> str - - The name of the source code directory of this product. - """ - return "icu" - - @classmethod - def is_nondarwin_only_build_product(cls): - return True - - @classmethod - def get_dependencies(cls): - return [cmark.CMark, - llvm.LLVM, - libcxx.LibCXX] diff --git a/utils/swift_build_support/swift_build_support/products/llbuild.py b/utils/swift_build_support/swift_build_support/products/llbuild.py index adb5ddbab7d6c..ca903e48314f1 100644 --- a/utils/swift_build_support/swift_build_support/products/llbuild.py +++ b/utils/swift_build_support/swift_build_support/products/llbuild.py @@ -14,7 +14,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llvm from . import product from . import swift @@ -43,7 +42,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/lldb.py b/utils/swift_build_support/swift_build_support/products/lldb.py index 106f5b3b9a9ed..6f9d76faf3f38 100644 --- a/utils/swift_build_support/swift_build_support/products/lldb.py +++ b/utils/swift_build_support/swift_build_support/products/lldb.py @@ -12,7 +12,6 @@ from . import cmark from . import libcxx -from . import libicu from . import llvm from . import product from . import swift @@ -40,5 +39,4 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift] diff --git a/utils/swift_build_support/swift_build_support/products/playgroundsupport.py b/utils/swift_build_support/swift_build_support/products/playgroundsupport.py index 90d7c16116fa3..d0898edf6441d 100644 --- a/utils/swift_build_support/swift_build_support/products/playgroundsupport.py +++ b/utils/swift_build_support/swift_build_support/products/playgroundsupport.py @@ -17,7 +17,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import lldb from . import llvm @@ -131,7 +130,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, lldb.LLDB, libdispatch.LibDispatch, diff --git a/utils/swift_build_support/swift_build_support/products/skstresstester.py b/utils/swift_build_support/swift_build_support/products/skstresstester.py index ea673f0bde5d2..b9b38ceca4e16 100644 --- a/utils/swift_build_support/swift_build_support/products/skstresstester.py +++ b/utils/swift_build_support/swift_build_support/products/skstresstester.py @@ -19,7 +19,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -111,7 +110,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/sourcekitlsp.py b/utils/swift_build_support/swift_build_support/products/sourcekitlsp.py index 59ec79f4308ca..960b08bd14619 100644 --- a/utils/swift_build_support/swift_build_support/products/sourcekitlsp.py +++ b/utils/swift_build_support/swift_build_support/products/sourcekitlsp.py @@ -15,7 +15,6 @@ from . import indexstoredb from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -68,7 +67,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/swiftdocc.py b/utils/swift_build_support/swift_build_support/products/swiftdocc.py index 5e438591baa2c..dd62c149829b0 100644 --- a/utils/swift_build_support/swift_build_support/products/swiftdocc.py +++ b/utils/swift_build_support/swift_build_support/products/swiftdocc.py @@ -18,7 +18,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -106,7 +105,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/swiftdriver.py b/utils/swift_build_support/swift_build_support/products/swiftdriver.py index ff3e0f02506af..cb2435a5a297c 100644 --- a/utils/swift_build_support/swift_build_support/products/swiftdriver.py +++ b/utils/swift_build_support/swift_build_support/products/swiftdriver.py @@ -16,7 +16,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -51,7 +50,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/swiftformat.py b/utils/swift_build_support/swift_build_support/products/swiftformat.py index 92d33f42319f9..a17441fb55615 100644 --- a/utils/swift_build_support/swift_build_support/products/swiftformat.py +++ b/utils/swift_build_support/swift_build_support/products/swiftformat.py @@ -18,7 +18,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -170,7 +169,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/swiftinspect.py b/utils/swift_build_support/swift_build_support/products/swiftinspect.py index be00b0e4cc2c0..80e74cb1a374f 100644 --- a/utils/swift_build_support/swift_build_support/products/swiftinspect.py +++ b/utils/swift_build_support/swift_build_support/products/swiftinspect.py @@ -17,7 +17,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -68,7 +67,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/swiftpm.py b/utils/swift_build_support/swift_build_support/products/swiftpm.py index ea6e71d193ef2..cb82f21c681c9 100644 --- a/utils/swift_build_support/swift_build_support/products/swiftpm.py +++ b/utils/swift_build_support/swift_build_support/products/swiftpm.py @@ -16,7 +16,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -139,7 +138,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/swiftsyntax.py b/utils/swift_build_support/swift_build_support/products/swiftsyntax.py index 0977632db12f6..72254eb471769 100644 --- a/utils/swift_build_support/swift_build_support/products/swiftsyntax.py +++ b/utils/swift_build_support/swift_build_support/products/swiftsyntax.py @@ -19,7 +19,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -150,7 +149,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py b/utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py index aea66fd89eb53..3278a95e7e538 100644 --- a/utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py +++ b/utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py @@ -16,7 +16,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llbuild from . import llvm from . import product @@ -100,7 +99,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation, diff --git a/utils/swift_build_support/swift_build_support/products/xctest.py b/utils/swift_build_support/swift_build_support/products/xctest.py index 97278cbeceee8..70964723b6dcf 100644 --- a/utils/swift_build_support/swift_build_support/products/xctest.py +++ b/utils/swift_build_support/swift_build_support/products/xctest.py @@ -14,7 +14,6 @@ from . import foundation from . import libcxx from . import libdispatch -from . import libicu from . import llvm from . import product from . import swift @@ -46,7 +45,6 @@ def get_dependencies(cls): return [cmark.CMark, llvm.LLVM, libcxx.LibCXX, - libicu.LibICU, swift.Swift, libdispatch.LibDispatch, foundation.Foundation] diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index beb7e47fbf022..0939b6cfb2240 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -156,7 +156,6 @@ "wasi-libc": "wasi-sdk-20", "wasmkit": "0.0.3", "curl": "curl-8_4_0", - "icu": "maint/maint-69", "libxml2": "v2.11.5", "zlib": "v1.3" } @@ -208,7 +207,6 @@ "wasi-libc": "wasi-sdk-20", "wasmkit": "0.0.3", "curl": "curl-8_4_0", - "icu": "maint/maint-69", "libxml2": "v2.11.5", "zlib": "v1.3" }