Changeset 272

Timestamp:

06/10/10 21:59:32 (20 months ago)

Author:

mickem

Message:

More build subsystem changes

Files:

• (root) (modified) (1 prop)
• branches/stable/AutoBuild.h (modified) (1 diff)
• branches/stable/changelog (modified) (1 diff)
• branches/stable/include/pdh/core.hpp (modified) (1 diff)
• branches/stable/modules/CheckDisk/CheckDisk.cpp (modified) (1 diff)
• branches/stable/modules/CheckSystem/CheckSystem.cpp (modified) (1 diff)
• branches/stable/modules/NSClientListener/NSClientListener.cpp (modified) (1 diff)
• trunk/CMakeLists.txt (modified) (2 diffs)
• trunk/build.cmake (modified) (2 diffs)
• trunk/libs/cryptopp/CMakeLists.txt (modified) (1 diff)
• trunk/modules/CheckDisk/CMakeLists.txt (added)

branches/stable/AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,8,76
-#define PRODUCTVER     0,3,8,76
-#define STRFILEVER     _T("0.3.8.76")
-#define STRPRODUCTVER  _T("0.3.8.76")
-#define STRPRODUCTDATE  _T("2010-05-27")
+#define FILEVER        0,3,8,78
+#define PRODUCTVER     0,3,8,78
+#define STRFILEVER     _T("0.3.8.78")
+#define STRPRODUCTVER  _T("0.3.8.78")
+#define STRPRODUCTDATE  _T("2010-06-02")
 #endif // AUTOBUILD_H

branches/stable/changelog

@@ -6 +6 @@
  * Fix depend onservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2010-06-02 MickeM
+ * Fixed a few issues with listCounterInstances
 
 2010-05-25 MickeM - 0.3.8 (take 3)

branches/stable/include/pdh/core.hpp

@@ -183 +183 @@
     static std::list<std::wstring> build_list(TCHAR *buffer, DWORD bufferSize) {
       std::list<std::wstring> ret;
+      if (bufferSize == 0)
+        return ret;
       DWORD prevPos = 0;
       for (unsigned int i = 0; i<bufferSize-1; i++) {

branches/stable/modules/CheckDisk/CheckDisk.cpp

@@ -231 +231 @@
           )
           drives.push_back(DriveContainer(drv, tmpObject.warn, tmpObject.crit));
+        else
+          NSC_DEBUG_MSG_STD(_T("Ignoring drive: ") + drv);
 
         buffer = &buffer[drv.size()];

branches/stable/modules/CheckSystem/CheckSystem.cpp

@@ -1162 +1162 @@
       msg += (*it);
     }
+    if (msg.empty()) {
+      msg = _T("ERROR: No instances found");
+      return NSCAPI::returnUNKNOWN;
+    }
   } catch (const PDH::PDHException e) {
     msg = _T("ERROR: Failed to enumerate counter instances: " + e.getError());

branches/stable/modules/NSClientListener/NSClientListener.cpp

@@ -244 +244 @@
     case REQ_COUNTER:
     case REQ_FILEAGE:
+    case REQ_INSTANCES:
       return strEx::wstring_to_string(message);
 

trunk/CMakeLists.txt

@@ -37 +37 @@
 SET(PROTOBUF_DIR "${INC_PROTOBUF_DIR}" CACHE PATH "Path to google protocol buffer root")
 IF(WIN32 AND MSVC)
-  SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_DIR}/src" CACHE PATH "Path to google protocol buffer source")
-  SET(PROTOBUF_LIBRARYDIR "${PROTOBUF_DIR}/vsprojects/Release")
-  SET(PROTOBUF_BINARYDIR "${PROTOBUF_DIR}/vsprojects/Release")
+  SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_DIR}/src" "Path to google protocol buffer source")
+  SET(PROTOBUF_LIBRARYDIR "${PROTOBUF_DIR}/vsprojects/x64/Release")
+  SET(PROTOBUF_BINARYDIR "${PROTOBUF_DIR}/vsprojects/debug")
 ELSE(WIN32 AND MSVC)
 # TODO
@@ -169 +169 @@
 
 SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0400)
+# TODO: Fix this issue! (crypto++ and masm)
+IF (WIN32)
+  SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DCRYPTOPP_DISABLE_ASM)
+ENDIF (WIN32)
+
 
 IF(CMAKE_HOST_UNIX)

trunk/build.cmake

@@ -9 +9 @@
 #SET(Boost_VERSION 1.40)
 
-SET(INC_NSCP_LIBRARYDIR C:/source/lib/x86)
+SET(INC_NSCP_LIBRARYDIR C:/source/lib/x64)
 SET(INC_NSCP_INCLUDEDIR C:/source/include)
 
@@ -19 +19 @@
 
 SET(INC_PROTOBUF_DIR "c:/source/libraries/protobuf-2.3.0")
+
 SET(INC_CRYPTOPP_DIR "c:/source/libraries/cryptopp-5.6.0")
 

trunk/libs/cryptopp/CMakeLists.txt

@@ -29 +29 @@
   # TODO add asm    echo $(.source)/x64masm.asm ;
   #   obj x64masm.obj : $(.source)/x64masm.asm ;
+  #enable_language(ASM_MASM)
+  #if(CMAKE_ASM_MASM_COMPILER_WORKS)
+  # set(can_use_assembler TRUE)
+  # SET(cryptopp_SOURCES ${cryptopp_SOURCES}  "${CRYPTOPP_SOURCE_DIR}/x64masm.asm")
+  #else(CMAKE_ASM_MASM_COMPILER_WORKS)
+  # MESSAGE(WARNING "Failed to find mnasm")
+  #endif(CMAKE_ASM_MASM_COMPILER_WORKS)
+  IF (WIN32)
+    ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM)
+    SET(Cryptopp_DEFINES -DCRYPTOPP_DISABLE_ASM)
+  ENDIF (WIN32)
 
   ADD_LIBRARY (cryptopp SHARED ${cryptopp_SOURCES})