Fix v6 bootstrapping from v5 #1668
Merged
Conversation
This file contains 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
nickclark2016
approved these changes
Jul 14, 2021
|
This looks to have broken bootstrapping? |
|
I saw :( Hope to figure it out this morning
…On Wed, Jul 14, 2021, at 05:53, Samuel Surtees wrote:
This looks to have broken bootstrapping?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub <#1668 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAB43H223HQKWIWY6VMCQJLTXVNA7ANCNFSM5AJWQYUA>.
|
starkos
force-pushed
the
v6-bootstrapping
branch
from
3530c8d
to
871057e
Compare
|
Apologies for the premature PR…I've had another look at it and come up with a more complete solution. |
samsinsane
approved these changes
Jul 15, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Updated—my first build didn't catch all cases.
Trying to bootstrap the Premake6 build using Premake5 can throw an error "module 'dom' not found". This fix prevents Premake5 from picking up the v6 modules when run within a v6 source directory, by always loading modules from the same directory where their
_preload.luascript was located.How does this PR change Premake's behavior?
If an embedded script calls
require(), embedded modules will now be given precedence over scripts on the local file system. This situation only occurs during the bootstrapping phase of a release build, and in that situation we should always be using the embedded scripts, since what's on the file system might not be in sync with the native code used in the build.In addition to fixing v6 bootstrapping, this should also help with using v5 to bootstrap a new v5 build as well.
Anything else we should know?
Nope.
Did you check all the boxes?
Add unit tests showing fix or feature works; all tests pass(no great way to unit test this)closes #XXXXin comment to auto-close issue when PR is merged)You can now support Premake on our OpenCollective. Your contributions help us spend more time responding to requests like these!