move to waf build system

- remove tools in favor of monkey patching js helper methods (simpler build)
- makefile uses npm where appropriate

.gitignore

@@ -1,19 +1,3 @@
-src/*.o
-src/natives.h
-src/*.a
-src/*.node
-*.a
-*.node
-.scon*
-config.log
-src/*.os
-libxmljs
-tools/*.pyc
-benchmarks
-experiments
-notes
-TODO
-**/*.swp
-*.log
-**/*.swo
+.lock-wscript
 *.swp
+build/

Makefile

@@ -1,17 +1,17 @@
-SCONS=scons
 
-node:
-	@$(SCONS) libxmljs.node
+target=./build/Release/libxmljs.node
 
-node-debug:
-	@$(SCONS) libxmljs.node debug=1
+all: $(target)
+
+build/:
+	node-waf configure
+
+$(target): build/ src/*.cc src/*.h
+	node-waf build
 
 clean:
-	@$(SCONS) -c
-	@$(SCONS) -c libxmljs.node
+	rm -rf build
 
-test-verbose:
-	node --expose_gc spec/tacular.js --verbose
+test: $(target)
+	npm test
 
-test:
-	node --expose_gc spec/tacular.js

index.js

@@ -0,0 +1,6 @@
+module.exports = require('./build/Release/libxmljs');
+
+// attach javascipt helpers to bound classes
+require('./lib/xml_element');
+require('./lib/xml_document');
+require('./lib/xml_sax_parser');

src/xml_document.js → lib/xml_document.js

@@ -1,3 +1,5 @@
+var libxml = require('../build/Release/libxmljs');
+
 libxml.Document.prototype.node = function() {
   args = libxml.Element.Arguments(arguments);
   return this.root(new libxml.Element(this, args[0], args[1], args[2], args[3]));

src/xml_element.js → lib/xml_element.js

@@ -1,3 +1,5 @@
+var libxml = require('../build/Release/libxmljs');
+
 // name, attrs, content, callback
 libxml.Element.Arguments = function(args) {
   var ret_args = null;

src/xml_sax_parser.js → lib/xml_sax_parser.js

@@ -1,3 +1,5 @@
+var libxml = require('../build/Release/libxmljs');
+
 libxml.SaxCallbacks = function() {
   var callbackList = {};
 

package.json

@@ -4,9 +4,9 @@
 , "description" : "libxml bindings for v8 javascript engine"
 , "version" : "0.4.3"
 , "scripts" :
-  { "preinstall" : "make node"
-  , "preuninstall" : "make clean"
-  , "test" : "make test"
+  { "install" : "node-waf configure build"
+  , "preuninstall" : "node-waf clean"
+  , "test" : "node --expose_gc spec/tacular.js"
   }
 , "repository" :
   { "type" : "git"
@@ -16,6 +16,6 @@
   { "mail" : ""
   , "url" : "http://github.com/polotek/libxmljs/issues"
   }
-, "main" : "./libxmljs"
+, "main" : "./index"
 , "engines" : { "node" : ">=0.1.90" }
 }

spec/helpers.js

@@ -1,6 +1,6 @@
 exports.gc = (typeof gc == 'undefined') ? function() {} : gc;
 
-exports.libxml = require('../libxmljs');
+exports.libxml = require('../index');
 
 exports.clone = function(obj) {
   if(obj == null || typeof(obj) != 'object')

spec/tacular.js

@@ -58,7 +58,7 @@ with(require('sys')) {
   var specCount    = 0;
   var specStack    = [];
   var specFailures = [];
-    var specVerbose  = process.ARGV.join(";").match(/;(--verbose|-v)/);
+    var specVerbose  = process.argv.join(";").match(/;(--verbose|-v)/);
 
   var describe = function(name, func) {
     specStack.push(name);

src/libxmljs.cc

@@ -122,20 +122,6 @@ ExecuteString(v8::Handle<v8::String> source,
   return scope.Close(result);
 }
 
-static void
-ExecuteNativeJS(const char* filename,
-                const char* data) {
-  v8::HandleScope scope;
-  v8::TryCatch try_catch;
-  ExecuteString(v8::String::New(data), v8::String::New(filename));
-  if (try_catch.HasCaught())  {
-    puts("There is an error in Node's built-in javascript");
-    puts("This should be reported as a bug!");
-    ReportException(&try_catch);
-    exit(1);
-  }
-}
-
 void
 UpdateV8Memory() {
     v8::V8::AdjustAmountOfExternalAllocatedMemory(-current_xml_memory);
@@ -188,10 +174,6 @@ InitializeLibXMLJS(v8::Handle<v8::Object> target) {
 
   v8::Context::Scope context_scope(context);
   context->Global()->Set(v8::String::NewSymbol("libxml"), target);
-
-  ExecuteNativeJS("xml_sax_parser.js", native_xml_sax_parser);
-  ExecuteNativeJS("xml_document.js", native_xml_document);
-  ExecuteNativeJS("xml_element.js", native_xml_element);
 }
 
 // used by node.js to initialize libraries

src/libxmljs.h

@@ -94,7 +94,6 @@ class LibXMLJS {
 
 }  // namespace libxmljs
 
-#include "natives.h"
 #include "object_wrap.h"
 
 #endif  // SRC_LIBXMLJS_H_