added node 0.12 and nan versions

rvagg · rvagg · commit 5b6316c669f0 · 2013-12-07T20:46:36.000+11:00
diff --git a/2_function_arguments/addon.js b/2_function_arguments/addon.js
diff --git a/2_function_arguments/nan/addon.cc b/2_function_arguments/nan/addon.cc
@@ -0,0 +1,29 @@
+#include <nan.h>
+
+using namespace v8;
+
+NAN_METHOD(Add) {
+  NanScope();
+
+  if (args.Length() < 2) {
+    NanThrowTypeError("Wrong number of arguments");
+    NanReturnUndefined();
+  }
+
+  if (!args[0]->IsNumber() || !args[1]->IsNumber()) {
+    NanThrowTypeError("Wrong arguments");
+    NanReturnUndefined();
+  }
+
+  double arg0 = args[0]->NumberValue();
+  double arg1 = args[1]->NumberValue();
+  Local<Number> num = Number::New(arg0 + arg1);
+
+  NanReturnValue(num);
+}
+
+void Init(Handle<Object> exports) {
+  exports->Set(NanSymbol("add"), FunctionTemplate::New(Add)->GetFunction());
+}
+
+NODE_MODULE(addon, Init)
diff --git a/2_function_arguments/nan/addon.js b/2_function_arguments/nan/addon.js
@@ -0,0 +1,3 @@
+var addon = require('bindings')('addon.node')
+
+console.log('This should be eight:', addon.add(3, 5))
diff --git a/2_function_arguments/nan/binding.gyp b/2_function_arguments/nan/binding.gyp
@@ -0,0 +1,11 @@
+{
+  "targets": [
+    {
+      "target_name": "addon",
+      "sources": [ "addon.cc" ],
+      "include_dirs": [
+        "<!(node -e \"require('nan')\")"
+      ]
+    }
+  ]
+}
diff --git a/2_function_arguments/nan/package.json b/2_function_arguments/nan/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "function_arguments",
+  "version": "0.0.0",
+  "description": "Node.js Addons Example #2",
+  "main": "addon.js",
+  "private": true,
+  "dependencies": {
+    "nan": "~0.6.0",
+    "bindings": "~1.1.1"
+  },
+  "scripts": {
+    "test": "node addon.js"
+  },
+  "gypfile": true
+}
diff --git a/2_function_arguments/node_0.10/addon.cc b/2_function_arguments/node_0.10/addon.cc
@@ -1,4 +1,3 @@
-#define BUILDING_NODE_EXTENSION
 #include <node.h>
 
 using namespace v8;
@@ -16,8 +15,10 @@ Handle<Value> Add(const Arguments& args) {
     return scope.Close(Undefined());
   }
 
-  Local<Number> num = Number::New(args[0]->NumberValue() +
-      args[1]->NumberValue());
+  double arg0 = args[0]->NumberValue();
+  double arg1 = args[1]->NumberValue();
+  Local<Number> num = Number::New(arg0 + arg1);
+
   return scope.Close(num);
 }
 
diff --git a/2_function_arguments/node_0.10/addon.js b/2_function_arguments/node_0.10/addon.js
@@ -0,0 +1,3 @@
+var addon = require('bindings')('addon.node')
+
+console.log('This should be eight:', addon.add(3, 5))
diff --git a/2_function_arguments/node_0.10/binding.gyp b/2_function_arguments/node_0.10/binding.gyp
diff --git a/2_function_arguments/node_0.10/npm-debug.log b/2_function_arguments/node_0.10/npm-debug.log
@@ -0,0 +1,39 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'install' ]
+2 info using npm@1.3.15
+3 info using node@v0.11.9
+4 verbose readDependencies using package.json deps
+5 verbose install where, deps [ '/home/rvagg/git/node-addon-examples/2_function_arguments/node_0.10',
+5 verbose install   [] ]
+6 info preinstall function_arguments@0.0.0
+7 verbose readDependencies using package.json deps
+8 silly resolved []
+9 info build /home/rvagg/git/node-addon-examples/2_function_arguments/node_0.10
+10 verbose linkStuff [ false,
+10 verbose linkStuff   false,
+10 verbose linkStuff   false,
+10 verbose linkStuff   '/home/rvagg/git/node-addon-examples/2_function_arguments' ]
+11 info linkStuff function_arguments@0.0.0
+12 verbose linkBins function_arguments@0.0.0
+13 verbose linkMans function_arguments@0.0.0
+14 verbose rebuildBundles function_arguments@0.0.0
+15 info install function_arguments@0.0.0
+16 verbose unsafe-perm in lifecycle true
+17 info function_arguments@0.0.0 Failed to exec install script
+18 error function_arguments@0.0.0 install: `node-gyp rebuild`
+18 error Exit status 1
+19 error Failed at the function_arguments@0.0.0 install script.
+19 error This is most likely a problem with the function_arguments package,
+19 error not with npm itself.
+19 error Tell the author that this fails on your system:
+19 error     node-gyp rebuild
+19 error You can get their info via:
+19 error     npm owner ls function_arguments
+19 error There is likely additional logging output above.
+20 error System Linux 3.12.0-031200-generic
+21 error command "/usr/local/bin/node" "/usr/local/bin/npm" "install"
+22 error cwd /home/rvagg/git/node-addon-examples/2_function_arguments/node_0.10
+23 error node -v v0.11.9
+24 error npm -v 1.3.15
+25 error code ELIFECYCLE
+26 verbose exit [ 1, true ]
diff --git a/2_function_arguments/node_0.10/package.json b/2_function_arguments/node_0.10/package.json
@@ -4,5 +4,11 @@
   "description": "Node.js Addons Example #2",
   "main": "addon.js",
   "private": true,
