Zos fixes - #1451

Closed
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos
Closed

Zos fixes#1451
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos

Conversation

@jBarz

@jBarzjBarz commented May 30, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

On z/OS, we fixed up node-gyp that comes packaged with node 6.x.
This PR transports those fixes here so that node-gyp works as a standalone.

@jBarzjBarz changed the title ZosZos fixesMay 30, 2018
bnoordhuis
bnoordhuis approved these changes May 30, 2018
View reviewed changes

@bnoordhuisbnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/46/

richardlau
richardlau reviewed May 30, 2018
View reviewed changes
Comment threadlib/configure.js Outdated
'node',
'out/Release/obj.target/libnode',
'out/Debug/obj.target/libnode',
'lib/libnode'].map(function(file) {

@richardlaurichardlauMay 30, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Might be an idea to rewrite the comment just prior to this block as it's no longer AIX specific. We can probably drop the candidate locations from the comment as it's a duplicate of the code. Something like:

// For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking.

Also will the exports file ever be include/node/node.x on z/OS? If not, we could slightly speed up by using a different set of candidates per platform.

@jBarzjBarzMay 30, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks @richardlau
I will rewrite that comment.
Also the exports file on z/OS will never be include/node/node.x
So I will do as you suggested.

@richardlau

richardlau commented May 30, 2018

Copy link
Copy Markdown
Member

New CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/47/

@richardlaurichardlau mentioned this pull request May 30, 2018
Closed
jBarz added 2 commits May 30, 2018 15:16
@jBarz
zos: add search locations for libnode.x
ba59f82
NodeJS on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
@jBarz
zos: don't use universal-new-lines mode
32d008a
This reverts commit 40edac20c8c9644067636e5722c389954890bccf.
@jBarz

jBarz commented May 30, 2018

Copy link
Copy Markdown
ContributorAuthor

new CI after I addressed nits.

@refack

refack commented May 30, 2018

Copy link
Copy Markdown
Contributor

CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/51/

refack
refack reviewed May 30, 2018
View reviewed changes
Comment threadgyp/pylib/gyp/input.py
# to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n'
# which otherwise will fail eval()
build_file_contents = open(build_file_path, 'rU').read()
if sys.platform == 'zos':

@refackrefackMay 30, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did you try to upstream it. Or in other words, will it be a problem for node (if we have non ASCII chars, possibly in config.gypi via node-prefix for example) ?

Or will it be better that node-gyp will generate UTF-8-BOM files, and skip patching GYP?

@jBarzjBarzMay 31, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@refack I tried looking for what node-prefix does. but couldn't find anything. Can you point me to some documentation about it?

bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: add search locations for libnode.x
02ac2e7
Node.js on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: don't use universal-new-lines mode
eaedc12
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@bnoordhuis

bnoordhuis commented Jun 8, 2018

Copy link
Copy Markdown
Member

Cheers, landed in 293092c...eaedc12.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlaurichardlaurichardlau left review comments
@bnoordhuisbnoordhuisbnoordhuis approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jBarz@richardlau@refack@bnoordhuis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Zos fixes - #1451

Closed
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos
Closed

Zos fixes#1451
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos

Conversation

@jBarz

@jBarzjBarz commented May 30, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

On z/OS, we fixed up node-gyp that comes packaged with node 6.x.
This PR transports those fixes here so that node-gyp works as a standalone.

@jBarzjBarz changed the title ZosZos fixesMay 30, 2018
bnoordhuis
bnoordhuis approved these changes May 30, 2018
View reviewed changes

@bnoordhuisbnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/46/

richardlau
richardlau reviewed May 30, 2018
View reviewed changes
Comment threadlib/configure.js Outdated
'node',
'out/Release/obj.target/libnode',
'out/Debug/obj.target/libnode',
'lib/libnode'].map(function(file) {

@richardlaurichardlauMay 30, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Might be an idea to rewrite the comment just prior to this block as it's no longer AIX specific. We can probably drop the candidate locations from the comment as it's a duplicate of the code. Something like:

// For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking.

Also will the exports file ever be include/node/node.x on z/OS? If not, we could slightly speed up by using a different set of candidates per platform.

@jBarzjBarzMay 30, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks @richardlau
I will rewrite that comment.
Also the exports file on z/OS will never be include/node/node.x
So I will do as you suggested.

@richardlau

richardlau commented May 30, 2018

Copy link
Copy Markdown
Member

New CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/47/

@richardlaurichardlau mentioned this pull request May 30, 2018
Closed
jBarz added 2 commits May 30, 2018 15:16
@jBarz
zos: add search locations for libnode.x
ba59f82
NodeJS on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
@jBarz
zos: don't use universal-new-lines mode
32d008a
This reverts commit 40edac20c8c9644067636e5722c389954890bccf.
@jBarz

jBarz commented May 30, 2018

Copy link
Copy Markdown
ContributorAuthor

new CI after I addressed nits.

@refack

refack commented May 30, 2018

Copy link
Copy Markdown
Contributor

CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/51/

refack
refack reviewed May 30, 2018
View reviewed changes
Comment threadgyp/pylib/gyp/input.py
# to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n'
# which otherwise will fail eval()
build_file_contents = open(build_file_path, 'rU').read()
if sys.platform == 'zos':

@refackrefackMay 30, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did you try to upstream it. Or in other words, will it be a problem for node (if we have non ASCII chars, possibly in config.gypi via node-prefix for example) ?

Or will it be better that node-gyp will generate UTF-8-BOM files, and skip patching GYP?

@jBarzjBarzMay 31, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@refack I tried looking for what node-prefix does. but couldn't find anything. Can you point me to some documentation about it?

bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: add search locations for libnode.x
02ac2e7
Node.js on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: don't use universal-new-lines mode
eaedc12
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@bnoordhuis

bnoordhuis commented Jun 8, 2018

Copy link
Copy Markdown
Member

Cheers, landed in 293092c...eaedc12.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlaurichardlaurichardlau left review comments
@bnoordhuisbnoordhuisbnoordhuis approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jBarz@richardlau@refack@bnoordhuis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Zos fixes - #1451

Closed
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos
Closed

Zos fixes#1451
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos

Conversation

@jBarz

@jBarzjBarz commented May 30, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

On z/OS, we fixed up node-gyp that comes packaged with node 6.x.
This PR transports those fixes here so that node-gyp works as a standalone.

@jBarzjBarz changed the title ZosZos fixesMay 30, 2018
bnoordhuis
bnoordhuis approved these changes May 30, 2018
View reviewed changes

@bnoordhuisbnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/46/

richardlau
richardlau reviewed May 30, 2018
View reviewed changes
Comment threadlib/configure.js Outdated
'node',
'out/Release/obj.target/libnode',
'out/Debug/obj.target/libnode',
'lib/libnode'].map(function(file) {

@richardlaurichardlauMay 30, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Might be an idea to rewrite the comment just prior to this block as it's no longer AIX specific. We can probably drop the candidate locations from the comment as it's a duplicate of the code. Something like:

// For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking.

Also will the exports file ever be include/node/node.x on z/OS? If not, we could slightly speed up by using a different set of candidates per platform.

@jBarzjBarzMay 30, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks @richardlau
I will rewrite that comment.
Also the exports file on z/OS will never be include/node/node.x
So I will do as you suggested.

@richardlau

richardlau commented May 30, 2018

Copy link
Copy Markdown
Member

New CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/47/

@richardlaurichardlau mentioned this pull request May 30, 2018
Closed
jBarz added 2 commits May 30, 2018 15:16
@jBarz
zos: add search locations for libnode.x
ba59f82
NodeJS on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
@jBarz
zos: don't use universal-new-lines mode
32d008a
This reverts commit 40edac20c8c9644067636e5722c389954890bccf.
@jBarz

jBarz commented May 30, 2018

Copy link
Copy Markdown
ContributorAuthor

new CI after I addressed nits.

@refack

refack commented May 30, 2018

Copy link
Copy Markdown
Contributor

CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/51/

refack
refack reviewed May 30, 2018
View reviewed changes
Comment threadgyp/pylib/gyp/input.py
# to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n'
# which otherwise will fail eval()
build_file_contents = open(build_file_path, 'rU').read()
if sys.platform == 'zos':

@refackrefackMay 30, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did you try to upstream it. Or in other words, will it be a problem for node (if we have non ASCII chars, possibly in config.gypi via node-prefix for example) ?

Or will it be better that node-gyp will generate UTF-8-BOM files, and skip patching GYP?

@jBarzjBarzMay 31, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@refack I tried looking for what node-prefix does. but couldn't find anything. Can you point me to some documentation about it?

bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: add search locations for libnode.x
02ac2e7
Node.js on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: don't use universal-new-lines mode
eaedc12
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@bnoordhuis

bnoordhuis commented Jun 8, 2018

Copy link
Copy Markdown
Member

Cheers, landed in 293092c...eaedc12.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlaurichardlaurichardlau left review comments
@bnoordhuisbnoordhuisbnoordhuis approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jBarz@richardlau@refack@bnoordhuis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Zos fixes - #1451

Closed
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos
Closed

Zos fixes#1451
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos

Conversation

@jBarz

@jBarzjBarz commented May 30, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

On z/OS, we fixed up node-gyp that comes packaged with node 6.x.
This PR transports those fixes here so that node-gyp works as a standalone.

@jBarzjBarz changed the title ZosZos fixesMay 30, 2018
bnoordhuis
bnoordhuis approved these changes May 30, 2018
View reviewed changes

@bnoordhuisbnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/46/

richardlau
richardlau reviewed May 30, 2018
View reviewed changes
Comment threadlib/configure.js Outdated
'node',
'out/Release/obj.target/libnode',
'out/Debug/obj.target/libnode',
'lib/libnode'].map(function(file) {

@richardlaurichardlauMay 30, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Might be an idea to rewrite the comment just prior to this block as it's no longer AIX specific. We can probably drop the candidate locations from the comment as it's a duplicate of the code. Something like:

// For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking.

Also will the exports file ever be include/node/node.x on z/OS? If not, we could slightly speed up by using a different set of candidates per platform.

@jBarzjBarzMay 30, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks @richardlau
I will rewrite that comment.
Also the exports file on z/OS will never be include/node/node.x
So I will do as you suggested.

@richardlau

richardlau commented May 30, 2018

Copy link
Copy Markdown
Member

New CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/47/

@richardlaurichardlau mentioned this pull request May 30, 2018
Closed
jBarz added 2 commits May 30, 2018 15:16
@jBarz
zos: add search locations for libnode.x
ba59f82
NodeJS on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
@jBarz
zos: don't use universal-new-lines mode
32d008a
This reverts commit 40edac20c8c9644067636e5722c389954890bccf.
@jBarz

jBarz commented May 30, 2018

Copy link
Copy Markdown
ContributorAuthor

new CI after I addressed nits.

@refack

refack commented May 30, 2018

Copy link
Copy Markdown
Contributor

CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/51/

refack
refack reviewed May 30, 2018
View reviewed changes
Comment threadgyp/pylib/gyp/input.py
# to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n'
# which otherwise will fail eval()
build_file_contents = open(build_file_path, 'rU').read()
if sys.platform == 'zos':

@refackrefackMay 30, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did you try to upstream it. Or in other words, will it be a problem for node (if we have non ASCII chars, possibly in config.gypi via node-prefix for example) ?

Or will it be better that node-gyp will generate UTF-8-BOM files, and skip patching GYP?

@jBarzjBarzMay 31, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@refack I tried looking for what node-prefix does. but couldn't find anything. Can you point me to some documentation about it?

bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: add search locations for libnode.x
02ac2e7
Node.js on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: don't use universal-new-lines mode
eaedc12
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@bnoordhuis

bnoordhuis commented Jun 8, 2018

Copy link
Copy Markdown
Member

Cheers, landed in 293092c...eaedc12.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlaurichardlaurichardlau left review comments
@bnoordhuisbnoordhuisbnoordhuis approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jBarz@richardlau@refack@bnoordhuis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Zos fixes - #1451

Closed
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos
Closed

Zos fixes#1451
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos

Conversation

@jBarz

@jBarzjBarz commented May 30, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

On z/OS, we fixed up node-gyp that comes packaged with node 6.x.
This PR transports those fixes here so that node-gyp works as a standalone.

@jBarzjBarz changed the title ZosZos fixesMay 30, 2018
bnoordhuis
bnoordhuis approved these changes May 30, 2018
View reviewed changes

@bnoordhuisbnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/46/

richardlau
richardlau reviewed May 30, 2018
View reviewed changes
Comment threadlib/configure.js Outdated
'node',
'out/Release/obj.target/libnode',
'out/Debug/obj.target/libnode',
'lib/libnode'].map(function(file) {

@richardlaurichardlauMay 30, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Might be an idea to rewrite the comment just prior to this block as it's no longer AIX specific. We can probably drop the candidate locations from the comment as it's a duplicate of the code. Something like:

// For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking.

Also will the exports file ever be include/node/node.x on z/OS? If not, we could slightly speed up by using a different set of candidates per platform.

@jBarzjBarzMay 30, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks @richardlau
I will rewrite that comment.
Also the exports file on z/OS will never be include/node/node.x
So I will do as you suggested.

@richardlau

richardlau commented May 30, 2018

Copy link
Copy Markdown
Member

New CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/47/

@richardlaurichardlau mentioned this pull request May 30, 2018
Closed
jBarz added 2 commits May 30, 2018 15:16
@jBarz
zos: add search locations for libnode.x
ba59f82
NodeJS on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
@jBarz
zos: don't use universal-new-lines mode
32d008a
This reverts commit 40edac20c8c9644067636e5722c389954890bccf.
@jBarz

jBarz commented May 30, 2018

Copy link
Copy Markdown
ContributorAuthor

new CI after I addressed nits.

@refack

refack commented May 30, 2018

Copy link
Copy Markdown
Contributor

CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/51/

refack
refack reviewed May 30, 2018
View reviewed changes
Comment threadgyp/pylib/gyp/input.py
# to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n'
# which otherwise will fail eval()
build_file_contents = open(build_file_path, 'rU').read()
if sys.platform == 'zos':

@refackrefackMay 30, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did you try to upstream it. Or in other words, will it be a problem for node (if we have non ASCII chars, possibly in config.gypi via node-prefix for example) ?

Or will it be better that node-gyp will generate UTF-8-BOM files, and skip patching GYP?

@jBarzjBarzMay 31, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@refack I tried looking for what node-prefix does. but couldn't find anything. Can you point me to some documentation about it?

bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: add search locations for libnode.x
02ac2e7
Node.js on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: don't use universal-new-lines mode
eaedc12
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@bnoordhuis

bnoordhuis commented Jun 8, 2018

Copy link
Copy Markdown
Member

Cheers, landed in 293092c...eaedc12.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlaurichardlaurichardlau left review comments
@bnoordhuisbnoordhuisbnoordhuis approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jBarz@richardlau@refack@bnoordhuis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Zos fixes - #1451

Closed
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos
Closed

Zos fixes#1451
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos

Conversation

@jBarz

@jBarzjBarz commented May 30, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

On z/OS, we fixed up node-gyp that comes packaged with node 6.x.
This PR transports those fixes here so that node-gyp works as a standalone.

@jBarzjBarz changed the title ZosZos fixesMay 30, 2018
bnoordhuis
bnoordhuis approved these changes May 30, 2018
View reviewed changes

@bnoordhuisbnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/46/

richardlau
richardlau reviewed May 30, 2018
View reviewed changes
Comment threadlib/configure.js Outdated
'node',
'out/Release/obj.target/libnode',
'out/Debug/obj.target/libnode',
'lib/libnode'].map(function(file) {

@richardlaurichardlauMay 30, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Might be an idea to rewrite the comment just prior to this block as it's no longer AIX specific. We can probably drop the candidate locations from the comment as it's a duplicate of the code. Something like:

// For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking.

Also will the exports file ever be include/node/node.x on z/OS? If not, we could slightly speed up by using a different set of candidates per platform.

@jBarzjBarzMay 30, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks @richardlau
I will rewrite that comment.
Also the exports file on z/OS will never be include/node/node.x
So I will do as you suggested.

@richardlau

richardlau commented May 30, 2018

Copy link
Copy Markdown
Member

New CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/47/

@richardlaurichardlau mentioned this pull request May 30, 2018
Closed
jBarz added 2 commits May 30, 2018 15:16
@jBarz
zos: add search locations for libnode.x
ba59f82
NodeJS on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
@jBarz
zos: don't use universal-new-lines mode
32d008a
This reverts commit 40edac20c8c9644067636e5722c389954890bccf.
@jBarz

jBarz commented May 30, 2018

Copy link
Copy Markdown
ContributorAuthor

new CI after I addressed nits.

@refack

refack commented May 30, 2018

Copy link
Copy Markdown
Contributor

CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/51/

refack
refack reviewed May 30, 2018
View reviewed changes
Comment threadgyp/pylib/gyp/input.py
# to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n'
# which otherwise will fail eval()
build_file_contents = open(build_file_path, 'rU').read()
if sys.platform == 'zos':

@refackrefackMay 30, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did you try to upstream it. Or in other words, will it be a problem for node (if we have non ASCII chars, possibly in config.gypi via node-prefix for example) ?

Or will it be better that node-gyp will generate UTF-8-BOM files, and skip patching GYP?

@jBarzjBarzMay 31, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@refack I tried looking for what node-prefix does. but couldn't find anything. Can you point me to some documentation about it?

bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: add search locations for libnode.x
02ac2e7
Node.js on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: don't use universal-new-lines mode
eaedc12
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@bnoordhuis

bnoordhuis commented Jun 8, 2018

Copy link
Copy Markdown
Member

Cheers, landed in 293092c...eaedc12.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlaurichardlaurichardlau left review comments
@bnoordhuisbnoordhuisbnoordhuis approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jBarz@richardlau@refack@bnoordhuis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Zos fixes - #1451

Closed
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos
Closed

Zos fixes#1451
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos

Conversation

@jBarz

@jBarzjBarz commented May 30, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

On z/OS, we fixed up node-gyp that comes packaged with node 6.x.
This PR transports those fixes here so that node-gyp works as a standalone.

@jBarzjBarz changed the title ZosZos fixesMay 30, 2018
bnoordhuis
bnoordhuis approved these changes May 30, 2018
View reviewed changes

@bnoordhuisbnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/46/

richardlau
richardlau reviewed May 30, 2018
View reviewed changes
Comment threadlib/configure.js Outdated
'node',
'out/Release/obj.target/libnode',
'out/Debug/obj.target/libnode',
'lib/libnode'].map(function(file) {

@richardlaurichardlauMay 30, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Might be an idea to rewrite the comment just prior to this block as it's no longer AIX specific. We can probably drop the candidate locations from the comment as it's a duplicate of the code. Something like:

// For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking.

Also will the exports file ever be include/node/node.x on z/OS? If not, we could slightly speed up by using a different set of candidates per platform.

@jBarzjBarzMay 30, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks @richardlau
I will rewrite that comment.
Also the exports file on z/OS will never be include/node/node.x
So I will do as you suggested.

@richardlau

richardlau commented May 30, 2018

Copy link
Copy Markdown
Member

New CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/47/

@richardlaurichardlau mentioned this pull request May 30, 2018
Closed
jBarz added 2 commits May 30, 2018 15:16
@jBarz
zos: add search locations for libnode.x
ba59f82
NodeJS on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
@jBarz
zos: don't use universal-new-lines mode
32d008a
This reverts commit 40edac20c8c9644067636e5722c389954890bccf.
@jBarz

jBarz commented May 30, 2018

Copy link
Copy Markdown
ContributorAuthor

new CI after I addressed nits.

@refack

refack commented May 30, 2018

Copy link
Copy Markdown
Contributor

CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/51/

refack
refack reviewed May 30, 2018
View reviewed changes
Comment threadgyp/pylib/gyp/input.py
# to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n'
# which otherwise will fail eval()
build_file_contents = open(build_file_path, 'rU').read()
if sys.platform == 'zos':

@refackrefackMay 30, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did you try to upstream it. Or in other words, will it be a problem for node (if we have non ASCII chars, possibly in config.gypi via node-prefix for example) ?

Or will it be better that node-gyp will generate UTF-8-BOM files, and skip patching GYP?

@jBarzjBarzMay 31, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@refack I tried looking for what node-prefix does. but couldn't find anything. Can you point me to some documentation about it?

bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: add search locations for libnode.x
02ac2e7
Node.js on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: don't use universal-new-lines mode
eaedc12
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@bnoordhuis

bnoordhuis commented Jun 8, 2018

Copy link
Copy Markdown
Member

Cheers, landed in 293092c...eaedc12.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlaurichardlaurichardlau left review comments
@bnoordhuisbnoordhuisbnoordhuis approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jBarz@richardlau@refack@bnoordhuis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Zos fixes - #1451

Closed
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos
Closed

Zos fixes#1451
jBarz wants to merge 2 commits into
nodejs:masterfrom
jBarz:zos

Conversation

@jBarz

@jBarzjBarz commented May 30, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

On z/OS, we fixed up node-gyp that comes packaged with node 6.x.
This PR transports those fixes here so that node-gyp works as a standalone.

@jBarzjBarz changed the title ZosZos fixesMay 30, 2018
bnoordhuis
bnoordhuis approved these changes May 30, 2018
View reviewed changes

@bnoordhuisbnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/46/

richardlau
richardlau reviewed May 30, 2018
View reviewed changes
Comment threadlib/configure.js Outdated
'node',
'out/Release/obj.target/libnode',
'out/Debug/obj.target/libnode',
'lib/libnode'].map(function(file) {

@richardlaurichardlauMay 30, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Might be an idea to rewrite the comment just prior to this block as it's no longer AIX specific. We can probably drop the candidate locations from the comment as it's a duplicate of the code. Something like:

// For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking.

Also will the exports file ever be include/node/node.x on z/OS? If not, we could slightly speed up by using a different set of candidates per platform.

@jBarzjBarzMay 30, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks @richardlau
I will rewrite that comment.
Also the exports file on z/OS will never be include/node/node.x
So I will do as you suggested.

@richardlau

richardlau commented May 30, 2018

Copy link
Copy Markdown
Member

New CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/47/

@richardlaurichardlau mentioned this pull request May 30, 2018
Closed
jBarz added 2 commits May 30, 2018 15:16
@jBarz
zos: add search locations for libnode.x
ba59f82
NodeJS on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
@jBarz
zos: don't use universal-new-lines mode
32d008a
This reverts commit 40edac20c8c9644067636e5722c389954890bccf.
@jBarz

jBarz commented May 30, 2018

Copy link
Copy Markdown
ContributorAuthor

new CI after I addressed nits.

@refack

refack commented May 30, 2018

Copy link
Copy Markdown
Contributor

CI: https://ci.nodejs.org/job/nodegyp-test-pull-request/51/

refack
refack reviewed May 30, 2018
View reviewed changes
Comment threadgyp/pylib/gyp/input.py
# to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n'
# which otherwise will fail eval()
build_file_contents = open(build_file_path, 'rU').read()
if sys.platform == 'zos':

@refackrefackMay 30, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did you try to upstream it. Or in other words, will it be a problem for node (if we have non ASCII chars, possibly in config.gypi via node-prefix for example) ?

Or will it be better that node-gyp will generate UTF-8-BOM files, and skip patching GYP?

@jBarzjBarzMay 31, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@refack I tried looking for what node-prefix does. but couldn't find anything. Can you point me to some documentation about it?

bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: add search locations for libnode.x
02ac2e7
Node.js on z/OS uses shared dll (libnode.so). When linking native
addons, node-gyp needs to find the corresponding libnode.x during
the link step.
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
bnoordhuis pushed a commit that referenced this pull request Jun 8, 2018
@jBarz@bnoordhuis
zos: don't use universal-new-lines mode
eaedc12
PR-URL: #1451
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@bnoordhuis

bnoordhuis commented Jun 8, 2018

Copy link
Copy Markdown
Member

Cheers, landed in 293092c...eaedc12.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlaurichardlaurichardlau left review comments
@bnoordhuisbnoordhuisbnoordhuis approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jBarz@richardlau@refack@bnoordhuis