From df934cb5ae788b4c88540c40be6a432f046893ce Mon Sep 17 00:00:00 2001 From: MattColegate Date: Mon, 10 Dec 2018 08:16:16 +0000 Subject: [PATCH] Fix Windows File Util compilation errors; update version to 4.0.1 --- README.md | 3 ++- binding.gyp | 2 +- src/ibmras/common/util/FileUtils.cpp | 6 +++--- src/ibmras/monitoring/agent/Agent.cpp | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cc80b43..097bfe6 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 -4.0.0 +4.0.1 ## Release History +`4.0.1` - Fix Windows FileUtil compilation errors. `4.0.0` - Fixes for z/OS API connections and semaphore reuse. `3.2.9` - Build fixes for Node 10. `3.2.8` - Initial support for iPASE systems. diff --git a/binding.gyp b/binding.gyp index 49b8222..d665309 100644 --- a/binding.gyp +++ b/binding.gyp @@ -5,7 +5,7 @@ # "externalbinariesdir%": "<(PRODUCT_DIR)/deploy/external/binaries", "externalbinariesdir%": "./plugins", 'build_id%': '.(pathName), NULL)) { switch (GetLastError()) { case ERROR_ALREADY_EXISTS: @@ -144,7 +144,7 @@ bool createFile(std::string& path) { switch (GetLastError()) { case ERROR_PATH_NOT_FOUND: IBMRAS_DEBUG_1(fine, "File %s was not found. Attempting to create.", pathName); - fileHandle = CreateFile(reinterpret_cast(pathName), NULL, (GENERIC_READ | GENERIC_WRITE), 0, (FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, CREATE_NEW, FILE_ATTRIBUTE_HIDDEN, NULL); + fileHandle = CreateFile(reinterpret_cast(pathName), (GENERIC_READ | GENERIC_WRITE), (FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, CREATE_NEW, FILE_ATTRIBUTE_HIDDEN, NULL); if(INVALID_HANDLE_VALUE == fileHandle) { switch (GetLastError()) { //if the directory already exists we will use it instead of the current one. @@ -169,7 +169,7 @@ bool createFile(std::string& path) { break; default: IBMRAS_DEBUG_1(fine, "File %s could not be found, permissions? Attempting to create", pathName); - fileHandle = CreateFile(reinterpret_cast(pathName), NULL, (GENERIC_READ | GENERIC_WRITE), 0, (FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, CREATE_NEW, FILE_ATTRIBUTE_HIDDEN, NULL); + fileHandle = CreateFile(reinterpret_cast(pathName), (GENERIC_READ | GENERIC_WRITE), (FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, CREATE_NEW, FILE_ATTRIBUTE_HIDDEN, NULL); if(INVALID_HANDLE_VALUE == fileHandle) { switch (GetLastError()) { case ERROR_FILE_EXISTS: diff --git a/src/ibmras/monitoring/agent/Agent.cpp b/src/ibmras/monitoring/agent/Agent.cpp index 52d69a0..f54b660 100644 --- a/src/ibmras/monitoring/agent/Agent.cpp +++ b/src/ibmras/monitoring/agent/Agent.cpp @@ -192,7 +192,7 @@ std::string Agent::getBuildDate() { } std::string Agent::getVersion() { - return "4.0.0"; + return "4.0.1"; } void Agent::setLogLevels() {