Finalized installation in makefile

tbranyen · tbranyen · commit 2b28639876a9 · 2011-03-04T19:12:32.000-05:00
diff --git a/Makefile b/Makefile
@@ -4,21 +4,32 @@ NODEBLD = node-waf
 
 BASE = .
 LIBPATH = /usr/local/lib:$(BASE)/vendor
+NODE_LIB_PATH = ~/.node_libraries
+INSTALL_PATH = $(NODE_LIB_PATH)/nodegit2
 
-all: buildbindings lint
+all: buildbindings
 
 buildbindings:
 	$(NODEBLD) build
 
 install:
-	$(NODEBLD) install
+	mkdir -p $(INSTALL_PATH)
+	mkdir -p $(INSTALL_PATH)/build/default
+	mkdir -p $(INSTALL_PATH)/lib
+
+	cp -f $(BASE)/build/default/nodegit2.node $(INSTALL_PATH)/build/default/nodegit2.node
+	cp -f $(BASE)/lib/* $(INSTALL_PATH)/lib/
+	cp -f $(BASE)/package.json $(INSTALL_PATH)/
+
+uninstall:
+	rm -rf $(INSTALL_PATH)
 
 clean:
-	rm -rf ./build
-	rm -rf ./vendor/libgit2/build
+	rm -rf $(BASE)/build
+	rm -rf $(BASE)/vendor/libgit2/build
 
 unittest:
 	$(NODEJS) $(BASE)/test/index.js test
 
 lint:
-	node ./util/hint-check.js
+	$(NODEJS) $(BASE)/util/hint-check.js
diff --git a/README.md b/README.md
@@ -19,12 +19,13 @@ To run `nodegit2` you need `Node.js` and to run unit tests you will need to have
 ### Mac OS X/Linux/Unix ###
 
 #### Install `nodegit2` by cloning source from __GitHub__ and running the `configure`, `make`, and `make install` commands: ####
+    \*Note: `nodegit2` assumes your library path exists at ~/.node_libraries.\*
 
     [tim@thinkpad Projects]$ git clone git://github.com/tbranyen/nodegit2.git
     [tim@thinkpad Projects]$ cd nodegit2
     [tim@thinkpad nodegit2]$ ./configure
     [tim@thinkpad nodegit2]$ make
-    [tim@thinkpad nodegit2]$ sudo make install
+    [tim@thinkpad nodegit2]$ make install
 
 ### Windows via Cygwin ###
 
diff --git a/example/dummyrepo b/example/dummyrepo
@@ -1 +1 @@
-Subproject commit d29b7fecf71d0ef4887071ac18dc87f40c2fd4e1
+Subproject commit 2f6cbe055f1a6ca0a3ba524ba88a7806ba507a89
diff --git a/src/revwalk.cc b/src/revwalk.cc
@@ -65,7 +65,7 @@ Handle<Value> RevWalk::New(const Arguments& args) {
   }
 
   Repo *repo = ObjectWrap::Unwrap<Repo>(args[0]->ToObject());
-  int err = revwalk->New(repo);
+  revwalk->New(repo);
 
   revwalk->Wrap(args.This());
 
diff --git a/test/convenience-repo.js b/test/convenience-repo.js
@@ -37,7 +37,6 @@ exports.constructor = function( test ){
 
   // Test invalid repository
   git.repo( '/etc/hosts', function( err, path ) {
-    console.log( "TEST", err );
     test.equals( 'The specified repository is invalid', err, 'Invalid repository error code' );
 
     // Test valid repository
diff --git a/test/dummyrepo b/test/dummyrepo
@@ -1 +1 @@
-Subproject commit 978feacee2432e67051f2714ec7d28ad80e16908
+Subproject commit cb09e99e91d41705197e0fb60823fdc7df776691
diff --git a/test/index.js b/test/index.js
@@ -40,9 +40,9 @@ reporter.run(
     'raw-error.js',
     
     // TODO:
-    'raw-revwalk.js'
+    //'raw-revwalk.js',
 
     // Convenience API
-    //'convenience-repo.js'
+    'convenience-repo.js'
   ]
 );
diff --git a/util/hint-check.js b/util/hint-check.js
@@ -1,6 +1,6 @@
 var nodejshint = require( './nodejshint.js' ).test,
 
-files = [ 'lib/index.js', 'lib/ref.js', 'lib/repo.js', 'lib/error.js' ];
+files = [ 'lib/index.js', 'lib/ref.js', 'lib/repo.js', 'lib/error.js', 'lib/revwalk.js', 'lib/commit.js', 'lib/util.js', 'lib/oid.js', 'lib/sig.js' ];
 
 nodejshint( files, function( failures ) {
   if( !files.length ) {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit d29b7fecf71d0ef4887071ac18dc87f40c2fd4e1`
	`1`	`+Subproject commit 2f6cbe055f1a6ca0a3ba524ba88a7806ba507a89`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ Handle<Value> RevWalk::New(const Arguments& args) {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`Repo *repo = ObjectWrap::Unwrap<Repo>(args[0]->ToObject());`
`68`		`- int err = revwalk->New(repo);`
	`68`	`+ revwalk->New(repo);`
`69`	`69`
`70`	`70`	`revwalk->Wrap(args.This());`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit 978feacee2432e67051f2714ec7d28ad80e16908`
	`1`	`+Subproject commit cb09e99e91d41705197e0fb60823fdc7df776691`