Bring back "Refactor Commands module"

[neonichu]

This reverts commit cf19c64 and restores the --build-path option. It also switches the bootstrap script back to using it so that we have an easy check that the option is still present.

[neonichu]

@swift-ci please smoke test

[neonichu]

@swift-ci please smoke test

[neonichu]

@swift-ci please test package compatibility

[neonichu]

Doing a toolchain build and package compatibility run since we needed to revert this the first time.

[tomerd]

why not use --scratch-path instead?

[neonichu]

why not use --scratch-path instead?

Don't think we should block this change on removing --build-path, it was just an unrelated cleanup that I snuck in here. It can happen as a separate PR instead.

[neonichu]

Looks like there's UPASS: rdar://101685791, swift-protobuf-plugin-example, 5.0, 85bec0, Swift Package which is probably because we merged #5855, otherwise package compatibility looks good.

Edit: confirmed, there's a PR already to fix the UPASS: swiftlang/swift-source-compat-suite#733

[neonichu]

@swift-ci please smoke test

[neonichu]

Looks like the toolchain build passed, so I think this should be ready to merge, but I'll double-check tomorrow.

[MaxDesiatov]

Ah, sorry about the conflict! 🙈

[neonichu]

Rebased.

[neonichu]

@swift-ci please smoke test

[neonichu]

I think this is good to go once the toolchain build passes (trying to be more careful to avoid another revert).

[neonichu]

Toolchain build passed as well, merging...