From 6337e8843bad22b6b571ad1f3df4d8668b389b2a Mon Sep 17 00:00:00 2001 From: Tyler Wanek Date: Mon, 11 Feb 2019 11:06:28 -0700 Subject: [PATCH 1/5] Backport Back port #1623 and #1626 --- generate/templates/templates/binding.gyp | 22 ++++++----------- package-lock.json | 25 ++++++++++++++++---- package.json | 1 + utils/isBuildingForElectron.js | 30 ++++++++++++++++++++++++ vendor/libgit2.gyp | 9 +++---- 5 files changed, 64 insertions(+), 23 deletions(-) create mode 100644 utils/isBuildingForElectron.js diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp index dc0e203e7..ac9de517f 100644 --- a/generate/templates/templates/binding.gyp +++ b/generate/templates/templates/binding.gyp @@ -1,21 +1,13 @@ { - "conditions": [ - ["(OS=='win' and node_root_dir.split('\\\\')[-1].startswith('iojs')) or (OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs'))", { - "variables": { - "is_electron%": "1", - } - }, { - "variables": { - "is_electron%": "0", - } - }] - ], + "variables": { + "is_electron%": " arr[arr.length - 1]; +const [, , nodeRootDir] = process.argv; + +let isElectron = last(nodeRootDir.split(path.sep)).startsWith("iojs"); + +if (!isElectron) { + try { + // Not ideal, would love it if there were a full featured gyp package to do this operation instead. + const { variables: { built_with_electron } } = JSON5.parse( + fs.readFileSync( + path.resolve(nodeRootDir, "include", "node", "config.gypi"), + "utf8" + ) + ); + + if (built_with_electron) { + isElectron = true; + } + } catch (e) {} +} + +process.stdout.write(isElectron ? "1" : "0"); diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 11904835e..835a73c71 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -7,6 +7,7 @@ "library%": "static_library", "openssl_enable_asm%": 0, # only supported with the Visual Studio 2012 (VC11) toolchain. "gcc_version%": 0, + "is_electron%": " Date: Mon, 11 Feb 2019 17:10:16 -0700 Subject: [PATCH 2/5] Bump to v0.24.1 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35d8d9e71..a4bce90bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## v0.24.1 [(2019-02-11)](https://github.com/nodegit/nodegit/releases/tag/v0.24.1) + +[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.24.0...v0.24.1) + +#### Summary of changes +- Fix Electron 4 builds + ## v0.24.0 [(2019-01-16)](https://github.com/nodegit/nodegit/releases/tag/v0.24.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.23.0...v0.24.0) diff --git a/package-lock.json b/package-lock.json index c2fef333d..d9a1fada6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nodegit", - "version": "0.24.0", + "version": "0.24.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ede21ef7b..2c0308f43 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.24.0", + "version": "0.24.1", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From 17cb23261ecd7be0954e7219ca0d1535a8d004ab Mon Sep 17 00:00:00 2001 From: Tyler Wanek Date: Tue, 12 Feb 2019 09:49:46 -0700 Subject: [PATCH 3/5] Allow backport branch to build on appveyor CI --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 34f73e23d..368e911e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -58,5 +58,6 @@ build: off branches: only: + - /backport\/.*/ - master - v0.3 From 20c24dd3662764e29879ed28e06cc187fe34c324 Mon Sep 17 00:00:00 2001 From: Tyler Ang-Wanek Date: Wed, 17 Apr 2019 12:20:09 -0700 Subject: [PATCH 4/5] Merge pull request #1663 from ianhattendorf/fix/openssl-url Update openssl conan distributions --- .../static_config/openssl_distributions.json | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/vendor/static_config/openssl_distributions.json b/vendor/static_config/openssl_distributions.json index f00384dd9..d42ecae15 100644 --- a/vendor/static_config/openssl_distributions.json +++ b/vendor/static_config/openssl_distributions.json @@ -1,18 +1,18 @@ { - "macOS-clang-8.1-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/bd3cca94af79c6a2c35b664c43f643582a13a9f2/conan_package.tgz", - "macOS-clang-8.1-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/0197c20e330042c026560da838f5b4c4bf094b8a/conan_package.tgz", - "macOS-clang-9-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/85d674b0f6705cafe6b2edb8689ffbe0f3c2e60b/conan_package.tgz", - "macOS-clang-9-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/227fb0ea22f4797212e72ba94ea89c7b3fbc2a0c/conan_package.tgz", - "win32-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/39d6fe009a278f733e97b59a4f9536bfc4e8f366/conan_package.tgz", - "win32-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/d16d8a16b4cef0046922b8d83d567689d36149d0/conan_package.tgz", - "win32-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/889fd4ea9ba89fd6dc7fa32e2f45bd9804b85481/conan_package.tgz", - "win32-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/253958a6ce15f1c9325eeea33ffc0a5cfc29212a/conan_package.tgz", - "win32-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/05f648ec4d066b206769d6314e859fdd97a18f8d/conan_package.tgz", - "win32-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/a075e3ffc3590d6a920a26b4218b20253dd68d57/conan_package.tgz", - "win64-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/6bc3be0f39fdc624b24ba9bb00e8af55928d74e7/conan_package.tgz", - "win64-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/e942631065059eabe964ca471ad35bb453c15b31/conan_package.tgz", - "win64-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/867ca54360ed234a8bc9a6aa63806599ea29b38e/conan_package.tgz", - "win64-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/c4aef4edbc33205e0cf9b55bfb116b38c90ec132/conan_package.tgz", - "win64-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/0bd0c413b56aaec57c0f222a89b4e565a6729027/conan_package.tgz", - "win64-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/fce9be1511a149a4af36b5997f7e611ab83b2f58/conan_package.tgz" -} \ No newline at end of file + "macOS-clang-8.1-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/bd3cca94af79c6a2c35b664c43f643582a13a9f2/0/conan_package.tgz", + "macOS-clang-8.1-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/0197c20e330042c026560da838f5b4c4bf094b8a/0/conan_package.tgz", + "macOS-clang-9-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/85d674b0f6705cafe6b2edb8689ffbe0f3c2e60b/0/conan_package.tgz", + "macOS-clang-9-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/227fb0ea22f4797212e72ba94ea89c7b3fbc2a0c/0/conan_package.tgz", + "win32-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/39d6fe009a278f733e97b59a4f9536bfc4e8f366/0/conan_package.tgz", + "win32-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/d16d8a16b4cef0046922b8d83d567689d36149d0/0/conan_package.tgz", + "win32-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/889fd4ea9ba89fd6dc7fa32e2f45bd9804b85481/0/conan_package.tgz", + "win32-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/253958a6ce15f1c9325eeea33ffc0a5cfc29212a/0/conan_package.tgz", + "win32-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/05f648ec4d066b206769d6314e859fdd97a18f8d/0/conan_package.tgz", + "win32-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/a075e3ffc3590d6a920a26b4218b20253dd68d57/0/conan_package.tgz", + "win64-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/6bc3be0f39fdc624b24ba9bb00e8af55928d74e7/0/conan_package.tgz", + "win64-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/e942631065059eabe964ca471ad35bb453c15b31/0/conan_package.tgz", + "win64-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/867ca54360ed234a8bc9a6aa63806599ea29b38e/0/conan_package.tgz", + "win64-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/c4aef4edbc33205e0cf9b55bfb116b38c90ec132/0/conan_package.tgz", + "win64-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/0bd0c413b56aaec57c0f222a89b4e565a6729027/0/conan_package.tgz", + "win64-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/fce9be1511a149a4af36b5997f7e611ab83b2f58/0/conan_package.tgz" +} From 72ac39d93e9259dc374b1de9256d842df5c008f8 Mon Sep 17 00:00:00 2001 From: Tyler Ang-Wanek Date: Fri, 19 Apr 2019 09:10:50 -0700 Subject: [PATCH 5/5] Bump to v0.24.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index d9a1fada6..7367d9b8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nodegit", - "version": "0.24.1", + "version": "0.24.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2c0308f43..9678921b0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.24.1", + "version": "0.24.2", "homepage": "http://nodegit.org", "keywords": [ "libgit2",