Skip to content

Commit

Permalink
Merge pull request #71 from sjanuary/windowsfix
Browse files Browse the repository at this point in the history
Fix Node 10 Windows build issue
  • Loading branch information
rnchamberlain authored Nov 13, 2018
2 parents 7c325a5 + 46dd82c commit d94245a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 9 additions & 1 deletion binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# "externalbinariesdir%": "<(PRODUCT_DIR)/deploy/external/binaries",
"externalbinariesdir%": "./plugins",
'build_id%': '.<!(["python", "./generate_build_id.py"])',
'coreversion%': '3.2.8',
'coreversion%': '3.2.9',
"conditions": [
['OS=="aix"', {
"portdir": "aix",
Expand Down Expand Up @@ -95,6 +95,7 @@
"targets": [
{
"target_name": "agentcore",
"win_delay_load_hook": "false",
"type": "shared_library",
"sources": [
"<(srcdir)/common/Logger.cpp",
Expand Down Expand Up @@ -140,6 +141,7 @@
},
{
"target_name": "hcmqtt",
"win_delay_load_hook": "false",
"type": "shared_library",
"sources": [
"<(pahosrcdir)/Clients.c",
Expand Down Expand Up @@ -171,6 +173,7 @@
},
{
"target_name": "cpuplugin",
"win_delay_load_hook": "false",
"type": "shared_library",
"sources": [
"<(srcdir)/monitoring/plugins/common/cpu/cpuplugin.cpp",
Expand All @@ -193,6 +196,7 @@
},
{
"target_name": "memoryplugin",
"win_delay_load_hook": "false",
"type": "shared_library",
"sources": [
"<(srcdir)/monitoring/plugins/common/memory/MemoryPlugin.cpp",
Expand All @@ -205,13 +209,15 @@
},
{
"target_name": "envplugin",
"win_delay_load_hook": "false",
"type": "shared_library",
"sources": [
"<(srcdir)/monitoring/plugins/common/environment/envplugin.cpp",
],
},
{
"target_name": "hcapiplugin",
"win_delay_load_hook": "false",
"type": "shared_library",
"sources": [
"<(srcdir)/monitoring/connector/api/APIConnector.cpp",
Expand All @@ -233,6 +239,7 @@
},
{
"target_name": "headlessplugin",
"win_delay_load_hook": "false",
"type": "shared_library",
"sources": [
"<(srcdir)/monitoring/connector/headless/HLConnector.cpp",
Expand All @@ -241,6 +248,7 @@
},
{
"target_name": "external",
"win_delay_load_hook": "false",
"type": "none",
"dependencies": [
"agentcore",
Expand Down
2 changes: 1 addition & 1 deletion src/ibmras/monitoring/agent/Agent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ std::string Agent::getBuildDate() {
}

std::string Agent::getVersion() {
return "3.2.8";
return "3.2.9";
}

void Agent::setLogLevels() {
Expand Down

0 comments on commit d94245a

Please sign in to comment.