From e03c3e086897be17b5533af73a72617f1be950c6 Mon Sep 17 00:00:00 2001
From: Dan Zheng <danielzheng@google.com>
Date: Mon, 6 Jan 2020 11:34:53 -0800
Subject: [PATCH] Make utils/build-toolchain compatible with Xcode new build
 system.

Xcode's new build system requires the Version entry in Info.plist to have a
particular date-based format.

Toolchains built using utils/build-toolchain now work with Xcode's new build
system.
---
 utils/build-toolchain | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/build-toolchain b/utils/build-toolchain
index 4edcc957bc40e..f89f30f3faf1d 100755
--- a/utils/build-toolchain
+++ b/utils/build-toolchain
@@ -98,15 +98,15 @@ set -x
 YEAR=$(date +"%Y")
 MONTH=$(date +"%m")
 DAY=$(date +"%d")
-TOOLCHAIN_VERSION="swift-LOCAL-${YEAR}-${MONTH}-${DAY}-a"
+TOOLCHAIN_VERSION="5.0.${YEAR}${MONTH}${DAY}"
+TOOLCHAIN_NAME="swift-LOCAL-${YEAR}-${MONTH}-${DAY}-a"
 DARWIN_TOOLCHAIN_VERSION="0.0.${YEAR}${MONTH}${DAY}"
-ARCHIVE="${TOOLCHAIN_VERSION}-${OS_SUFFIX}.tar.gz"
-SYM_ARCHIVE="${TOOLCHAIN_VERSION}-${OS_SUFFIX}-symbols.tar.gz"
+ARCHIVE="${TOOLCHAIN_NAME}-${OS_SUFFIX}.tar.gz"
+SYM_ARCHIVE="${TOOLCHAIN_NAME}-${OS_SUFFIX}-symbols.tar.gz"
 BUNDLE_PREFIX=${BUNDLE_PREFIX:?Please specify a bundle prefix}
 BUNDLE_IDENTIFIER="${BUNDLE_PREFIX}.${YEAR}${MONTH}${DAY}"
 DISPLAY_NAME_SHORT="Local Swift Development Snapshot"
 DISPLAY_NAME="${DISPLAY_NAME_SHORT} ${YEAR}-${MONTH}-${DAY}"
-TOOLCHAIN_NAME="${TOOLCHAIN_VERSION}"
 
 SWIFT_INSTALLABLE_PACKAGE="${RESULT_DIR}/${ARCHIVE}"
 SWIFT_INSTALL_DIR="${RESULT_DIR}/swift-nightly-install"
@@ -126,5 +126,5 @@ DISTCC_FLAG="${DISTCC_FLAG}"
         darwin_toolchain_display_name="${DISPLAY_NAME}" \
         darwin_toolchain_display_name_short="${DISPLAY_NAME_SHORT}" \
         darwin_toolchain_xctoolchain_name="${TOOLCHAIN_NAME}" \
-        darwin_toolchain_version="${DARWIN_TOOLCHAIN_VERSION}" \
+        darwin_toolchain_version="${TOOLCHAIN_VERSION}" \
         darwin_toolchain_alias="Local"