Updated wscript and .git files

tbranyen · tbranyen · commit a536048f349d · 2011-02-25T22:20:14.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 build/
 build/*
 .lock-wscript
+vendor/
+vendor/*
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "vendor/rimraf"]
 	path = vendor/rimraf
 	url = git://github.com/isaacs/rimraf.git
+[submodule "vendor/libgit2"]
+	path = vendor/libgit2
+	url = git://github.com/libgit2/libgit2.git
diff --git a/wscript b/wscript
@@ -19,14 +19,14 @@ def configure(conf):
   conf.check_tool('node_addon')
 
   os.chdir('vendor/libgit2')
-  Popen('python waf configure build-static', shell=True).wait()
+  Popen('python waf configure build-shared', shell=True).wait()
 
-  conf.env.append_value('LIBPATH_GIT2', abspath('build/static'))
+  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.rpath = abspath('build/static')
+  obj.rpath = abspath('build/shared')
   obj.uselib = 'GIT2'

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 build/
 build/*
 .lock-wscript
 +vendor/
 +vendor/*