Skip to content

Commit 7885cc0

Browse files
shahmishalshahmishal
committed
Add darwin prefix to toolchain var in build script
1 parent 9e5e408 commit 7885cc0

File tree

4 files changed

+32
-30
lines changed

4 files changed

+32
-30
lines changed

‎utils/build-presets.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ installable-package=%(installable_package)s
597597
symbols-package=%(symbols_package)s
598598

599599
# Info.plist
600-
toolchain-bundle-identifier=%(toolchain_bundle_identifier)s
601-
toolchain-display-name=%(toolchain_display_name)s
602-
toolchain-name=%(toolchain_xctoolchain_name)s
603-
toolchain-version=$(toolchain_version)s
600+
darwin-toolchain-bundle-identifier=%(toolchain_bundle_identifier)s
601+
darwin-toolchain-display-name=%(toolchain_display_name)s
602+
darwin-toolchain-name=%(toolchain_xctoolchain_name)s
603+
darwin-toolchain-version=$(toolchain_version)s

‎utils/build-script-impl

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@ KNOWN_SETTINGS=(
175175
swift-runtime-enable-dtrace "0" "Enable runtime dtrace support"
176176
swift-runtime-enable-leak-checker "0" "Enable leaks checking routines in the runtime"
177177
use-gold-linker "" "Enable using the gold linker"
178-
toolchain-bundle-identifier "" "CFBundleIdentifier for xctoolchain info plist"
179-
toolchain-display-name "" "Display Name for xctoolcain info plist"
180-
toolchain-name "" "File name for xctoolchain"
181-
toolchain-version "" "Version for xctoolchain info plist and installer pkg"
182-
toolchain-application-cert "" "Application Cert name to codesign xctoolchain"
183-
toolchain-installer-cert "" "Installer Cert name to create installer pkg"
184-
toolchain-installer-package "" "The path to installer pkg"
178+
darwin-toolchain-bundle-identifier "" "CFBundleIdentifier for xctoolchain info plist"
179+
darwin-toolchain-display-name "" "Display Name for xctoolcain info plist"
180+
darwin-toolchain-name "" "Directory name for xctoolchain"
181+
darwin-toolchain-version "" "Version for xctoolchain info plist and installer pkg"
182+
darwin-toolchain-application-cert "" "Application Cert name to codesign xctoolchain"
183+
darwin-toolchain-installer-cert "" "Installer Cert name to create installer pkg"
184+
darwin-toolchain-installer-package "" "The path to installer pkg"
185185

186186
)
187187

@@ -2126,22 +2126,24 @@ if [[ "${INSTALLABLE_PACKAGE}" ]] ; then
21262126
#Create plist for xctoolchain
21272127
echo "-- Create Info.plist --"
21282128
PLISTBUDDY_BIN="/usr/libexec/PlistBuddy"
2129-
TOOLCHAIN_INSTALL_LOCATION="/Library/Developer/Toolchains/${TOOLCHAIN_NAME}.xctoolchain/usr/lib"
2129+
TOOLCHAIN_INSTALL_LOCATION="/Library/Developer/Toolchains/${DARWIN_TOOLCHAIN_NAME}.xctoolchain"
21302130

2131-
${PLISTBUDDY_BIN} -c "Add DisplayName string '${TOOLCHAIN_DISPLAY_NAME}'" "${TOOLCHAIN_PREFIX}/Info.plist"
2132-
${PLISTBUDDY_BIN} -c "Add Version string '${TOOLCHAIN_VERSION}'" "${TOOLCHAIN_PREFIX}/Info.plist"
2133-
${PLISTBUDDY_BIN} -c "Add CFBundleIdentifier string '${TOOLCHAIN_BUNDLE_IDENTIFIER}'" "${TOOLCHAIN_PREFIX}/Info.plist"
2134-
${PLISTBUDDY_BIN} -c "Add ReportProblemURL string 'https://bugs.swift.com/'" "${TOOLCHAIN_PREFIX}/Info.plist"
2135-
${PLISTBUDDY_BIN} -c "Add OverrideEnvironment::DYLD_LIBRARY_PATH string '${TOOLCHAIN_INSTALL_LOCATION}/usr/lib'" "${TOOLCHAIN_PREFIX}/Info.plist"
2131+
${PLISTBUDDY_BIN} -c "Add DisplayName string '${DARWIN_TOOLCHAIN_DISPLAY_NAME}'" "${TOOLCHAIN_PREFIX}/Info.plist"
2132+
${PLISTBUDDY_BIN} -c "Add Version string '${DARWIN_TOOLCHAIN_VERSION}'" "${TOOLCHAIN_PREFIX}/Info.plist"
2133+
${PLISTBUDDY_BIN} -c "Add CFBundleIdentifier string '${DARWIN_TOOLCHAIN_BUNDLE_IDENTIFIER}'" "${TOOLCHAIN_PREFIX}/Info.plist"
2134+
${PLISTBUDDY_BIN} -c "Add ReportProblemURL string 'https://bugs.swift.org/'" "${TOOLCHAIN_PREFIX}/Info.plist"
2135+
${PLISTBUDDY_BIN} -c "Add OverrideEnvironment::DYLD_LIBRARY_PATH string '${DARWIN_TOOLCHAIN_INSTALL_LOCATION}/usr/lib'" "${TOOLCHAIN_PREFIX}/Info.plist"
21362136
chmod a+r "${TOOLCHAIN_PREFIX}/Info.plist"
21372137

