Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: update BUILDING.md #8704

Closed
wants to merge 4 commits into from
Closed

doc: update BUILDING.md #8704

wants to merge 4 commits into from

Conversation

rainabba
Copy link
Contributor

@rainabba rainabba commented Sep 21, 2016

Checklist
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

doc

Description of change

Added note about vcbuild being included as batch to clarify that it's not needed from msbuild tools or visual studio.

Added note about vcbuild being included as batch to clarify that it's not needed from msbuild tools or visual studio.
@nodejs-github-bot nodejs-github-bot added the doc Issues and PRs related to the documentations. label Sep 21, 2016
Copy link
Member

@jasnell jasnell left a comment

Choose a reason for hiding this comment

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

LGTM

@mscdex mscdex added the build Issues and PRs related to build files or the CI. label Sep 22, 2016
@@ -103,6 +103,7 @@ Prerequisites:
* Basic Unix tools required for some tests,
[Git for Windows](http://git-scm.com/download/win) includes Git Bash
and tools which can be included in the global `PATH`.
* vcbuild is provided by this repo as a batch file so if using powershell, use local syntax `./vcbuild nosign`
Copy link
Member

@Trott Trott Sep 22, 2016

Choose a reason for hiding this comment

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

I'd prefer this:

Please note that vcbuild is a batch file provided with the Node.js source code. If using PowerShell, invoke with a leading ./. For example: ./vcbuild nosign

Note that it should be a standalone sentence below the bulleted list of prerequisites, not an item on the list (as it is not a prerequisite).

Change per request of @Trott
Copy link
Contributor Author

@rainabba rainabba left a comment

Choose a reason for hiding this comment

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

Changes per request from @Trott

@rainabba
Copy link
Contributor Author

@Trott I've not used the code-review system on Github before so I hope I executed that change correctly. If not, I'd appreciate guidance and please know it wasn't for lack of trying.

@@ -103,7 +103,8 @@ Prerequisites:
* Basic Unix tools required for some tests,
[Git for Windows](http://git-scm.com/download/win) includes Git Bash
and tools which can be included in the global `PATH`.
* vcbuild is provided by this repo as a batch file so if using powershell, use local syntax `./vcbuild nosign`

Please note that vcbuild is a batch file provided with the Node.js source code. If using PowerShell, use local syntax. For example: ./vcbuild nosign
Copy link
Member

Choose a reason for hiding this comment

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

Since this is Windows, wouldn't .\ be more correct (and work in cmd.exe and PowerShell)? Is there any reason not to prefix all the examples .\ (e.g. .\vcbuild) to be consistent with ./configure/./node examples in the Unix / OS X section?

Copy link
Member

Choose a reason for hiding this comment

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

That sounds like an even better solution if that will work on all common Windows environments.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point!

@@ -104,6 +104,8 @@ Prerequisites:
[Git for Windows](http://git-scm.com/download/win) includes Git Bash
and tools which can be included in the global `PATH`.

Please note that vcbuild is a batch file provided with the Node.js source code. If using PowerShell, use local syntax. For example: ./vcbuild nosign
Copy link
Member

Choose a reason for hiding this comment

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

I wouldn't know what local syntax means in that context. I'd prefer use a leading .\.

Copy link
Member

Choose a reason for hiding this comment

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

Could you enclose vcbuild and ./vcbuild nosign in backticks to format them as code?
Also, this probably misses a trailing dot.

Copy link
Member

@ChALkeR ChALkeR left a comment

Choose a reason for hiding this comment

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

See the in-line comment, plus this needs an actual commit message formatted according to the documentation.

@@ -104,6 +104,8 @@ Prerequisites:
[Git for Windows](http://git-scm.com/download/win) includes Git Bash
and tools which can be included in the global `PATH`.

Please note that vcbuild is a batch file provided with the Node.js source code. If using PowerShell, use local syntax. For example: ./vcbuild nosign
Copy link
Member

Choose a reason for hiding this comment

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

Could you enclose vcbuild and ./vcbuild nosign in backticks to format them as code?
Also, this probably misses a trailing dot.

@Trott
Copy link
Member

Trott commented Sep 22, 2016

My little text-edit to help others has become a project in itself :/

IMO, people underestimate the difficulty of writing clear documentation. But the value is immense, so thanks for doing this, and I encourage you to not give up quite yet!

@Trott
Copy link
Member

Trott commented Sep 22, 2016

@rainabba I opened a PR against your branch that I think is what is being sought here. Can you take a look? If it looks good to you, you can merge it and it will be part of this PR.

If that works for you, then whoever lands (if it's not me) this should just squash my commit into yours.

@rainabba
Copy link
Contributor Author

rainabba commented Sep 22, 2016

@Trott The challenge here for me wasn't in the documentation (though your PR I just approved was definitely a cleaner approach than mine) so much as the PR process here that I'm still getting the hang of. Now per the request from @ChALkeR , I need to clean up my commit message, but I'm not sure the best way to make that happen and get that change through to here so it's clean without changing that one commit, then force pushing. I'd think that would be okay if nobody else had touched it, but I fear the moment I made the PR that would become a bad idea and I'm not sure how else to accomplish without a new PR. Of course, this assumes that the change requested by @ChALkeR is a show-stopper.

@Trott
Copy link
Member

Trott commented Sep 22, 2016

@rainabba: I would say:

  • You don't have to worry about fixing the commit message. Whoever lands this can modify the commit message to be the correct format.
  • Do look at the doc that @ChALkeR linked and run git log to look at existing commit messages so you get a feel for that.

If, after doing the second item above, you really want to fix the commit message, go for it. You can either edit your first commit to have the correctly-formatted message and force push, or you can squash everything into one commit and force-push.

But if all you do is just be familiar with it for next time, that's great. It doesn't need to be fixed by you this time, especially if you're uncertain of how it will affect GitHub's treatment of your branch in the pull request. (I'm pretty sure it will be fine no matter what you do, for what it's worth.)

Copy link
Member

@imyller imyller left a comment

Choose a reason for hiding this comment

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

LGTM

@imyller
Copy link
Member

imyller commented Sep 22, 2016

@Trott I can help this to a smooth landing after 48 hour window for PR is over.

@rainabba As said, don't worry. If required, we can handle the details like as commit message formatting and squashing commits when landing.

@imyller imyller self-assigned this Sep 22, 2016
@rainabba
Copy link
Contributor Author

@Trott @imyller Thanks guys. This has been a good learning experience for github reviews and contributing to nodejs as well as teaching me how to build/test.

@fhinkel
Copy link
Member

fhinkel commented Sep 23, 2016

Side note: It's no problem for GitHub if you force push onto a branch that's used in a PR :)

@imyller
Copy link
Member

imyller commented Sep 23, 2016

@fhinkel I regularly do just that to update PR content. Only things force push can potentially conflict with is the ongoing CI run and CI->GitHub status updates; and starting new CI fixes that.

Copy link
Member

@lpinca lpinca left a comment

Choose a reason for hiding this comment

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

LGTM

@imyller imyller changed the title Update BUILDING.md doc: update BUILDING.md Sep 23, 2016
@imyller
Copy link
Member

imyller commented Sep 23, 2016

I'll start landing this:

  • Five LGTMs
  • No objections
  • Requested changes have been made
  • CI not required

imyller pushed a commit that referenced this pull request Sep 23, 2016
Added note about vcbuild being included as batch to clarify
that it's not needed from msbuild tools or visual studio.

PR-URL: #8704
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Ilkka Myller <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@imyller
Copy link
Member

imyller commented Sep 23, 2016

landed in 92c1d96

Thank you for effort and contribution, @rainabba 👍

@imyller imyller closed this Sep 23, 2016
@imyller imyller removed their assignment Sep 23, 2016
jasnell pushed a commit that referenced this pull request Sep 29, 2016
Added note about vcbuild being included as batch to clarify
that it's not needed from msbuild tools or visual studio.

PR-URL: #8704
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Ilkka Myller <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Fishrock123 pushed a commit that referenced this pull request Oct 11, 2016
Added note about vcbuild being included as batch to clarify
that it's not needed from msbuild tools or visual studio.

PR-URL: #8704
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Ilkka Myller <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@joaocgreis
Copy link
Member

@MylesBorins about the dont-land-on-v4.x label here, is it just because it doesn't land cleanly? I cherry-picked and solved conflicts locally, I believe this is good to have, do you mind if I push?

@MylesBorins
Copy link
Contributor

@joaocgreis that was basically it, most doc changes that don't land cleanly have simply been dont-land.

joaocgreis pushed a commit that referenced this pull request Feb 9, 2017
Added note about vcbuild being included as batch to clarify
that it's not needed from msbuild tools or visual studio.

PR-URL: #8704
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Ilkka Myller <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@joaocgreis
Copy link
Member

Thanks @MylesBorins

Landed in v4.x-staging in 5b98fd0

MylesBorins pushed a commit that referenced this pull request Feb 21, 2017
Added note about vcbuild being included as batch to clarify
that it's not needed from msbuild tools or visual studio.

PR-URL: #8704
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Ilkka Myller <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issues and PRs related to build files or the CI. doc Issues and PRs related to the documentations.
Projects
None yet
Development

Successfully merging this pull request may close these issues.