Skip to content
Snippets Groups Projects
Commit 0cd9ae5a authored by Simon McVittie's avatar Simon McVittie
Browse files

build-aux: Move sysroot convenience scripts to here

parent ce8daf1f
No related branches found
No related tags found
1 merge request!360build-aux: Move sysroot convenience scripts to here
Pipeline #16975 passed
File moved
File moved
...@@ -147,15 +147,15 @@ For more convenient use on a development system, if you have a ...@@ -147,15 +147,15 @@ For more convenient use on a development system, if you have a
SteamRT 1 'scout' SDK tarball or an unpacked sysroot, you can place a SteamRT 1 'scout' SDK tarball or an unpacked sysroot, you can place a
tarball at `_build/sysroot.tar.gz` or unpack a sysroot into tarball at `_build/sysroot.tar.gz` or unpack a sysroot into
`_build/sysroot`, and prefix those commands with `_build/sysroot`, and prefix those commands with
`./sysroot/run-in-sysroot.py`: `./build-aux/run-in-sysroot.py`:
./sysroot/run-in-sysroot.py apt-get update ./build-aux/run-in-sysroot.py apt-get update
./sysroot/run-in-sysroot.py meson --prefix="$(pwd)/_build/prefix" _build ./build-aux/run-in-sysroot.py meson --prefix="$(pwd)/_build/prefix" _build
./sysroot/run-in-sysroot.py ninja -C _build ./build-aux/run-in-sysroot.py ninja -C _build
(etc.) (etc.)
(Or put them in different locations and pass the `--sysroot` and (Or put them in different locations and pass the `--sysroot` and
`--tarball` options to `./sysroot/run-in-sysroot.py`.) `--tarball` options to `./build-aux/run-in-sysroot.py`.)
The relocatable install goes into `relocatable-install` (or The relocatable install goes into `relocatable-install` (or
whatever you used as the `--output`), and a compressed version ends whatever you used as the `--output`), and a compressed version ends
......
...@@ -37,9 +37,9 @@ export MYPYPATH="${PYTHONPATH:="$(pwd)"}" ...@@ -37,9 +37,9 @@ export MYPYPATH="${PYTHONPATH:="$(pwd)"}"
i=0 i=0
for script in \ for script in \
./build-aux/*.py \
./pressure-vessel/*.py \ ./pressure-vessel/*.py \
./pressure-vessel/pressure-vessel-test-ui \ ./pressure-vessel/pressure-vessel-test-ui \
./sysroot/*.py \
./tests/*/*.py \ ./tests/*/*.py \
; do ; do
i=$((i + 1)) i=$((i + 1))
......
...@@ -34,14 +34,14 @@ The same test can also be run against a version of pressure-vessel ...@@ -34,14 +34,14 @@ The same test can also be run against a version of pressure-vessel
that was built against scout: that was built against scout:
export PRESSURE_VESSEL_TEST_CONTAINERS=/path/to/containers export PRESSURE_VESSEL_TEST_CONTAINERS=/path/to/containers
./sysroot/run-in-sysroot.py --sysroot ../scout-sysroot -- \ ./build-aux/run-in-sysroot.py --sysroot ../scout-sysroot -- \
ninja -C _build-for-sysroot ninja -C _build-for-sysroot
env DESTDIR="$(pwd)/_build-for-sysroot/DESTDIR" \ env DESTDIR="$(pwd)/_build-for-sysroot/DESTDIR" \
./sysroot/run-in-sysroot.py --sysroot ../scout-sysroot -- \ ./build-aux/run-in-sysroot.py --sysroot ../scout-sysroot -- \
ninja -C _build-for-sysroot install ninja -C _build-for-sysroot install
rm -fr "$PRESSURE_VESSEL_TEST_CONTAINERS/pressure-vessel" rm -fr "$PRESSURE_VESSEL_TEST_CONTAINERS/pressure-vessel"
env DESTDIR="$(pwd)/_build-for-sysroot/DESTDIR" \ env DESTDIR="$(pwd)/_build-for-sysroot/DESTDIR" \
./sysroot/run-in-sysroot.py --sysroot ../scout-sysroot -- \ ./build-aux/run-in-sysroot.py --sysroot ../scout-sysroot -- \
python3.5 ./pressure-vessel/build-relocatable-install.py \ python3.5 ./pressure-vessel/build-relocatable-install.py \
--output="$PRESSURE_VESSEL_TEST_CONTAINERS/pressure-vessel" \ --output="$PRESSURE_VESSEL_TEST_CONTAINERS/pressure-vessel" \
--check-source-directory="$PRESSURE_VESSEL_TEST_CONTAINERS" \ --check-source-directory="$PRESSURE_VESSEL_TEST_CONTAINERS" \
......
...@@ -47,9 +47,9 @@ echo "1..1" ...@@ -47,9 +47,9 @@ echo "1..1"
if "${PYCODESTYLE}" \ if "${PYCODESTYLE}" \
--ignore=E402,W503 \ --ignore=E402,W503 \
./build-aux/*.py \
./pressure-vessel/*.py \ ./pressure-vessel/*.py \
./pressure-vessel/pressure-vessel-test-ui \ ./pressure-vessel/pressure-vessel-test-ui \
./sysroot/*.py \
./tests/*/*.py \ ./tests/*/*.py \
>&2; then >&2; then
echo "ok 1 - $PYCODESTYLE reported no issues" echo "ok 1 - $PYCODESTYLE reported no issues"
......
...@@ -37,9 +37,9 @@ if [ "x${PYFLAKES:=pyflakes3}" = xfalse ] || \ ...@@ -37,9 +37,9 @@ if [ "x${PYFLAKES:=pyflakes3}" = xfalse ] || \
[ -z "$(command -v "$PYFLAKES")" ]; then [ -z "$(command -v "$PYFLAKES")" ]; then
echo "1..0 # SKIP pyflakes3 not found" echo "1..0 # SKIP pyflakes3 not found"
elif "${PYFLAKES}" \ elif "${PYFLAKES}" \
./build-aux/*.py \
./pressure-vessel/*.py \ ./pressure-vessel/*.py \
./pressure-vessel/pressure-vessel-test-ui \ ./pressure-vessel/pressure-vessel-test-ui \
./sysroot/*.py \
./tests/*/*.py \ ./tests/*/*.py \
>&2; then >&2; then
echo "1..1" echo "1..1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment