meson-to-hermetic: Rename meson-to-hermetic to -> meson_to_hermetic
Python packages does not allow for the use of hyphen as it's a reserved token. This change needs to be made to be imported by unit-tests in the future This change will require a new venv to be generated locally: `$ rm -rf venv` `$ ./setup-venv.sh` `$ source venv/bin/activate` Test: Run meson_to_hermetic/build-android/fuchsia-turnip.sh Bug: 360173803 Change-Id: Ie6fab4689ef5fc985e15747b0c06bfae662c387c
This commit is contained in:
parent
8e6d10e737
commit
c6cc3b175f
15 changed files with 7 additions and 7 deletions
|
|
@ -15,12 +15,12 @@ Status: useful, but rough. Supports Android (Soong) and Fuchsia (Bazel).
|
||||||
|
|
||||||
## Environment Setup
|
## Environment Setup
|
||||||
|
|
||||||
1. Open a terminal within `mesa3d/meson-to-hermetic`
|
1. Open a terminal within `mesa3d/meson_to_hermetic`
|
||||||
2. Run the `setup-venv.sh` file to automatically create a python3 venv and install dependencies.
|
2. Run the `setup-venv.sh` file to automatically create a python3 venv and install dependencies.
|
||||||
|
|
||||||
## Linting the code
|
## Linting the code
|
||||||
1. Before pushing code for review; run `lint.sh` to automatically lint all of the python scripts.
|
1. Before pushing code for review; run `lint.sh` to automatically lint all of the python scripts.
|
||||||
- IMPORTANT: Run the lint.sh from the `meson-to-hermetic` directory.
|
- IMPORTANT: Run the lint.sh from the `meson_to_hermetic` directory.
|
||||||
|
|
||||||
## 1 - Generate python from meson
|
## 1 - Generate python from meson
|
||||||
|
|
||||||
|
|
@ -27,7 +27,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Always generate Android.bp because it's fast
|
# Always generate Android.bp because it's fast
|
||||||
PYTHONPATH=$BIN_DIR python3 generate_android_build.py --config=meson-to-hermetic/aosp.toml
|
PYTHONPATH=$BIN_DIR python3 generate_android_build.py --config=meson_to_hermetic/aosp.toml
|
||||||
|
|
||||||
source $ROOT_DIR/build/envsetup.sh
|
source $ROOT_DIR/build/envsetup.sh
|
||||||
lunch aosp_trout_arm64-trunk_staging-userdebug
|
lunch aosp_trout_arm64-trunk_staging-userdebug
|
||||||
|
|
@ -25,9 +25,9 @@ function unwrap_zlib {
|
||||||
pushd fuchsia-build/third_party/zlib-*
|
pushd fuchsia-build/third_party/zlib-*
|
||||||
# Create an empty workspace
|
# Create an empty workspace
|
||||||
touch WORKSPACE.bazel
|
touch WORKSPACE.bazel
|
||||||
ln -s ../../../meson-to-hermetic meson-to-hermetic
|
ln -s ../../../meson_to_hermetic meson_to_hermetic
|
||||||
python3 meson-to-hermetic/generate_python_build.py --target fuchsia
|
python3 meson_to_hermetic/generate_python_build.py --target fuchsia
|
||||||
PYTHONPATH=$PWD/meson-to-hermetic python3 generate_fuchsia_build.py --config=meson-to-hermetic/fuchsia.toml
|
PYTHONPATH=$PWD/meson_to_hermetic python3 generate_fuchsia_build.py --config=meson_to_hermetic/fuchsia.toml
|
||||||
popd
|
popd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -50,7 +50,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Always generate Android.bp because it's fast
|
# Always generate Android.bp because it's fast
|
||||||
PYTHONPATH=$BIN_DIR python3 generate_fuchsia_build.py --config=meson-to-hermetic/fuchsia.toml
|
PYTHONPATH=$BIN_DIR python3 generate_fuchsia_build.py --config=meson_to_hermetic/fuchsia.toml
|
||||||
|
|
||||||
$BIN_DIR/../tools/bazel --bazelrc=fuchsia-build/third_party/fuchsia-infra-bazel-rules/config/common_config.bazelrc \
|
$BIN_DIR/../tools/bazel --bazelrc=fuchsia-build/third_party/fuchsia-infra-bazel-rules/config/common_config.bazelrc \
|
||||||
build --config=fuchsia_arm64 --platforms=@fuchsia_sdk//fuchsia/constraints/platforms:fuchsia_arm64 \
|
build --config=fuchsia_arm64 --platforms=@fuchsia_sdk//fuchsia/constraints/platforms:fuchsia_arm64 \
|
||||||
Loading…
Add table
Add a link
Reference in a new issue