Skip to content

Conversation

@goderbauer
Copy link
Member

Fixes #14578

@goderbauer
Copy link
Member Author

/cc @timsneath @aam

@Hixie
Copy link
Contributor

Hixie commented Aug 14, 2018

Can we put it in bin/cache/?

bin/flutter.bat Outdated
REM --------------------------------------------------------------------------

REM Execute a copy of the script to prevent modifications to a running script,
REM see https://github.com/flutter/flutter/issues/14578 for details.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need the reference to the bug, just say something like "(as might happen during an upgrade)" or some such.

@goderbauer
Copy link
Member Author

Can we put it in bin/cache/?

Initially I wanted to avoid that because it adds more complexity to this delicate script (what if cache doesn't exist yet? Now the original script and the copied version have different parent directories. etc.)

However, thinking about this more I am going to re-work this and break the script up into two scripts: one flutter.bat which is a wrapper that just copies a to-be-created script from bin/internal to bin/cache and then executes it. The new script will then do the heavy lifting of initializing flutter.

@goderbauer
Copy link
Member Author

I made the changes as described above. PTAL

REM ---------------------------------- NOTE ----------------------------------
REM
REM Please keep the logic in this file consistent with the logic in the
REM `flutter` script in the same directory to ensure that Flutter continues to
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nits: flutter script is no longer in the same directory.

Also, https://github.com/flutter/flutter/blob/master/bin/flutter#L10 needs to be adjusted to point to bin/internal/run_flutter.bat now.

Copy link
Member

@aam aam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still lgtm, even though it's a little sad to see similarity between bin/fluttter and bin/flutter.bat lost(with bin/flutter.bat split into two).

@goderbauer goderbauer merged commit 28bc818 into flutter:master Aug 16, 2018
@goderbauer goderbauer deleted the windows branch August 16, 2018 00:16
goderbauer added a commit that referenced this pull request Aug 16, 2018
@goderbauer goderbauer added the platform-windows Building on or for Windows specifically label Feb 22, 2019
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 7, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

platform-windows Building on or for Windows specifically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Error when flutter upgrade or flutter channel modifies flutter.bat

4 participants