This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Change pub_get_offline hook to find engine src relative to script #33869
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If a gclient checkout checks out engine source to a different directory, the source packages should be found relative to the script location. Bug: dart-lang/sdk#49163
whesse
commented
Jun 7, 2022
tools/pub_get_offline.py
Outdated
| pub_count = 0 | ||
| for package in ALL_PACKAGES: | ||
| if FetchPackage(pubcmd, package) != 0: | ||
| package_path = os.path.join(engine_src, ".." , package) |
Contributor
Author
There was a problem hiding this comment.
I could modify the package paths to remove the need for .., or I could create the array of package paths based on engine_src, moving it to a global variable ENGINE_SRC, if that is better.
zanderso
reviewed
Jun 7, 2022
tools/pub_get_offline.py
Outdated
| leading = os.path.join( | ||
| "src", "third_party", "dart", "tools", "sdks", "dart-sdk", "bin" | ||
| ) | ||
| script = os.path.realpath(__file__) |
Member
There was a problem hiding this comment.
I think the right thing to do is to follow the pattern that we use in other scripts for setting these paths up as globals like in:
then you can rewrite the paths in ALL_PACKAGES.
# Check that this is right.
SRC_ROOT = os.path.dirname(
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
)
FLUTTER_DIR = os.path.join(SRC_ROOT, 'flutter')
DART_BIN = os.path.join(SRC_ROOT, 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'dart')
ALL_PACKAGES = [
os.path.join(FLUTTER_DIR, "ci"),
...
]
Contributor
Author
There was a problem hiding this comment.
Done, changed to match that pattern.
Ran ci/bin/format.dart.
Tested the script by running from different working directories.
Tested the script detecting missing packages by injecting a missing dependency and testing.
If a gclient checkout checks out engine source to a different directory, the source packages should be found relative to the script location. Bug: dart-lang/sdk#49163
zanderso
approved these changes
Jun 9, 2022
Member
|
Huh. Sorry about the delay. My GitHub workflow is email driven, and I don't know why I missed this one. |
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Jun 9, 2022
houhuayong
pushed a commit
to houhuayong/engine
that referenced
this pull request
Jun 21, 2022
…utter#33869) * Change pub_get_offline hook to find engine src relative to script If a gclient checkout checks out engine source to a different directory, the source packages should be found relative to the script location. Bug: dart-lang/sdk#49163 * Change pub_get_offline hook to find engine src relative to script If a gclient checkout checks out engine source to a different directory, the source packages should be found relative to the script location. Bug: dart-lang/sdk#49163 * Fix merge errors, run ci/bin/format.dart
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a gclient checkout checks out engine source to a different directory than src/,
the source packages should be found relative to the script location.
The instructions for Flutter developers say to check out engine to engine/src,
and this change allows a gclient solution to check out to a different path and
still run the hooks.
Bug: dart-lang/sdk#49163