Changeset 98c5285 in nscp

Timestamp:

08/16/12 07:31:33 (10 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

4399705

Parents:

5d81bfb

Message:

• error reporter builds without protocol buffers (will just report errors though)
• fetchdeps now builds openssl as static library

Files:

• build/python/fetchdeps.py (modified) (2 diffs)
• tools/error_reporter/CMakeLists.txt (modified) (1 diff)
• tools/error_reporter/module.cmake (modified) (1 diff)
• tools/error_reporter/reporter.cpp (modified) (3 diffs)

build/python/fetchdeps.py

@@ -19 +19 @@
 #SET(PROTOBUF_LIBRARY_SUFFIX "-lite")
 SET(PROTOBUF_ROOT "$${LIBRARY_ROOT_FOLDER}/${protobuf}")
-SET(OPENSSL_ROOT_DIR "$${LIBRARY_ROOT_FOLDER}/${openssl}/out32dll")
+SET(OPENSSL_ROOT_DIR "$${LIBRARY_ROOT_FOLDER}/${openssl}/out32")
 SET(_OPENSSL_INCLUDEDIR "$${LIBRARY_ROOT_FOLDER}/${openssl}/include")
 SET(ZEROMQ_ROOT "$${LIBRARY_ROOT_FOLDER}/${ZeroMQ}")
@@ -228 +228 @@
   ['perl Configure VC-WIN32', 'ms\\do_ms'],
   ['perl Configure VC-WIN64A', 'ms\\do_win64a'],
-  ['nmake -f ms\\ntdll.mak']
+  ['nmake -f ms\\nt.mak']
   )
 

tools/error_reporter/CMakeLists.txt

@@ -3 +3 @@
 SET(TARGET reporter)
 
+PROJECT(reporter)
+
+ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES})
 IF(BREAKPAD_FOUND)
-  PROJECT(reporter)
+  ADD_DEFINITIONS(HAVE_BREAKPAD)
+  SET(EXTRA_LIBS ${EXTRA_LIBS} ${BREAKPAD_COMMON_LIBRARY} ${BREAKPAD_CRASH_REPORT_SENDER_LIBRARY})
+ENDIF(BREAKPAD_FOUND)
 
-  ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES})
+SET(reporter_SRCS
+  StdAfx.cpp
+  reporter.cpp
+)
 
-  SET(reporter_SRCS
-    StdAfx.cpp
-    reporter.cpp
+IF(WIN32)
+  SET(reporter_SRCS ${reporter_SRCS}
+    ${NSCP_INCLUDEDIR}/ServiceCmd.cpp
+    reporter.h
+    StdAfx.h
   )
+  SET(EXTRA_LIBS Wininet.lib)
+ENDIF(WIN32)
 
-  IF(WIN32)
-    SET(reporter_SRCS ${reporter_SRCS}
-      ${NSCP_INCLUDEDIR}/ServiceCmd.cpp
-      reporter.h
-      StdAfx.h
-    )
-    SET(EXTRA_LIBS Wininet.lib)
-  ENDIF(WIN32)
+add_executable (${TARGET} ${reporter_SRCS})
+target_link_libraries(${TARGET}
+  ${Boost_FILESYSTEM_LIBRARY}
+  ${Boost_SYSTEM_LIBRARY}
+  ${EXTRA_LIBS}
+)
+SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "tools")
 
-  add_executable (${TARGET} ${reporter_SRCS})
-  target_link_libraries(${TARGET}
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${BREAKPAD_COMMON_LIBRARY}
-    ${BREAKPAD_CRASH_REPORT_SENDER_LIBRARY}
-    ${EXTRA_LIBS}
-  )
-  SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "tools")
+SOURCE_GROUP("Common Files" REGULAR_EXPRESSION .*include/.*)
+SOURCE_GROUP("Parser" REGULAR_EXPRESSION .*include/parser/.*)
+SOURCE_GROUP("NSCP API" REGULAR_EXPRESSION .*include/nscapi/.*)
+SOURCE_GROUP("Settings" REGULAR_EXPRESSION .*include/settings/.*)
 
-  SOURCE_GROUP("Common Files" REGULAR_EXPRESSION .*include/.*)
-  SOURCE_GROUP("Parser" REGULAR_EXPRESSION .*include/parser/.*)
-  SOURCE_GROUP("NSCP API" REGULAR_EXPRESSION .*include/nscapi/.*)
-  SOURCE_GROUP("Settings" REGULAR_EXPRESSION .*include/settings/.*)
-
-  INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION .)
-  INSTALL(CODE "SET(PDB_FULL_PATH ${BUILD_TARGET_EXE_PATH}/${TARGET}.pdb)")
-  INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX} TYPE EXECUTABLE FILES \${PDB_FULL_PATH})")
-ENDIF(BREAKPAD_FOUND)
+INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION .)
+INSTALL(CODE "SET(PDB_FULL_PATH ${BUILD_TARGET_EXE_PATH}/${TARGET}.pdb)")
+INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX} TYPE EXECUTABLE FILES \${PDB_FULL_PATH})")

tools/error_reporter/module.cmake

@@ -1 @@
-IF(BREAKPAD_FOUND)
-  SET (BUILD_MODULE 1)
-  SET(CURRENT_MODULE_NAME reporter)
-ENDIF(BREAKPAD_FOUND)
+SET (BUILD_MODULE 1)
+SET(CURRENT_MODULE_NAME reporter)

tools/error_reporter/reporter.cpp

@@ -9 +9 @@
 #include <strEx.h>
 
+#ifdef HAVE_BREAKPAD
 #include <client/windows/sender/crash_report_sender.cc>
+#endif
 
 
@@ -120 +122 @@
 
 bool SendMinidump(std::wstring file, std::wstring product, std::wstring version, std::wstring date, std::wstring url, std::wstring &err) {
+#ifdef HAVE_BREAKPAD
   google_breakpad::CrashReportSender sender(_T(""));
   //std::wstring url = _T("http://crash.nsclient.org/submit");
@@ -132 +135 @@
   err = ret;
   return result == google_breakpad::RESULT_SUCCEEDED;
+#else
+  std::wcerr << _T("Not compiled with protocol buffer support...\n");
+  return false;
+#endif
 }