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.

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

Restyle Add Xcode environment support #3325

Closed
wants to merge 3 commits into from
Closed

Restyle Add Xcode environment support #3325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f1e854
Add Xcode environment support
Oct 19, 2020
0fa41b6
* merge activate and bootstrap
Oct 20, 2020
46f9add
Restyled by shfmt
restyled-commits Oct 20, 2020
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
2 changes: 1 addition & 1 deletion examples/common/QRCode/repo
Open in desktop
Submodule repo updated 3 files
+10 −9 rust/examples/qrcodegen-demo.rs
+2 −2 rust/examples/qrcodegen-worker.rs
+27 −29 rust/src/lib.rs
35 changes: 0 additions & 35 deletions scripts/activate.sh
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions scripts/activate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bootstrap.sh
18 changes: 14 additions & 4 deletions scripts/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,17 @@
#

if [[ -n ${BASH_SOURCE[0]} ]]; then
CHIP_ROOT=$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)
me=${BASH_SOURCE[0]##*/}
else
CHIP_ROOT=$(cd "${0%/*}/.." && pwd)
me=${0##*/}
fi

if [[ ! -d ${CHIP_ROOT} ]]; then
if [[ -n ${BASH_SOURCE[0]} ]]; then
CHIP_ROOT=$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)
else
CHIP_ROOT=$(cd "${0%/*}/.." && pwd)
fi
fi

export PW_BRANDING_BANNER="$CHIP_ROOT/.chip-banner.txt"
Expand All @@ -32,10 +40,12 @@ git submodule update --init

export PW_VIRTUALENV_SETUP_PY_ROOTS="$CHIP_ROOT/integrations/mobly"

export PATH # https://bugs.chromium.org/p/pigweed/issues/detail?id=281

# shellcheck source=/dev/null
source "$CHIP_ROOT/third_party/pigweed/repo/bootstrap.sh"
source "$CHIP_ROOT/third_party/pigweed/repo/$me"

#TODO - remove this once native python building is solved for
# psutil (one of mobly's dependencies which CHIP does
# not actually need, so --no-deps is OK)
pip install --no-deps portpicker mobly
pip install --quiet --upgrade --no-deps portpicker mobly
29 changes: 25 additions & 4 deletions src/darwin/Framework/chip_xcode_build_connector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,35 @@ fi
)
}

updirs() {
declare lookinfer="${1}"
declare dir="${2:-$(pwd)}"

while [[ ! -e ${dir}/${lookinfer} && -n ${dir} ]]; do
dir=${dir%/*}
done

if [[ ! -e ${dir}/${lookinfer} ]]; then
printf 'error: updirs: %s not found\n' "$lookinfer" >&2
return 1
fi
printf '%s\n' "$dir/$lookinfer"
}

(
cd "$CHIP_ROOT" # pushd and popd because we need the env vars from activate

if ENV=$(updirs chip_xcode_build_connector_env.sh 2>/dev/null); then
. "$ENV"
fi

[[ -n $CHIP_NO_SUBMODULES ]] || git submodule update --init
if [[ -z $CHIP_NO_ACTIVATE ]]; then
if [[ -z $CHIP_NO_BOOTSTRAP ]]; then
# first run bootstrap in an external env to build everything
env -i PW_ENVSETUP_NO_BANNER=1 PW_ENVSETUP_QUIET=1 bash -c '. scripts/activate.sh'
set +ex
echo PW_ENVSETUP_QUIET=1 . scripts/activate.sh >&2
PW_ENVSETUP_QUIET=1 . scripts/activate.sh
(($? != 0)) && echo "Please source $CHIP_ROOT/scripts/bootstrap.sh before building" && exit 1
# now source activate for env vars
PW_ENVSETUP_NO_BANNER=1 PW_ENVSETUP_QUIET=1 . scripts/activate.sh
set -ex
fi

Expand Down