lib and build updated and enhanced

tbranyen · tbranyen · commit a9b1fb592df6 · 2011-02-25T21:03:40.000-05:00
diff --git a/example/raw-oid.js b/example/raw-oid.js
@@ -1,4 +1,4 @@
-var git2 = require( 'nodegit2' ).git2;
+var git2 = require( '../' ).git2;
 
 var oid = new git2.Oid();
 // Valid
diff --git a/example/raw-repo.js b/example/raw-repo.js
@@ -1,4 +1,4 @@
-var git2 = require( 'nodegit2' ).git2;
+var git2 = require( '../' ).git2;
 
 var repo = new git2.Repo();
 
diff --git a/example/raw-revwalk.js b/example/raw-revwalk.js
@@ -1,4 +1,4 @@
-var git2 = require( 'nodegit2' ).git2;
+var git2 = require( '../' ).git2;
 
 var repo = new git2.Repo();
 
diff --git a/lib/error.js b/lib/error.js
@@ -1,6 +1,6 @@
 var git = require( 'nodegit2' );
 
-var Error = function( error ) {
+var _Error = function( error ) {
   var self = {};
 
   // Internal reference to a Git reference
@@ -9,4 +9,4 @@ var Error = function( error ) {
   return self;
 };
 
-exports.error = Error;
+exports.error = _Error;
diff --git a/lib/ref.js b/lib/ref.js
@@ -1,6 +1,6 @@
 var git2 = require( 'nodegit2' );
 
-var Ref = function( ref ) {
+var _Ref = function( ref ) {
   var self = {};
 
   // Internal reference to a Git reference
@@ -9,4 +9,4 @@ var Ref = function( ref ) {
   return self;
 };
 
-exports.ref = Ref;
+exports.ref = _Ref;
diff --git a/lib/repo.js b/lib/repo.js
@@ -1,7 +1,7 @@
 /**/
 var git = require( 'nodegit2' );
 
-var Repo = function( path, callback ) {
+var _Repo = function( path, callback ) {
   // Public namespace
   var self = {};
 
@@ -90,4 +90,4 @@ var Repo = function( path, callback ) {
   return self;
 };
 
-exports.repo = Repo;
+exports.repo = _Repo;
diff --git a/test/convenience-repo.js b/test/convenience-repo.js
@@ -1,5 +1,5 @@
-var git = require( 'nodegit2' ),
-    rimraf = require( '../vendor/rimraf'),
+var git = require( '../' ),
+    rimraf = require( '../vendor/rimraf') || require( 'rimraf' ),
     fs = require( 'fs' );
 
 // Helper functions
diff --git a/test/index.js b/test/index.js
@@ -37,7 +37,7 @@ reporter.run(
     'raw-repo.js',
     'raw-oid.js',
     'raw-commit.js',
-    'raw-error.js',
+    'raw-error.js'
 
     // Convenience API
     //'convenience-repo.js'
diff --git a/test/raw-commit.js b/test/raw-commit.js
@@ -1,5 +1,5 @@
-var git = require( 'nodegit2' ).git2,
-    rimraf = require( '../vendor/rimraf' );
+var git = require( '../' ).git2,
+    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' );
 
 var testRepo = new git.Repo();
 
diff --git a/test/raw-error.js b/test/raw-error.js
@@ -1,5 +1,5 @@
-var git = require( 'nodegit2' ).git2,
-    rimraf = require( '../vendor/rimraf' );
+var git = require( '../' ).git2,
+    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' );
 
 // Helper functions
 var helper = {
diff --git a/test/raw-oid.js b/test/raw-oid.js
@@ -1,4 +1,4 @@
-var git = require( 'nodegit2' ).git2,
+var git = require( '../' ).git2,
     rimraf = require( '../vendor/rimraf' );
 
 // Helper functions
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' ),
+var git = require( '../' ).git2,
+    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' ),
     fs = require( 'fs' );
 
 // Helper functions
diff --git a/util/jshint.js b/util/jshint.js
diff --git a/wscript b/wscript
@@ -19,13 +19,14 @@ def configure(conf):
   conf.check_tool('node_addon')
 
   os.chdir('vendor/libgit2')
-  Popen('python waf configure', shell=True).wait()
+  Popen('python waf configure build-shared', shell=True).wait()
 
-def build(bld):
-  Popen('python waf build-static', shell=True).wait()
+  conf.env.append_value('LIBPATH_GIT2', abspath('build/shared'))
+  conf.env.append_value('LIB_GIT2', 'git2')
 
+def build(bld):
   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.lib = 'git2'
-  obj.rpath = 'vendor/libgit2/build/static/'
+  obj.libpath = abspath('build/shared')
+  obj.uselib = 'GIT2'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var git2 = require( 'nodegit2' ).git2;`
	`1`	`+var git2 = require( '../' ).git2;`
`2`	`2`
`3`	`3`	`var oid = new git2.Oid();`
`4`	`4`	`// Valid`