Skip to content
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.

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

Add Xcode environment support #3311

Merged

Conversation

rwalker-apple
Copy link
Contributor

Problem

It is necessary to set arbitrary environment variables for Xcode builds in some environments, but chip_xcode_build_connector.sh only supports one or two.

Summary of Changes

  • add updirs(), which looks for a file in parent directories
  • use updirs() to find and source an _env.sh script for the connector

@rwalker-apple rwalker-apple marked this pull request as draft October 19, 2020 22:20
@bzbarsky-apple
Copy link
Contributor

@rwalker-apple Are the temperature-measurement bits here on purpose?

@rwalker-apple
Copy link
Contributor Author

@rwalker-apple Are the temperature-measurement bits here on purpose?

no, I think I have a borken master ;) fixed now

@rwalker-apple rwalker-apple force-pushed the Add-Xcode-environment-support branch from c18a9d8 to 0fa41b6 Compare October 20, 2020 04:05
@rwalker-apple rwalker-apple force-pushed the Add-Xcode-environment-support branch 4 times, most recently from 6b8a6f2 to 898dbe6 Compare October 20, 2020 04:40
@rwalker-apple rwalker-apple marked this pull request as ready for review October 20, 2020 16:43
@rwalker-apple
Copy link
Contributor Author

@rwalker-apple
Copy link
Contributor Author

@bzbarsky-apple ?

scripts/bootstrap.sh Outdated Show resolved Hide resolved
src/darwin/Framework/chip_xcode_build_connector.sh Outdated Show resolved Hide resolved
src/darwin/Framework/chip_xcode_build_connector.sh Outdated Show resolved Hide resolved
@rwalker-apple rwalker-apple force-pushed the Add-Xcode-environment-support branch from 898dbe6 to fb33d35 Compare October 20, 2020 21:11
@rwalker-apple rwalker-apple force-pushed the Add-Xcode-environment-support branch from c3bd6c4 to 0848d36 Compare October 20, 2020 21:33
* run activate in an external env from the Xcode connector
* fix pip install nits
* fix mismerge, set CHIP_ROOT unconditionally
* use better names than updirs, lookinfer
@rwalker-apple rwalker-apple force-pushed the Add-Xcode-environment-support branch from 0848d36 to 3b93b02 Compare October 20, 2020 23:02
@rwalker-apple rwalker-apple merged commit 5c21f07 into project-chip:master Oct 20, 2020
@rwalker-apple rwalker-apple deleted the Add-Xcode-environment-support branch October 20, 2020 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants