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

build: start comments at beginning of line #9375

Closed

Conversation

thefourtheye
Copy link
Contributor

@thefourtheye thefourtheye commented Oct 31, 2016

Checklist
  • make -j8 test (UNIX), or vcbuild test nosign (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

build

Description of change

As the comments are indented in Makefile, they are actually echoed
on the screen. This patch makes sure that the comments actually start
at the beginning of the line, and so not echoed and ignored.

--

cc @nodejs/build cc @nodejs/collaborators

As the comments are indented in Makefile, they are actually echoed
on the screen. This patch makes sure that the comments actually start
at the beginning of the line, and so not echoed and ignored.
@thefourtheye thefourtheye added the build Issues and PRs related to build files or the CI. label Oct 31, 2016
@nodejs-github-bot nodejs-github-bot added the build Issues and PRs related to build files or the CI. label Oct 31, 2016
@thefourtheye
Copy link
Contributor Author

Before

...
/Applications/Xcode.app/Contents/Developer/usr/bin/make build-addons
/Applications/Xcode.app/Contents/Developer/usr/bin/make -C out BUILDTYPE=Release V=1
# Cannot use test/addons/01_callbacks/ test/addons/02_object_factory/ test/addons/03_function_factory/ test/addons/04_wrapping_c_objects/ test/addons/05_factory_of_wrapped_objects/ test/addons/06_passing_wrapped_objects_around/ test/addons/07_atexit_hooks/ test/addons/async-hello-world/ test/addons/at-exit/ test/addons/buffer-free-callback/ test/addons/heap-profiler/ test/addons/hello-world-function-export/ test/addons/hello-world/ test/addons/load-long-path/ test/addons/make-callback-recurse/ test/addons/make-callback/ test/addons/node-module-version/ test/addons/null-buffer-neuter/ test/addons/openssl-binding/ test/addons/parse-encoding/ test/addons/repl-domain-abort/ test/addons/stringbytes-external-exceed-max/ test/addons/symlinked-module/ test/addons/testcfg.py test/addons/testcfg.pyc test/addons/zlib-binding/ here, it's evaluated before
# embedded addons have been generated from the documentation.
for dirname in test/addons/*/; do \
        ./node deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
            --python="/usr/local/opt/python/bin/python2.7" \
            --directory="$PWD/$dirname" \
            --nodedir="$PWD" || exit 1 ; \
    done
...

After

/Applications/Xcode.app/Contents/Developer/usr/bin/make build-addons
/Applications/Xcode.app/Contents/Developer/usr/bin/make -C out BUILDTYPE=Release V=1
for dirname in test/addons/*/; do \
        ./node deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
            --python="/usr/local/opt/python/bin/python2.7" \
            --directory="$PWD/$dirname" \
            --nodedir="$PWD" || exit 1 ; \
    done

Copy link
Member

@jbergstroem jbergstroem left a comment

Choose a reason for hiding this comment

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

Good catch.

Copy link
Contributor

@silverwind silverwind left a comment

Choose a reason for hiding this comment

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

LGTM, didn't know this was an issue in make

@jbergstroem
Copy link
Member

@silverwind: makefile is whitespace-aware. Try using ifeq() or other functions with a prefixed tab/space :)

@thefourtheye
Copy link
Contributor Author

Landed in f9504a5

@thefourtheye thefourtheye deleted the fix-comments-in-makefile branch November 5, 2016 09:38
thefourtheye added a commit that referenced this pull request Nov 5, 2016
As the comments are indented in Makefile, they are actually echoed
on the screen. This patch makes sure that the comments actually start
at the beginning of the line, and so not echoed and ignored.

PR-URL: #9375

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Prince John Wesley <princejohnwesley@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas pushed a commit that referenced this pull request Nov 7, 2016
As the comments are indented in Makefile, they are actually echoed
on the screen. This patch makes sure that the comments actually start
at the beginning of the line, and so not echoed and ignored.

PR-URL: #9375

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Prince John Wesley <princejohnwesley@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@MylesBorins
Copy link
Contributor

@thefourtheye do you want to backport this?

@thefourtheye
Copy link
Contributor Author

thefourtheye commented Nov 22, 2016

@thealphanerd Yes. Isn't this landing cleanly?

MylesBorins pushed a commit that referenced this pull request Nov 22, 2016
As the comments are indented in Makefile, they are actually echoed
on the screen. This patch makes sure that the comments actually start
at the beginning of the line, and so not echoed and ignored.

PR-URL: #9375

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Prince John Wesley <princejohnwesley@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@MylesBorins
Copy link
Contributor

it does on v6.x but not v4.x

@thefourtheye
Copy link
Contributor Author

@thealphanerd I backported this in #10364

MylesBorins pushed a commit that referenced this pull request Dec 21, 2016
As the comments are indented in Makefile, they are actually echoed
on the screen. This patch makes sure that the comments actually start
at the beginning of the line, and so not echoed and ignored.

PR-URL: #9375

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Prince John Wesley <princejohnwesley@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
MylesBorins pushed a commit that referenced this pull request Dec 21, 2016
As the comments are indented in Makefile, they are actually echoed
on the screen. This patch makes sure that the comments actually start
at the beginning of the line, and so not echoed and ignored.

PR-URL: #9375

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Prince John Wesley <princejohnwesley@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@MylesBorins MylesBorins mentioned this pull request Dec 21, 2016
abhishekumar-tyagi pushed a commit to abhishekumar-tyagi/node that referenced this pull request May 5, 2024
As the comments are indented in Makefile, they are actually echoed
on the screen. This patch makes sure that the comments actually start
at the beginning of the line, and so not echoed and ignored.

PR-URL: nodejs/node#9375

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Prince John Wesley <princejohnwesley@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants