From a7e5a6819b79ef4225acc054a4851995d9091d2c Mon Sep 17 00:00:00 2001 From: Sian January Date: Tue, 13 Nov 2018 13:23:06 +0000 Subject: [PATCH 1/2] Fix Node 10 Windows build issue --- binding.gyp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/binding.gyp b/binding.gyp index f1388f5..818dc73 100644 --- a/binding.gyp +++ b/binding.gyp @@ -95,6 +95,7 @@ "targets": [ { "target_name": "agentcore", + "win_delay_load_hook": "false", "type": "shared_library", "sources": [ "<(srcdir)/common/Logger.cpp", @@ -140,6 +141,7 @@ }, { "target_name": "hcmqtt", + "win_delay_load_hook": "false", "type": "shared_library", "sources": [ "<(pahosrcdir)/Clients.c", @@ -171,6 +173,7 @@ }, { "target_name": "cpuplugin", + "win_delay_load_hook": "false", "type": "shared_library", "sources": [ "<(srcdir)/monitoring/plugins/common/cpu/cpuplugin.cpp", @@ -193,6 +196,7 @@ }, { "target_name": "memoryplugin", + "win_delay_load_hook": "false", "type": "shared_library", "sources": [ "<(srcdir)/monitoring/plugins/common/memory/MemoryPlugin.cpp", @@ -205,6 +209,7 @@ }, { "target_name": "envplugin", + "win_delay_load_hook": "false", "type": "shared_library", "sources": [ "<(srcdir)/monitoring/plugins/common/environment/envplugin.cpp", @@ -212,6 +217,7 @@ }, { "target_name": "hcapiplugin", + "win_delay_load_hook": "false", "type": "shared_library", "sources": [ "<(srcdir)/monitoring/connector/api/APIConnector.cpp", @@ -233,6 +239,7 @@ }, { "target_name": "headlessplugin", + "win_delay_load_hook": "false", "type": "shared_library", "sources": [ "<(srcdir)/monitoring/connector/headless/HLConnector.cpp", @@ -241,6 +248,7 @@ }, { "target_name": "external", + "win_delay_load_hook": "false", "type": "none", "dependencies": [ "agentcore", From 46dd82c49baaf7d547e583c03d9b31dc3f9191ed Mon Sep 17 00:00:00 2001 From: Sian January Date: Tue, 13 Nov 2018 13:50:50 +0000 Subject: [PATCH 2/2] update version to 3.2.9 --- README.md | 3 ++- binding.gyp | 2 +- src/ibmras/monitoring/agent/Agent.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6a73820..58cafe5 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,10 @@ This project uses a semver-parsable X.0.Z version number for releases, where X i Non-release versions of this project (for example on github.com/RuntimeTools/omr-agentcore) will use semver-parsable X.0.Z-dev.B version numbers, where X.0.Z is the last release with Z incremented and B is an integer. For further information on the development process go to the [appmetrics wiki][3]: [Developing](https://github.com/RuntimeTools/appmetrics/wiki/Developing). ## Version -3.2.8 +3.2.9 ## Release History +`3.2.9` - Build fixes for Node 10. `3.2.8` - Initial support for iPASE systems. `3.2.7` - Bug fix - common itoa mangling decimals (Windows only). `3.2.6` - Bug fixes. diff --git a/binding.gyp b/binding.gyp index 818dc73..1f82afa 100644 --- a/binding.gyp +++ b/binding.gyp @@ -5,7 +5,7 @@ # "externalbinariesdir%": "<(PRODUCT_DIR)/deploy/external/binaries", "externalbinariesdir%": "./plugins", 'build_id%': '.