2138-
if [[ "${APPLICATION_CERT}" ]] ; then
2138+
if [[ "${DARWIN_TOOLCHAIN_APPLICATION_CERT}" ]] ; then
21392139
echo "-- Codesign xctoolchain --"
2140-
"${SWIFT_SOURCE_DIR}/utils/toolchain-codesign" "${TOOLCHAIN_APPLICATION_CERT}" "${TOOLCHAIN_PREFIX}"
2140+
"${SWIFT_SOURCE_DIR}/utils/toolchain-codesign" "${DARWIN_TOOLCHAIN_APPLICATION_CERT}" "${TOOLCHAIN_PREFIX}"
21412141
fi
2142-
if [[ "${INSTALLER_PACKAGE}" ]] ; then
2142+
if [[ "${DARWIN_TOOLCHAIN_INSTALLER_PACKAGE}" ]] ; then
21432143
echo "-- Create Installer --"
2144-
"${SWIFT_SOURCE_DIR}/utils/toolchain-installer" "${TOOLCHAIN_PREFIX}" "${TOOLCHAIN_BUNDLE_IDENTIFIER}" "${TOOLCHAIN_INSTALLER_CERT}" "${TOOLCHAIN_INSTALLER_PACKAGE}" "${TOOLCHAIN_INSTALL_LOCATION}" "${TOOLCHAIN_VERSION}"
2144+
"${SWIFT_SOURCE_DIR}/utils/toolchain-installer" "${TOOLCHAIN_PREFIX}" "${DARWIN_TOOLCHAIN_BUNDLE_IDENTIFIER}" \
2145+
"${DARWIN_TOOLCHAIN_INSTALLER_CERT}" "${DARWIN_TOOLCHAIN_INSTALLER_PACKAGE}" "${DARWIN_TOOLCHAIN_INSTALL_LOCATION}" \
2146+
"${DARWIN_TOOLCHAIN_VERSION}"
21452147
fi
21462148

21472149
(cd "${INSTALL_DESTDIR}" &&

‎utils/toolchain-codesign

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
TOOLCHAIN_APPLICATION_CERT=$1
3+
DARWIN_TOOLCHAIN_APPLICATION_CERT=$1
44
TOOLCHAIN_PREFIX=$2
55

6-
codesign -f --deep -s "${TOOLCHAIN_APPLICATION_CERT}" "${TOOLCHAIN_PREFIX}"
6+
codesign -f --deep -s "${DARWIN_TOOLCHAIN_APPLICATION_CERT}" "${TOOLCHAIN_PREFIX}"

‎utils/toolchain-installer

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
22

33
TOOLCHAIN_PREFIX=$1
4-
BUNDLE_IDENTIFIER=$2
5-
INSTALLER_CERT=$3
6-
INSTALLER_PACKAGE=$4
7-
TOOLCHAIN_INSTALL_LOCATION=$5
8-
TOOLCHAIN_VERSION=$6
4+
DARWIN_BUNDLE_IDENTIFIER=$2
5+
DARWIN_INSTALLER_CERT=$3
6+
DARWIN_INSTALLER_PACKAGE=$4
7+
DARWIN_TOOLCHAIN_INSTALL_LOCATION=$5
8+
DARWIN_TOOLCHAIN_VERSION=$6
99

10-
pkgbuild --root "${TOOLCHAIN_PREFIX}" --install-location "${TOOLCHAIN_INSTALL_LOCATION}" "${INSTALLER_PACKAGE}" \
11-
--version "${TOOLCHAIN_VERSION}" --identifier "${BUNDLE_IDENTIFIER}" --sign "${INSTALLER_CERT}"
10+
pkgbuild --root "${TOOLCHAIN_PREFIX}" --install-location "${DARWIN_TOOLCHAIN_INSTALL_LOCATION}" "${DARWIN_INSTALLER_PACKAGE}" \
11+
--version "${DARWIN_TOOLCHAIN_VERSION}" --identifier "${DARWIN_BUNDLE_IDENTIFIER}" --sign "${DARWIN_INSTALLER_CERT}"

0 commit comments

Comments
 (0)