Merge pull request #2266 from shahmishal/master

[Toolchain] properties for ShortDisplayName and CreatedDate

Author: shahmishal

utils/build-presets.ini

@@ -732,6 +732,7 @@ symbols-package=%(symbols_package)s
 # Info.plist
 darwin-toolchain-bundle-identifier=%(darwin_toolchain_bundle_identifier)s
 darwin-toolchain-display-name=%(darwin_toolchain_display_name)s
+darwin_toolchain_display_name_short=%(darwin_toolchain_display_name_short)s
 darwin-toolchain-name=%(darwin_toolchain_xctoolchain_name)s
 darwin-toolchain-version=%(darwin_toolchain_version)s
 darwin-toolchain-alias=%(darwin_toolchain_alias)s

utils/build-script-impl

@@ -204,6 +204,7 @@ KNOWN_SETTINGS=(
     use-gold-linker             ""               "Enable using the gold linker"
     darwin-toolchain-bundle-identifier ""        "CFBundleIdentifier for xctoolchain info plist"
     darwin-toolchain-display-name      ""        "Display Name for xctoolcain info plist"
+    darwin-toolchain-display-name-short ""       "Display Name with out date for xctoolchain info plist"
     darwin-toolchain-name              ""        "Directory name for xctoolchain"
     darwin-toolchain-version           ""        "Version for xctoolchain info plist and installer pkg"
     darwin-toolchain-application-cert  ""        "Application Cert name to codesign xctoolchain"
@@ -2564,11 +2565,14 @@ if [[ "${INSTALLABLE_PACKAGE}" ]] ; then
       DARWIN_TOOLCHAIN_INFO_PLIST="${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
       DARWIN_TOOLCHAIN_REPORT_URL="https://bugs.swift.org/"
       COMPATIBILITY_VERSION=2
+      DARWIN_TOOLCHAIN_CREATED_DATE="$(date -u +'%a %b %d %T GMT %Y')"
 
       echo "-- Removing: ${DARWIN_TOOLCHAIN_INFO_PLIST}"
       rm -f ${DARWIN_TOOLCHAIN_INFO_PLIST}
 
       ${PLISTBUDDY_BIN} -c "Add DisplayName string '${DARWIN_TOOLCHAIN_DISPLAY_NAME}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
+      ${PLISTBUDDY_BIN} -c "Add ShortDisplayName string '${DARWIN_TOOLCHAIN_DISPLAY_NAME_SHORT}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
+      ${PLISTBUDDY_BIN} -c "Add CreatedDate date '${DARWIN_TOOLCHAIN_CREATED_DATE}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
       ${PLISTBUDDY_BIN} -c "Add CompatibilityVersion integer ${COMPATIBILITY_VERSION}" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
       ${PLISTBUDDY_BIN} -c "Add Version string '${DARWIN_TOOLCHAIN_VERSION}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
       ${PLISTBUDDY_BIN} -c "Add CFBundleIdentifier string '${DARWIN_TOOLCHAIN_BUNDLE_IDENTIFIER}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"

utils/build-toolchain

@@ -21,7 +21,8 @@ ARCHIVE="${TOOLCHAIN_VERSION}-osx.tar.gz"
 SYM_ARCHIVE="${TOOLCHAIN_VERSION}-osx-symbols.tar.gz"
 BUNDLE_PREFIX=${1:?Please specify bundle prefix e.g. $0 local.swift}
 BUNDLE_IDENTIFIER="${BUNDLE_PREFIX}.${YEAR}${MONTH}${DAY}"
-DISPLAY_NAME="Local Swift Development Snapshot ${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="${SRC_DIR}/${ARCHIVE}"
@@ -44,6 +45,7 @@ fi
         symbols_package="${SYMBOLS_PACKAGE}" \
         darwin_toolchain_bundle_identifier="${BUNDLE_IDENTIFIER}" \
         darwin_toolchain_display_name="${DISPLAY_NAME}" \
+        darwin_toolchain_display_name_short="${DISPLAY_NAME_SHORT}" \
         darwin_toolchain_xctoolchain_name="${TOOLCHAIN_NAME}" \
         darwin_toolchain_version="${TOOLCHAIN_VERSION}" \
         darwin_toolchain_alias="Local"