@@ -2919,75 +2919,7 @@ for host in "${ALL_HOSTS[@]}"; do
29192919 ;;
29202920 esac
29212921 ;;
2922- foundation)
2923- # FIXME: Foundation doesn't build from the script on OS X
2924- if [[ ${host} == " macosx" * ]]; then
2925- echo " Skipping Foundation on OS X -- use the Xcode project instead"
2926- continue
2927- fi
2928-
2929- if [[ " ${SKIP_TEST_FOUNDATION} " ]]; then
2930- continue
2931- fi
2932-
2933- if [[ " ${SKIP_BUILD_XCTEST} " ]]; then
2934- continue
2935- fi
2936-
2937- if [[ ! " ${SKIP_BUILD_LIBICU} " ]] ; then
2938- ICU_ROOT=$( build_directory ${host} libicu) /tmp_install
2939- ICU_LIBDIR=" $( build_directory ${host} swift) /lib/swift/${SWIFT_HOST_VARIANT} /${SWIFT_HOST_VARIANT_ARCH} "
2940- LIBICU_BUILD_ARGS=(
2941- -DICU_ROOT:PATH=${ICU_ROOT}
2942- -DICU_INCLUDE_DIR:PATH=${ICU_ROOT} /include
2943- -DICU_DATA_LIBRARIES:FILEPATH=${ICU_LIBDIR} /libicudataswift.so
2944- -DICU_DATA_LIBRARY:FILEPATH=${ICU_LIBDIR} /libicudataswift.so
2945- -DICU_DATA_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR} /libicudataswift.so
2946- -DICU_DATA_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR} /libicudataswift.so
2947- -DICU_UC_LIBRARIES:FILEPATH=${ICU_LIBDIR} /libicuucswift.so
2948- -DICU_UC_LIBRARY:FILEPATH=${ICU_LIBDIR} /libicuucswift.so
2949- -DICU_UC_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR} /libicuucswift.so
2950- -DICU_UC_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR} /libicuucswift.so
2951- -DICU_I18N_LIBRARIES:FILEPATH=${ICU_LIBDIR} /libicui18nswift.so
2952- -DICU_I18N_LIBRARY:FILEPATH=${ICU_LIBDIR} /libicui18nswift.so
2953- -DICU_I18N_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR} /libicui18nswift.so
2954- -DICU_I18N_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR} /libicui18nswift.so
2955- )
2956- else
2957- LIBICU_BUILD_ARGS=()
2958- fi
2959-
2960- # NOTE(compnerd) the time has come to enable tests now
2961- cmake_options=(
2962- ${cmake_options[@]}
2963- -DCMAKE_BUILD_TYPE:STRING=${FOUNDATION_BUILD_TYPE}
2964- -DCMAKE_C_COMPILER:PATH=${CLANG_BIN} /clang
2965- -DCMAKE_CXX_COMPILER:PATH=${CLANG_BIN} /clang++
2966- -DCMAKE_Swift_COMPILER:PATH=${SWIFTC_BIN}
2967- -DCMAKE_INSTALL_PREFIX:PATH=$( get_host_install_prefix ${host} )
2968-
2969- ${LIBICU_BUILD_ARGS[@]}
2970-
2971- -DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=${LIBDISPATCH_SOURCE_DIR}
2972- -DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=$( build_directory ${host} libdispatch)
2973- -Ddispatch_DIR=$( build_directory ${host} libdispatch) /cmake/modules
2974-
2975- -DENABLE_TESTING:BOOL=YES
2976- -DXCTest_DIR=$( build_directory ${host} xctest) /cmake/modules
2977-
2978- -DCMAKE_SWIFT_COMPILER:PATH=${SWIFTC_BIN}
2979- -DFOUNDATION_PATH_TO_XCTEST_BUILD:PATH=$( build_directory ${host} xctest)
2980- )
2981-
2982- [[ -z " ${DISTCC} " ]] || EXTRA_DISTCC_OPTIONS=(" DISTCC_HOSTS=localhost,lzo,cpp" )
2983- export CTEST_OUTPUT_ON_FAILURE=1
2984- with_pushd " $( build_directory ${host} foundation) " \
2985- call env " ${EXTRA_DISTCC_OPTIONS[@]} " " ${CMAKE} " " ${cmake_options[@]} " " ${EXTRA_CMAKE_OPTIONS[@]} " " ${FOUNDATION_SOURCE_DIR} "
2986-
2987- results_targets=( " test" )
2988- executable_target=(" TestFoundation" )
2989- ;;
2990- foundation_static)
2922+ foundation|foundation_static)
29912923 continue
29922924 ;;
29932925 libdispatch)
0 commit comments