+  "dependencies": {
+    "bindings": "~1.1.1"
+  },
+  "scripts": {
+    "test": "node addon.js"
+  },
   "gypfile": true
 }
diff --git a/2_function_arguments/node_0.12/addon.cc b/2_function_arguments/node_0.12/addon.cc
@@ -0,0 +1,31 @@
+#include <node.h>
+
+using namespace v8;
+
+void Add(const v8::FunctionCallbackInfo<Value>& args) {
+  Isolate* isolate = Isolate::GetCurrent();
+  HandleScope scope(isolate);
+
+  if (args.Length() < 2) {
+    ThrowException(Exception::TypeError(String::New("Wrong number of arguments")));
+    return;
+  }
+
+  if (!args[0]->IsNumber() || !args[1]->IsNumber()) {
+    ThrowException(Exception::TypeError(String::New("Wrong arguments")));
+    return;
+  }
+
+  double arg0 = args[0]->NumberValue();
+  double arg1 = args[1]->NumberValue();
+  Local<Number> num = Number::New(arg0 + arg1);
+
+  args.GetReturnValue().Set(num);
+}
+
+void Init(Handle<Object> exports) {
+  exports->Set(String::NewSymbol("add"),
+      FunctionTemplate::New(Add)->GetFunction());
+}
+
+NODE_MODULE(addon, Init)
diff --git a/2_function_arguments/node_0.12/addon.js b/2_function_arguments/node_0.12/addon.js
@@ -0,0 +1,3 @@
+var addon = require('bindings')('addon.node')
+
+console.log('This should be eight:', addon.add(3, 5))
diff --git a/2_function_arguments/node_0.12/binding.gyp b/2_function_arguments/node_0.12/binding.gyp
@@ -0,0 +1,8 @@
+{
+  "targets": [
+    {
+      "target_name": "addon",
+      "sources": [ "addon.cc" ]
+    }
+  ]
+}
diff --git a/2_function_arguments/node_0.12/package.json b/2_function_arguments/node_0.12/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "function_arguments",
+  "version": "0.0.0",
+  "description": "Node.js Addons Example #2",
+  "main": "addon.js",
+  "private": true,
+  "dependencies": {
+    "bindings": "~1.1.1"
+  },
+  "scripts": {
+    "test": "node addon.js"
+  },
+  "gypfile": true
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+var addon = require('bindings')('addon.node')`
	`2`	`+`
	`3`	`+console.log('This should be eight:', addon.add(3, 5))`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#define BUILDING_NODE_EXTENSION`
`2`	`1`	`#include <node.h>`
`3`	`2`
`4`	`3`	`using namespace v8;`
`@@ -16,8 +15,10 @@ Handle<Value> Add(const Arguments& args) {`
`16`	`15`	`return scope.Close(Undefined());`
`17`	`16`	`}`
`18`	`17`
`19`		`- Local<Number> num = Number::New(args[0]->NumberValue() +`
`20`		`- args[1]->NumberValue());`
	`18`	`+ double arg0 = args[0]->NumberValue();`
	`19`	`+ double arg1 = args[1]->NumberValue();`
	`20`	`+ Local<Number> num = Number::New(arg0 + arg1);`
	`21`	`+`
`21`	`22`	`return scope.Close(num);`
`22`	`23`	`}`
`23`	`24`