Updated build script

tbranyen · tbranyen · commit 52893a8ff0b4 · 2011-02-25T01:18:01.000-05:00
diff --git a/lib/index.js b/lib/index.js
@@ -3,7 +3,7 @@ var repo = require( './repo.js' ).repo,
     ref = require( './ref.js' ).ref;
     //commit = require( 'commit.js' );
 
-exports.git2 = require( '../build/default/git2.node' );
+exports.git2 = require( '../build/default/nodegit2.node' );
 exports.repo = repo;
 exports.ref = ref;
 exports.error = error;
diff --git a/lib/ref.js b/lib/ref.js
@@ -1,4 +1,4 @@
-var git2 = require('../build/default/git2');
+var git2 = require( 'nodegit2' );
 
 var Ref = function( ref ) {
   var self = {};
diff --git a/src/reference.cc b/src/reference.cc
@@ -67,9 +67,10 @@ Handle<Value> Reference::Oid(const Arguments& args) {
   const git_oid* oid = ref->Oid();
   Local<Object> obj;
 
-  Oid *t = new Oid();
-  t->SetValue((git_oid *)oid);
-  return t->WrapObj(obj);
+  //Oid *t = new Oid();
+  //t->SetValue((git_oid *)oid);
+  //return t->WrapObj(obj);
+  return callback;
 }
 
 Persistent<FunctionTemplate> Reference::constructor_template;
diff --git a/test/index.js b/test/index.js
@@ -40,6 +40,6 @@ reporter.run(
     'raw-error.js',
 
     // Convenience API
-    'convenience-repo.js'
+    //'convenience-repo.js'
   ]
 );
diff --git a/test/raw-repo.js b/test/raw-repo.js
@@ -1,5 +1,5 @@
 var git = require( 'nodegit2' ).git2,
-    rimraf = require( '../vendor/rimraf'' ),
+    rimraf = require( '../vendor/rimraf' ),
     fs = require( 'fs' );
 
 // Helper functions
diff --git a/util/jshint.js b/util/jshint.js
diff --git a/wscript b/wscript
@@ -1,4 +1,6 @@
 import Options, Utils
+from subprocess import Popen
+import os
 from os import system
 from os.path import exists, abspath
 
@@ -16,21 +18,17 @@ def configure(conf):
   conf.check_tool('compiler_cxx')
   conf.check_tool('node_addon')
 
-  conf.env.append_value('LIBPATH_GIT2', abspath('vendor/libgit2/build/static/'))
-  conf.env.append_value('LIB_GIT2', 'git2')
-  conf.env.append_value('CPPPATH_GIT2', abspath('vendor/libgit2/build/static/'))
-
-    #Popen('git submodule init vendor/libgit2', shell=True).wait()
-    #Popen('git submodule update vendor/libgit2', shell=True).wait()
-    #os.chdir('vendor/libgit2')
-    #Popen('python waf configure build-static', shell=True).wait()
+  os.chdir('vendor/libgit2')
+  Popen('python waf configure', shell=True).wait()
 
 def build(bld):
-  #libgit2 = bld.new_task_gen('wafadmin')
-  #libgit2.features = 'waf configure build-static'
-  #libgit2.target = 'libgit2'
+  Popen('python waf build-static', shell=True).wait()
 
   obj = bld.new_task_gen('cxx', 'shlib', 'node_addon')
   obj.target = 'nodegit2'
   obj.source = 'src/base.cc src/error.cc src/reference.cc src/repo.cc src/commit.cc src/oid.cc src/revwalk.cc'
-  #obj.uselib_local = 'libgit2'
+  obj.lib = 'git2'
+  obj.rpath = 'vendor/libgit2/build/static/'
+
+def install(test):
+  print dir(test)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var git2 = require('../build/default/git2');`
	`1`	`+var git2 = require( 'nodegit2' );`
`2`	`2`
`3`	`3`	`var Ref = function( ref ) {`
`4`	`4`	`var self = {};`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ reporter.run(`
`40`	`40`	`'raw-error.js',`
`41`	`41`
`42`	`42`	`// Convenience API`
`43`		`- 'convenience-repo.js'`
	`43`	`+ //'convenience-repo.js'`
`44`	`44`	`]`
`45`	`45`	`);`