Skip to content

Commit d94245a

Browse files
Merge pull request #71 from sjanuary/windowsfix
Fix Node 10 Windows build issue
2 parents 7c325a5 + 46dd82c commit d94245a

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ This project uses a semver-parsable X.0.Z version number for releases, where X i
1919
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).
2020

2121
## Version
22-
3.2.8
22+
3.2.9
2323

2424
## Release History
25+
`3.2.9` - Build fixes for Node 10.
2526
`3.2.8` - Initial support for iPASE systems.
2627
`3.2.7` - Bug fix - common itoa mangling decimals (Windows only).
2728
`3.2.6` - Bug fixes.

binding.gyp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# "externalbinariesdir%": "<(PRODUCT_DIR)/deploy/external/binaries",
66
"externalbinariesdir%": "./plugins",
77
'build_id%': '.<!(["python", "./generate_build_id.py"])',
8-
'coreversion%': '3.2.8',
8+
'coreversion%': '3.2.9',
99
"conditions": [
1010
['OS=="aix"', {
1111
"portdir": "aix",
@@ -95,6 +95,7 @@
9595
"targets": [
9696
{
9797
"target_name": "agentcore",
98+
"win_delay_load_hook": "false",
9899
"type": "shared_library",
99100
"sources": [
100101
"<(srcdir)/common/Logger.cpp",
@@ -140,6 +141,7 @@
140141
},
141142
{
142143
"target_name": "hcmqtt",
144+
"win_delay_load_hook": "false",
143145
"type": "shared_library",
144146
"sources": [
145147
"<(pahosrcdir)/Clients.c",
@@ -171,6 +173,7 @@
171173
},
172174
{
173175
"target_name": "cpuplugin",
176+
"win_delay_load_hook": "false",
174177
"type": "shared_library",
175178
"sources": [
176179
"<(srcdir)/monitoring/plugins/common/cpu/cpuplugin.cpp",
@@ -193,6 +196,7 @@
193196
},
194197
{
195198
"target_name": "memoryplugin",
199+
"win_delay_load_hook": "false",
196200
"type": "shared_library",
197201
"sources": [
198202
"<(srcdir)/monitoring/plugins/common/memory/MemoryPlugin.cpp",
@@ -205,13 +209,15 @@
205209
},
206210
{
207211
"target_name": "envplugin",
212+
"win_delay_load_hook": "false",
208213
"type": "shared_library",
209214
"sources": [
210215
"<(srcdir)/monitoring/plugins/common/environment/envplugin.cpp",
211216
],
212217
},
213218
{
214219
"target_name": "hcapiplugin",
220+
"win_delay_load_hook": "false",
215221
"type": "shared_library",
216222
"sources": [
217223
"<(srcdir)/monitoring/connector/api/APIConnector.cpp",
@@ -233,6 +239,7 @@
233239
},
234240
{
235241
"target_name": "headlessplugin",
242+
"win_delay_load_hook": "false",
236243
"type": "shared_library",
237244
"sources": [
238245
"<(srcdir)/monitoring/connector/headless/HLConnector.cpp",
@@ -241,6 +248,7 @@
241248
},
242249
{
243250
"target_name": "external",
251+
"win_delay_load_hook": "false",
244252
"type": "none",
245253
"dependencies": [
246254
"agentcore",

src/ibmras/monitoring/agent/Agent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ std::string Agent::getBuildDate() {
192192
}
193193

194194
std::string Agent::getVersion() {
195-
return "3.2.8";
195+
return "3.2.9";
196196
}
197197

198198
void Agent::setLogLevels() {

0 commit comments

Comments
 (0)