From 5619e76ccb271322d82ca12701f73f241fdd6a18 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 09:39:55 -0800 Subject: [PATCH 01/22] Remove normal noble dependency. --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index d47e963..21e053f 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "dependencies": { "cross-spawn": "^6.0.5", "napi-thread-safe-callback": "0.0.6", - "noble": "^1.9.1", "node-addon-api": "^1.1.0", "node-pre-gyp": "^0.10.0" }, From 138d2454b9140b73c392b2f27231964dd237d383 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 11:09:26 -0800 Subject: [PATCH 02/22] Switch to TheSufferfest/noble --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 21e053f..c08e623 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "dependencies": { "cross-spawn": "^6.0.5", "napi-thread-safe-callback": "0.0.6", + "noble": "TheSufferfest/noble#no-xpc", "node-addon-api": "^1.1.0", "node-pre-gyp": "^0.10.0" }, From 58fbef1d034c9e4b09665e3e9a680a1d1039733f Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 12:14:05 -0800 Subject: [PATCH 03/22] Mac only --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index c08e623..8ebefd0 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "noble-mac", + "os": ["darwin"], "description": "Noble (Node.js Bluetooth LE) bindings using CoreBluetooth API", "version": "0.0.2", "author": "gv@timeular.com", From b9cc6ae3059b593b60a305b82d5999f1406b67d6 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 12:21:56 -0800 Subject: [PATCH 04/22] Windows exclusions. --- binding.gyp | 3 +++ package.json | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index 26570a0..8f3ac71 100644 --- a/binding.gyp +++ b/binding.gyp @@ -14,6 +14,9 @@ 'OTHER_CFLAGS': [ '-fobjc-arc', ], + 'conditions': [ + ['OS=="win"', {'sources/': [['exclude', 'src']]}] + ] }, 'link_settings': { 'libraries': [ diff --git a/package.json b/package.json index 8ebefd0..c08e623 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "noble-mac", - "os": ["darwin"], "description": "Noble (Node.js Bluetooth LE) bindings using CoreBluetooth API", "version": "0.0.2", "author": "gv@timeular.com", From db9886ca9be52f9fdd3e9af24a3134f3ee7c3d44 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 12:50:22 -0800 Subject: [PATCH 05/22] Conditonal targets --- binding.gyp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/binding.gyp b/binding.gyp index 8f3ac71..b093b58 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,23 +1,23 @@ { - 'targets': [ - { - 'target_name': '<(module_name)', - 'sources': [ 'src/noble_mac.mm', 'src/napi_objc.mm', 'src/ble_manager.mm', 'src/objc_cpp.mm', 'src/callbacks.cc' ], - 'include_dirs': [" Date: Fri, 30 Nov 2018 13:01:43 -0800 Subject: [PATCH 06/22] Condition better. --- binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index b093b58..cf886be 100644 --- a/binding.gyp +++ b/binding.gyp @@ -17,7 +17,7 @@ 'OTHER_CFLAGS': [ '-fobjc-arc', ], - }], + }]]], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/CoreBluetooth.framework', From 5fa3302e687853f8b566370f0b66ce80ce7e6cbe Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 13:11:49 -0800 Subject: [PATCH 07/22] Target better. --- binding.gyp | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/binding.gyp b/binding.gyp index cf886be..f234e6a 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,23 +1,23 @@ { 'targets' : [], 'conditions': [ - ['OS=="darwin"', - 'targets': [ - { - 'target_name': '<(module_name)', - 'sources': [ 'src/noble_mac.mm', 'src/napi_objc.mm', 'src/ble_manager.mm', 'src/objc_cpp.mm', 'src/callbacks.cc' ], - 'include_dirs': [" Date: Fri, 30 Nov 2018 13:26:58 -0800 Subject: [PATCH 08/22] Right platform. --- binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index f234e6a..3eb0d5a 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,7 +1,7 @@ { 'targets' : [], 'conditions': [ - ['OS!="linux"', { + ['OS=="darwin"', { 'targets': [ { 'target_name': '<(module_name)', From d8a887b2dd9945c27fdc5e36468655ca9084ff10 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 13:40:04 -0800 Subject: [PATCH 09/22] Add blank targets to please buggy mac gyp. --- binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index 3eb0d5a..cd4d21f 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,5 +1,5 @@ { - 'targets' : [], + 'targets' : [{'target_name': "BLANK"}], 'conditions': [ ['OS=="darwin"', { 'targets': [ From 4184b6d044acef088dcd418cb9f78a8eabd17f5d Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 09:39:55 -0800 Subject: [PATCH 10/22] Remove normal noble dependency. --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 5efa641..0d22e47 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "dependencies": { "cross-spawn": "^6.0.5", "napi-thread-safe-callback": "0.0.6", - "noble": "^1.9.1", "node-addon-api": "^1.1.0", "node-pre-gyp": "^0.10.0" }, From a464df090f60cd6b869867b5ea4f11e99674ae13 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 11:09:26 -0800 Subject: [PATCH 11/22] Switch to TheSufferfest/noble --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 0d22e47..44576ac 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "dependencies": { "cross-spawn": "^6.0.5", "napi-thread-safe-callback": "0.0.6", + "noble": "TheSufferfest/noble#no-xpc", "node-addon-api": "^1.1.0", "node-pre-gyp": "^0.10.0" }, From ef813fbcf41559d24fa35d777e2954560cfe0a89 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 12:14:05 -0800 Subject: [PATCH 12/22] Mac only --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 44576ac..3c01348 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "noble-mac", + "os": ["darwin"], "description": "Noble (Node.js Bluetooth LE) bindings using CoreBluetooth API", "version": "0.0.4", "author": "gv@timeular.com", From 7a13c05baa3ca9cb9cc160fdfb1ff2e4fa58d245 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 12:21:56 -0800 Subject: [PATCH 13/22] Windows exclusions. --- binding.gyp | 3 +++ package.json | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index 26570a0..8f3ac71 100644 --- a/binding.gyp +++ b/binding.gyp @@ -14,6 +14,9 @@ 'OTHER_CFLAGS': [ '-fobjc-arc', ], + 'conditions': [ + ['OS=="win"', {'sources/': [['exclude', 'src']]}] + ] }, 'link_settings': { 'libraries': [ diff --git a/package.json b/package.json index 3c01348..44576ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "noble-mac", - "os": ["darwin"], "description": "Noble (Node.js Bluetooth LE) bindings using CoreBluetooth API", "version": "0.0.4", "author": "gv@timeular.com", From 809c0e282122cc262c444786005019c3d4d776e2 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 12:50:22 -0800 Subject: [PATCH 14/22] Conditonal targets --- binding.gyp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/binding.gyp b/binding.gyp index 8f3ac71..b093b58 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,23 +1,23 @@ { - 'targets': [ - { - 'target_name': '<(module_name)', - 'sources': [ 'src/noble_mac.mm', 'src/napi_objc.mm', 'src/ble_manager.mm', 'src/objc_cpp.mm', 'src/callbacks.cc' ], - 'include_dirs': [" Date: Fri, 30 Nov 2018 13:01:43 -0800 Subject: [PATCH 15/22] Condition better. --- binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index b093b58..cf886be 100644 --- a/binding.gyp +++ b/binding.gyp @@ -17,7 +17,7 @@ 'OTHER_CFLAGS': [ '-fobjc-arc', ], - }], + }]]], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/CoreBluetooth.framework', From 70203bcf8007c2652d82d99fc89975dac404a815 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 13:11:49 -0800 Subject: [PATCH 16/22] Target better. --- binding.gyp | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/binding.gyp b/binding.gyp index cf886be..f234e6a 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,23 +1,23 @@ { 'targets' : [], 'conditions': [ - ['OS=="darwin"', - 'targets': [ - { - 'target_name': '<(module_name)', - 'sources': [ 'src/noble_mac.mm', 'src/napi_objc.mm', 'src/ble_manager.mm', 'src/objc_cpp.mm', 'src/callbacks.cc' ], - 'include_dirs': [" Date: Fri, 30 Nov 2018 13:26:58 -0800 Subject: [PATCH 17/22] Right platform. --- binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index f234e6a..3eb0d5a 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,7 +1,7 @@ { 'targets' : [], 'conditions': [ - ['OS!="linux"', { + ['OS=="darwin"', { 'targets': [ { 'target_name': '<(module_name)', From 48f0ae7d409636f210746ed15586339624873439 Mon Sep 17 00:00:00 2001 From: Ryan Lamb Date: Fri, 30 Nov 2018 13:40:04 -0800 Subject: [PATCH 18/22] Add blank targets to please buggy mac gyp. --- binding.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index 3eb0d5a..cd4d21f 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,5 +1,5 @@ { - 'targets' : [], + 'targets' : [{'target_name': "BLANK"}], 'conditions': [ ['OS=="darwin"', { 'targets': [ From 01dfc5f206d0038663e0e1cdad31a56aba1abe50 Mon Sep 17 00:00:00 2001 From: Muhammad Yawar Ali Date: Thu, 21 May 2020 23:25:24 +0500 Subject: [PATCH 19/22] changed OS identifier --- binding.gyp | 2 +- index.js | 2 +- install.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/binding.gyp b/binding.gyp index cd4d21f..bec72f9 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,7 +1,7 @@ { 'targets' : [{'target_name': "BLANK"}], 'conditions': [ - ['OS=="darwin"', { + ['OS=="mac"', { 'targets': [ { 'target_name': '<(module_name)', diff --git a/index.js b/index.js index 9bc9a7e..e557715 100644 --- a/index.js +++ b/index.js @@ -3,7 +3,7 @@ const os = require('os'); // noble-mac acts as a shim to noble. -if (os.platform() === 'darwin') { +if (os.platform() === 'mac') { const Noble = require('noble/lib/noble'); const macBindings = require('./lib/binding.js'); var nobleInstance = new Noble(macBindings); diff --git a/install.js b/install.js index 4dfe84e..d059d24 100644 --- a/install.js +++ b/install.js @@ -1,7 +1,7 @@ const os = require('os'); var spawn = require('cross-spawn'); -if (os.platform() === 'darwin') { +if (os.platform() === 'mac') { spawn.sync('npm', ['run', 'native_install'], { input: 'MacOS detected. Installing native module.', stdio: 'inherit' From 0a1f4e3f0029b2c419229a29281ea551b6a14fa8 Mon Sep 17 00:00:00 2001 From: Muhammad Yawar Ali Date: Fri, 22 May 2020 02:04:33 +0500 Subject: [PATCH 20/22] testing xpc cleanup --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44576ac..27a6d02 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "cross-spawn": "^6.0.5", "napi-thread-safe-callback": "0.0.6", - "noble": "TheSufferfest/noble#no-xpc", + "noble": "TheSufferfest/noble#xpc-code-cleanup", "node-addon-api": "^1.1.0", "node-pre-gyp": "^0.10.0" }, From 0c46a4d5cbd3150334445fa6d97eb3213246ec8a Mon Sep 17 00:00:00 2001 From: Muhammad Yawar Ali Date: Fri, 22 May 2020 04:41:06 +0500 Subject: [PATCH 21/22] cleanup --- index.js | 2 +- install.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index e557715..9bc9a7e 100644 --- a/index.js +++ b/index.js @@ -3,7 +3,7 @@ const os = require('os'); // noble-mac acts as a shim to noble. -if (os.platform() === 'mac') { +if (os.platform() === 'darwin') { const Noble = require('noble/lib/noble'); const macBindings = require('./lib/binding.js'); var nobleInstance = new Noble(macBindings); diff --git a/install.js b/install.js index d059d24..4dfe84e 100644 --- a/install.js +++ b/install.js @@ -1,7 +1,7 @@ const os = require('os'); var spawn = require('cross-spawn'); -if (os.platform() === 'mac') { +if (os.platform() === 'darwin') { spawn.sync('npm', ['run', 'native_install'], { input: 'MacOS detected. Installing native module.', stdio: 'inherit' From d5ffe1b5a456eddc6e1c65e2d68efcc29034bf18 Mon Sep 17 00:00:00 2001 From: Muhammad Yawar Ali Date: Fri, 22 May 2020 04:43:04 +0500 Subject: [PATCH 22/22] Revert "testing xpc cleanup" This reverts commit 0a1f4e3f0029b2c419229a29281ea551b6a14fa8. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27a6d02..44576ac 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "cross-spawn": "^6.0.5", "napi-thread-safe-callback": "0.0.6", - "noble": "TheSufferfest/noble#xpc-code-cleanup", + "noble": "TheSufferfest/noble#no-xpc", "node-addon-api": "^1.1.0", "node-pre-gyp": "^0.10.0" },