mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Upgrade node to v0.11.4, fixes #669

Browse source
This commit is contained in:
Cheng Zhao 2014-09-30 21:35:22 +08:00
parent 9d84f139eb
commit e316e4a267
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/common/lib/init.coffee
View file

@ -6,7 +6,7 @@ process.atomBinding = (name) ->
try try
process.binding "atom_#{process.type}_#{name}" process.binding "atom_#{process.type}_#{name}"
catch e catch e
process.binding "atom_common_#{name}" if e.message is 'No such module' process.binding "atom_common_#{name}" if /No such module/.test e.message
# Add common/api/lib to module search paths. # Add common/api/lib to module search paths.
globalPaths = Module.globalPaths globalPaths = Module.globalPaths

6
common.gypi
View file

@ -1,7 +1,7 @@
{ {
'variables': { 'variables': {
'clang': 0, 'clang': 0,
'node_module_version': 14, 'openssl_no_asm': 1,
'conditions': [ 'conditions': [
['OS=="mac" or OS=="linux"', { ['OS=="mac" or OS=="linux"', {
'clang': 1, 'clang': 1,
@ -101,10 +101,6 @@
'include_dirs': [ 'include_dirs': [
'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include', 'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include',
], ],
'defines': [
# Override NODE_MODULE_VERSION
'NODE_MODULE_VERSION=<(node_module_version)',
],
}], }],
['_target_name=="libuv"', { ['_target_name=="libuv"', {
'conditions': [ 'conditions': [

2
package.json
View file

@ -10,7 +10,7 @@
], ],
"devDependencies": { "devDependencies": {
"atom-package-manager": "0.93.0", "atom-package-manager": "0.98.0",
"coffee-script": "~1.7.1", "coffee-script": "~1.7.1",
"coffeelint": "~1.3.0" "coffeelint": "~1.3.0"
}, },

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 9a477fc92198e9e7d3ffcc989f51a290d901c767 Subproject commit a80a10c6a1f2c668d90eda4e2c9aab38e4dcd4a2