Skip to content

build-script: support CMake install steps. #25184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2019
Merged

build-script: support CMake install steps. #25184

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78218b0
build-script: support CMake install steps.
adrian-prantl Jun 1, 2019
2fa436e
[build-script] Run default `install` target before package testing
weliveindetail Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3537,24 +3537,25 @@ for host in "${ALL_HOSTS[@]}"; do
echo "--install-destdir is required to install products."
exit 1
fi

case ${host} in
linux-*)
if [[ "$using_xcodebuild" == "TRUE" ]] ; then
case ${host} in
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that it will be easier to read this as:

if [[ ${host} == macosx-* ]] ; then
  set_lldb_xcodebuild_options
  set_lldb_build_mode
  with_pushd ...
  continue
fi

At that point, you can even collapse the conditions into:

if [[ ${host} == macosx-* && ${using_xcodebuild} == TRUE ]] ; then

linux-*)
;;
freebsd-*)
freebsd-*)
;;
cygwin-*)
cygwin-*)
;;
haiku-*)
haiku-*)
;;
macosx-*)
set_lldb_xcodebuild_options
set_lldb_build_mode
with_pushd ${LLDB_SOURCE_DIR} \
call xcodebuild -target toolchain -configuration ${LLDB_BUILD_MODE} install ${lldb_xcodebuild_options[@]} DSTROOT="${host_install_destdir}" LLDB_TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}"
continue
macosx-*)
set_lldb_xcodebuild_options
set_lldb_build_mode
with_pushd ${LLDB_SOURCE_DIR} \
call xcodebuild -target toolchain -configuration ${LLDB_BUILD_MODE} install ${lldb_xcodebuild_options[@]} DSTROOT="${host_install_destdir}" LLDB_TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}"
continue
;;
esac
esac
fi
;;
swiftpm)
if [[ -z "${INSTALL_SWIFTPM}" ]] ; then
Expand Down