Copy libssh2 config headers straight into vendor/libssh2

emmax86 · emmax86 · commit 23b98da63bed · 2018-10-17T09:43:06.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -29,7 +29,6 @@
 /vendor/libssh2/example/stamp-h2
 /vendor/libssh2/libssh2.pc
 /vendor/libssh2/libtool
-/vendor/libssh2/darwin/
 /vendor/libssh2/src/.deps/
 /vendor/libssh2/src/Makefile
 /vendor/libssh2/src/libssh2_config.h
diff --git a/utils/configureLibssh2.js b/utils/configureLibssh2.js
@@ -13,7 +13,7 @@ module.exports = function retrieveExternalDependencies() {
   if (process.platform === "win32" || process.platform === "darwin") {
     return fse.copy(
       path.join(libssh2StaticConfigDirectory, process.platform),
-      path.join(libssh2VendorDirectory, process.platform)
+      path.join(libssh2VendorDirectory, "src")
     );
   }
 
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -537,16 +537,9 @@
         ]
       },
       "conditions": [
-        ["OS=='mac'", {
+        ["OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs')", {
           "include_dirs": [
-            "libssh2/darwin"
-          ],
-          "conditions": [
-            ["node_root_dir.split('/')[-1].startswith('iojs')", {
-              "include_dirs": [
-                "openssl/include",
-              ]
-            }]
+            "openssl/include",
           ]
         }],
         ["OS=='win'", {
@@ -568,7 +561,6 @@
           ],
           "include_dirs": [
             "libssh2/src",
-            "libssh2/win32",
             "libssh2/include"
           ],
           "defines!": [
@@ -577,7 +569,6 @@
           "direct_dependent_settings": {
             "include_dirs": [
               "libssh2/src",
-              "libssh2/win32",
               "libssh2/include"
             ]
           }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ module.exports = function retrieveExternalDependencies() {`
`13`	`13`	`if (process.platform === "win32" \|\| process.platform === "darwin") {`
`14`	`14`	`return fse.copy(`
`15`	`15`	`path.join(libssh2StaticConfigDirectory, process.platform),`
`16`		`- path.join(libssh2VendorDirectory, process.platform)`
	`16`	`+ path.join(libssh2VendorDirectory, "src")`
`17`	`17`	`);`
`18`	`18`	`}`
`19`	`19`