Cleaning up code:

 - Add darwin_ prefix to preset variables
 - Add license header to utils/toolchain-codesign and utils/toolchain-installer
 - Simplify the logic to remove Info.plist

Author: shahmishal

utils/build-presets.ini

@@ -597,7 +597,7 @@ installable-package=%(installable_package)s
 symbols-package=%(symbols_package)s
 
 # Info.plist 
-darwin-toolchain-bundle-identifier=%(toolchain_bundle_identifier)s
-darwin-toolchain-display-name=%(toolchain_display_name)s
-darwin-toolchain-name=%(toolchain_xctoolchain_name)s
-darwin-toolchain-version=%(toolchain_version)s
+darwin-toolchain-bundle-identifier=%(darwin_toolchain_bundle_identifier)s
+darwin-toolchain-display-name=%(darwin_toolchain_display_name)s
+darwin-toolchain-name=%(darwin_toolchain_xctoolchain_name)s
+darwin-toolchain-version=%(darwin_toolchain_version)s

utils/build-script-impl

@@ -2123,20 +2123,23 @@ if [[ "${INSTALLABLE_PACKAGE}" ]] ; then
         cp "${SWIFT_SOURCE_DIR}/utils/swift-stdlib-tool-substitute" "${INSTALL_DESTDIR}/${INSTALL_PREFIX}/bin/swift-stdlib-tool"
       fi
 
-      #Create plist for xctoolchain 
+      # Create plist for xctoolchain
       echo "-- Create Info.plist --"
       PLISTBUDDY_BIN="/usr/libexec/PlistBuddy"
+
       DARWIN_TOOLCHAIN_INSTALL_LOCATION="/Library/Developer/Toolchains/${DARWIN_TOOLCHAIN_NAME}.xctoolchain"
-      if [[ -f "${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist" ]] ; then
-        echo "-- Removing: ${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
-        rm "${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
-      fi
-      ${PLISTBUDDY_BIN} -c "Add DisplayName string '${DARWIN_TOOLCHAIN_DISPLAY_NAME}'" "${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
-      ${PLISTBUDDY_BIN} -c "Add Version string '${DARWIN_TOOLCHAIN_VERSION}'" "${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
-      ${PLISTBUDDY_BIN} -c "Add CFBundleIdentifier string '${DARWIN_TOOLCHAIN_BUNDLE_IDENTIFIER}'" "${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
-      ${PLISTBUDDY_BIN} -c "Add ReportProblemURL string 'https://bugs.swift.org/'" "${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
-      ${PLISTBUDDY_BIN} -c "Add OverrideEnvironment::DYLD_LIBRARY_PATH string '${DARWIN_TOOLCHAIN_INSTALL_LOCATION}/usr/lib'" "${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
-      chmod a+r "${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
+      DARWIN_TOOLCHAIN_INFO_PLIST="${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
+      DARWIN_TOOLCHAIN_REPORT_URL="https://bugs.swift.org/"
+
+      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 Version string '${DARWIN_TOOLCHAIN_VERSION}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
+      ${PLISTBUDDY_BIN} -c "Add CFBundleIdentifier string '${DARWIN_TOOLCHAIN_BUNDLE_IDENTIFIER}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
+      ${PLISTBUDDY_BIN} -c "Add ReportProblemURL string '${DARWIN_TOOLCHAIN_REPORT_URL}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
+      ${PLISTBUDDY_BIN} -c "Add OverrideEnvironment::DYLD_LIBRARY_PATH string '${DARWIN_TOOLCHAIN_INSTALL_LOCATION}/usr/lib'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
+      chmod a+r "${DARWIN_TOOLCHAIN_INFO_PLIST}"
 
       if [[ "${DARWIN_TOOLCHAIN_APPLICATION_CERT}" ]] ; then
         echo "-- Codesign xctoolchain --"

utils/toolchain-codesign

@@ -1,4 +1,15 @@
 #!/bin/bash
+#===--- build-script-impl - Implementation details of build-script ---------===#
+#
+## This source file is part of the Swift.org open source project
+##
+## Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
+## Licensed under Apache License v2.0 with Runtime Library Exception
+##
+## See http://swift.org/LICENSE.txt for license information
+## See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+#===------------------------------------------------------------------------===#
 
 DARWIN_TOOLCHAIN_APPLICATION_CERT=$1
 TOOLCHAIN_PREFIX=$2

utils/toolchain-installer

@@ -1,4 +1,15 @@
 #!/bin/bash
+#===--- build-script-impl - Implementation details of build-script ---------===#
+#
+## This source file is part of the Swift.org open source project
+##
+## Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
+## Licensed under Apache License v2.0 with Runtime Library Exception
+##
+## See http://swift.org/LICENSE.txt for license information
+## See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+#===------------------------------------------------------------------------===#
 
 TOOLCHAIN_PREFIX=$1
 DARWIN_BUNDLE_IDENTIFIER=$2