Fixes for OS X, remove remote_path.

tbranyen · tbranyen · commit ae18fa0f299f · 2014-06-13T13:49:36.000-04:00
diff --git a/binding.gyp b/binding.gyp
@@ -50,31 +50,18 @@
       ],
 
       "cflags": [
-        "-Wall"
-      ],
-
-      "ldflags": [
-        "-Wl,-rpath,\$$ORIGIN/Release/"
+        "-Wall",
       ],
 
       "conditions": [
-        [
-          "OS=='win'", {
-            "libraries": [
-              "-lRelease/libgit2.lib"
-            ],
-          }, { # 'OS!="win"'
-            "libraries": [
-             "-L<!(pwd)/build/Release",
-              "-lgit2"
-            ]
-          }
-        ],
-
         [
           "OS=='mac'", {
             "xcode_settings": {
-              "GCC_ENABLE_CPP_EXCEPTIONS": "YES"
+              "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
+
+              "WARNING_CFLAGS": [
+                "-Wno-unused-variable",
+              ],
             }
           }
         ]
@@ -343,12 +330,15 @@
           ],
           'cflags': [
             '-Wno-missing-field-initializers',
-            '-Wno-unused-variable'
+            '-Wno-unused-variable',
+            '-Wno-deprecated-declarations',
           ],
           'xcode_settings': {
             'WARNING_CFLAGS': [
               '-Wno-missing-field-initializers',
-              '-Wno-unused-variable'
+              '-Wno-unused-variable',
+              '-Wno-deprecated-declarations',
+              '-Wno-uninitialized',
             ],
           },
         },
diff --git a/install.js b/install.js
@@ -59,7 +59,7 @@ var dependencies = Q.allSettled([
   // work with Python 2.* if it's available.
   Q.nfcall(which, 'python2'),
   Q.nfcall(which, 'python'),
-  
+
   // Check for any version of CMake.
   Q.nfcall(which, 'cmake'),
 ])
@@ -71,7 +71,7 @@ var dependencies = Q.allSettled([
   // Assign to reusable variables.
   python = results[0].value || results[1].value;
   cmake = results[2].value;
-
+  
   // Now lets check the Python version to ensure it's < 3.
   return Q.nfcall(exec, python + ' --version').then(function(version) {
     if (version[1].indexOf('Python 3') === 0) {
diff --git a/package.json b/package.json
@@ -54,8 +54,7 @@
   "binary": {
     "module_name": "nodegit",
     "module_path": "./build/Release/",
-    "host": "https://s3.amazonaws.com/nodegit/nodegit/",
-    "remote_path": "../"
+    "host": "https://s3.amazonaws.com/nodegit/nodegit/"
   },
   "scripts": {
     "lint": "jshint src",
