Changeset 04ef932 in nscp

Timestamp:

08/10/11 07:37:24 (22 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

54ac968

Parents:

e11d494

Message:

2011-08-10

• Fixed so it builds and runs on linux (but parser had issues so disabled som grammar rules whichneeds to be enabled again)
• Added a lot of freatures and cleand up the PythonScript module
• Started to merge som features from PythonScript back to Lua script

2011-08-07

• Fixed a lot of issues with PythonScript module adding suport for alias and "raw command processing"
• Fixed issue with loading plugins and aliases as well as duplicate plugin detection

2011-08-01

• Added new module: PythonScript

Files:

• CMakeLists.txt (modified) (11 diffs)
• build.cmake (modified) (2 diffs)
• build/cmake/FindPythonInterpEx.cmake (added)
• build/cmake/FindPythonLibsEx.cmake (added)
• build/cmake/NSCPPBuffer.cmake (modified) (1 diff)
• build/python/config.py (added)
• build/python/postbuild.py (modified) (3 diffs)
• changelog (modified) (1 diff)
• helpers/installers/installer/CMakeLists.txt (modified) (1 diff)
• helpers/installers/installer/Product.wxs (modified) (3 diffs)
• helpers/settings_manager/CMakeLists.txt (modified) (1 diff)
• include/file_helpers.hpp (modified) (3 diffs)
• include/nsca/nsca_packet.hpp (modified) (1 diff)
• include/nscapi/functions.hpp (modified) (3 diffs)
• include/nscapi/nscapi_core_wrapper.cpp (modified) (2 diffs)
• include/nscapi/nscapi_core_wrapper.hpp (modified) (1 diff)
• include/parsers/helpers.cpp (modified) (2 diffs)
• include/parsers/where.cpp (modified) (1 diff)
• include/scripts/functions.hpp (added)
• include/socket_helpers.hpp (modified) (4 diffs)
• include/strEx.h (modified) (4 diffs)
• include/unicode_char.hpp (modified) (1 diff)
• libs/protobuf/log.proto.h (modified) (1 diff)
• modules/CheckNSCP/CheckNSCP.cpp (modified) (4 diffs)
• modules/LUAScript/LUAScript.cpp (modified) (6 diffs)
• modules/LUAScript/LUAScript.h (modified) (3 diffs)
• modules/LUAScript/script_wrapper.hpp (modified) (6 diffs)
• modules/NRPEClient/CMakeLists.txt (modified) (1 diff)
• modules/NRPEServer/CMakeLists.txt (modified) (1 diff)
• modules/NSCAAgent/CMakeLists.txt (modified) (1 diff)
• scripts/CMakeLists.txt (modified) (2 diffs)
• scripts/lua/test.lua (added)
• scripts/python/test.py (added)
• scripts/python/test_second.py (added)
• service/CMakeLists.txt (modified) (1 diff)
• service/NSCPlugin.cpp (modified) (1 diff)
• service/NSClient++.cpp (modified) (3 diffs)
• service/settings_logger_impl.cpp (modified) (1 diff)
• service/simple_client.hpp (modified) (1 diff)
• tools/error_reporter/CMakeLists.txt (modified) (1 diff)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

CMakeLists.txt

@@ -34 +34 @@
 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" "Path to google protocol buffer source")
+  SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_DIR}/src")
   SET(PROTOBUF_LIBRARYDIR "${INC_PROTOBUF_LIBRARYDIR}")
   SET(PROTOBUF_LIBRARY_PREFIX "")
@@ -42 +42 @@
 # TODO
 ENDIF(WIN32 AND MSVC)
+
+
 # ### ### ### ###
 # Crypto++
@@ -86 +88 @@
 INCLUDE(${BUILD_CMAKE_FOLDER}/functions.cmake)
 
+
+FIND_PACKAGE(PythonInterpEx)
+FIND_PACKAGE(PythonLibsEx)
+IF (NOT PYTHONINTERP_FOUND)
+  MESSAGE(FATAL_ERROR "Could not find python which is required for building")
+ELSE (NOT PYTHONINTERP_FOUND)
+  message(STATUS "Found python in: ${PYTHON_EXECUTABLE}")
+ENDIF (NOT PYTHONINTERP_FOUND)
+IF (PYTHONLIBSEX_FOUND)
+  MESSAGE(STATUS "Found python (lib) in: ${PYTHON_LIBRARY}")
+ENDIF (PYTHONLIBSEX_FOUND)
+
+
 SET(VERSION_TXT ${CMAKE_CURRENT_SOURCE_DIR}/version.txt)
-IF(${INCREASE_BUILD} STREQUAL 1)
+IF("${INCREASE_BUILD}" STREQUAL "1")
 EXECUTE_PROCESS(
   COMMAND ${PYTHON_EXECUTABLE}
@@ -98 +113 @@
   )
   MESSAGE(STATUS "===================== Bumping version")
-ENDIF(${INCREASE_BUILD} STREQUAL 1)
+ENDIF("${INCREASE_BUILD}" STREQUAL "1")
 
 EXECUTE_PROCESS(
@@ -186 +201 @@
 if(BREAKPAD_FOUND)
   MESSAGE(STATUS "Found google breakpad")
-  SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DUSE_BREAK_PAD)
+  SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DUSE_BREAK_PAD -DBOOST_FILESYSTEM_VERSION=2)
+  INCLUDE_DIRECTORIES("${BREAKPAD_INCLUDE_DIR}")
 else(BREAKPAD_FOUND)
   MESSAGE(WARNING "Breakpad was not found in: ${BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR}/${BREAKPAD_EXCEPTION_HANDLER_LIBRARIES}")
@@ -193 +209 @@
 FIND_PACKAGE(OpenSSL)
 if(OPENSSL_FOUND)
-  MESSAGE(STATUS "Found OpenSSL")
+  MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_INCLUDE_DIR}")
   SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DUSE_SSL)
 else(OPENSSL_FOUND)
@@ -199 +215 @@
 endif(OPENSSL_FOUND)
 
-FIND_PACKAGE(Boost COMPONENTS system filesystem thread regex date_time program_options REQUIRED)
+FIND_PACKAGE(Boost COMPONENTS system filesystem thread regex date_time program_options python REQUIRED)
 if(Boost_FOUND)
   MESSAGE(STATUS "Found boost in: ${Boost_INCLUDE_DIRS} / ${Boost_LIBRARY_DIRS}")
@@ -212 +228 @@
   ENDIF(WIN32)
 else(Boost_FOUND)
-  MESSAGE(FATAL_ERROR, "boost NOT fround: ${Boost_ERROR_REASON}")
+  MESSAGE(FATAL_ERROR "boost NOT fround: ${Boost_ERROR_REASON}")
 endif(Boost_FOUND)
 
 if(PROTOBUF_FOUND)
-  message(STATUS "Found proto in: ${PROTOBUF_LIBRARY} (${PROTOBUF_PROTOC_EXECUTABLE})")
-  INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+  message(STATUS "Found proto in: ${PROTOBUF_INCLUDE_DIR} / ${PROTOBUF_LIBRARY} (${PROTOBUF_PROTOC_EXECUTABLE})")
+  INCLUDE_DIRECTORIES("${PROTOBUF_INCLUDE_DIR}")
 else(PROTOBUF_FOUND)
-  message(FATAL_ERROR, "Protocol buffers NOT found (${PROTOBUF_LIBRARYDIR}, )")
+  message(FATAL_ERROR "Protocol buffers NOT found (${PROTOBUF_LIBRARYDIR})")
 endif(PROTOBUF_FOUND)
 
@@ -299 +315 @@
 ENDIF(NOT WIN32)
 
-FIND_PACKAGE(PythonInterp)
-IF (NOT PYTHONINTERP_FOUND)
-  MESSAGE(FATAL_ERROR "Could not find python which is required for building")
-ELSE (NOT PYTHONINTERP_FOUND)
-  message(STATUS "Found python in: ${PYTHON_EXECUTABLE}")
-ENDIF (NOT PYTHONINTERP_FOUND)
-
-
 SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0403)
 # TODO: Fix this issue! (crypto++ and masm)
@@ -367 +375 @@
 
 SET(NSCP_DEF_PLUGIN_LIB
-  ${Boost_LIBRARIES}
+# ${Boost_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
+  ${Boost_PROGRAM_OPTIONS_LIBRARY}
+  ${Boost_THREAD_LIBRARY}
   ${EXTRA_LIBS}
   ${PROTOBUF_LIBRARY}
@@ -453 +463 @@
   ${BUILD_TARGET_EXE_PATH}/postbuild.py
 )
+CONFIGURE_FILE(
+  ${BUILD_PYTHON_FOLDER}/config.py
+  ${BUILD_TARGET_EXE_PATH}/config.py
+)

build.cmake

@@ -11 +11 @@
     MESSAGE(STATUS "Detected x64")
     SET(INC_NSCP_LIBRARYDIR D:/source/lib/x64)  
+    SET(PYTHON_ROOT c:/python/27x64)  
   ELSE()
     MESSAGE(STATUS "Detected w32")
     SET(INC_NSCP_LIBRARYDIR D:/source/lib/x86)
+    SET(PYTHON_ROOT c:/python/27) 
   ENDIF()
 
   SET(INC_GOOGLE_BREAKPAD_DIR "D:/source/libraries/google-breakpad-svn")
     
-  SET(INC_BOOST_INCLUDEDIR "${INC_NSCP_INCLUDEDIR}")
+  SET(INC_BOOST_INCLUDEDIR "D:/source/include/boost-1_47")
   SET(INC_BOOST_LIBRARYDIR "${INC_NSCP_LIBRARYDIR}")
   SET(INC_PROTOBUF_LIBRARYDIR "${INC_NSCP_LIBRARYDIR}")
@@ -35 +37 @@
 
   SET(INC_OPENSSL_INCLUDEDIR "/usr/include/")
+  SET(PROTOBUF_INCLUDE_DIR "/usr/include/")
 
 ENDIF(WIN32)

build/cmake/NSCPPBuffer.cmake

@@ -97 +97 @@
         ARGS --cpp_out  ${CMAKE_CURRENT_BINARY_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
         DEPENDS ${ABS_FIL}
-        COMMENT "Running protocol buffer compiler on ${FIL}" VERBATIM )
+        COMMENT "Running protocol buffer compiler on ${FIL} - ${PROTOBUF_PROTOC_EXECUTABLE}" VERBATIM )
 
       SET_SOURCE_FILES_PROPERTIES(${${VAR}} ${INCL} PROPERTIES GENERATED TRUE)

build/python/postbuild.py

@@ -6 +6 @@
 
 
-BREAKPAD_FOUND = "${BREAKPAD_FOUND}"
-BREAKPAD_FOUND = "FALSE"
-BREAKPAD_DUMPSYMS_EXE = "${BREAKPAD_DUMPSYMS_EXE}"
-BUILD_TARGET_EXE_PATH = "${BUILD_TARGET_EXE_PATH}"
-BUILD_PYTHON_FOLDER = "${BUILD_PYTHON_FOLDER}"
-VERSION = "${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}"
-CMAKE_CL_64 = "${CMAKE_CL_64}"
-ARCHIVE_FOLDER = "${ARCHIVE_FOLDER}"
-VERSION_TXT = "${VERSION_TXT}"
-VERSION_ARCH = "${VERSION_ARCH}"
+execfile("config.py")
 
 sys.path.append(BUILD_PYTHON_FOLDER)
@@ -23 +14 @@
 version.read()
 datestr = version.datestr()
+vstring = version.version()
 
 def rename_and_move(file, target):
@@ -66 +58 @@
     os.mkdir(target_archives)
 
-  for f in find_by_pattern(BUILD_TARGET_EXE_PATH, '*.msi'):
+  for f in find_by_pattern(BUILD_TARGET_EXE_PATH, '*%s*.msi'%vstring):
     rename_and_move(f, target_installer)
-  for f in find_by_pattern(BUILD_TARGET_EXE_PATH, '*.zip'):
+  for f in find_by_pattern(BUILD_TARGET_EXE_PATH, '*%s*.zip'%vstring):
     rename_and_move(f, target_archives)
   

changelog

@@ -6 +6 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2011-08-10
+ * Fixed so it builds and runs on linux (but parser had issues so disabled som grammar rules whichneeds to be enabled again)
+ * Added a lot of freatures and cleand up the PythonScript module
+ * Started to merge som features from PythonScript back to Lua script
+ 
+2011-08-07
+ * Fixed a lot of issues with PythonScript module adding suport for alias and "raw command processing"
+ * Fixed issue with loading plugins and aliases as well as duplicate plugin detection
+ 
+2011-08-01
+ * Added new module: PythonScript
 
 2011-07-25

helpers/installers/installer/CMakeLists.txt

@@ -35 +35 @@
   "NagiosPlugins.vbs_script lib"
   "wrapper.vbs_script lib"
+
+  "test.py.vbs_script lib"
+  "test_second.py.vbs_script lib"
   
   counters.defs_files

helpers/installers/installer/Product.wxs

@@ -36 +36 @@
     <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" CompressionLevel="high" />
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="$(var.ProgramFiles)">
-        <Directory Id="INSTALLLOCATION" Name="$(var.App.Path)">
-          <Component Id="MainClient" Guid="F6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-            <File Id="NSClientEXE" Name="nscp.exe" DiskId="1" KeyPath="yes"
+      <Directory Id="$(var.ProgramFiles)">
+        <Directory Id="INSTALLLOCATION" Name="$(var.App.Path)">
+          <Component Id="MainClient" Guid="F6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <File Id="NSClientEXE" Name="nscp.exe" DiskId="1" KeyPath="yes"
                 Source="$(var.Source)/nscp.exe" Vital="yes">
-              <Shortcut Id="StartmenuNSClientTest" Directory="ProgramMenuDir"
+              <Shortcut Id="StartmenuNSClientTest" Directory="ProgramMenuDir"
                 Name="$(var.App.Title) ($(var.arch), test)" WorkingDirectory="INSTALLDIR" Icon="nscp.exe"
                 Advertise="yes" IconIndex="0" Arguments="--test" Description="Run $(var.App.Title) in test mode" />
-              <fire:FirewallException Id="FWX1" Name="NSClient++ Monitoring Agent" Scope="any" IgnoreFailure="yes" />
-            </File>
-            <ServiceInstall Id="SWCNSCP"
+              <fire:FirewallException Id="FWX1" Name="NSClient++ Monitoring Agent" Scope="any" IgnoreFailure="yes" />
+            </File>
+            <ServiceInstall Id="SWCNSCP"
               Name="[SERVICE_NAME]" DisplayName="$(var.App.Title) ($(var.arch))"
               Type="ownProcess" Start="auto" ErrorControl="normal" Interactive="no"
               Description="Monitoring agent for nagios (and others) used to respond to status queries"
               Arguments="--service --run --name [SERVICE_NAME]" />
-            <ServiceControl Id="StartSWCNSCP" Name="[SERVICE_NAME]" Start="install" Stop="both" Wait="yes" Remove="uninstall" />
-            <RemoveFolder Id="RemoveMenuShortcuts" Directory="ProgramMenuDir" On="uninstall" />
-          </Component>
-          <Component Id="Shortcuts" Guid="E6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-            <Shortcut Id="StartmenuNSClientStart" Directory="ProgramMenuDir" Name="Start $(var.App.Title) ($(var.arch))"
+            <ServiceControl Id="StartSWCNSCP" Name="[SERVICE_NAME]" Start="install" Stop="both" Wait="yes" Remove="uninstall" />
+            <RemoveFolder Id="RemoveMenuShortcuts" Directory="ProgramMenuDir" On="uninstall" />
+          </Component>
+          <Component Id="Shortcuts" Guid="E6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <Shortcut Id="StartmenuNSClientStart" Directory="ProgramMenuDir" Name="Start $(var.App.Title) ($(var.arch))"
                   WorkingDirectory='INSTALLDIR' Icon="nscp.exe" IconIndex="0"
                   Arguments="--service --name [SERVICE_NAME] --start" Description="Start the $(var.App.Title) service" />
-            <Shortcut Id="StartmenuNSClientStop" Directory="ProgramMenuDir" Name="Stop $(var.App.Title) ($(var.arch))"
+            <Shortcut Id="StartmenuNSClientStop" Directory="ProgramMenuDir" Name="Stop $(var.App.Title) ($(var.arch))"
                   WorkingDirectory='INSTALLDIR' Icon="nscp.exe" IconIndex="0"
                   Arguments="--service --name [SERVICE_NAME] --stop" Description="Stop the $(var.App.Title) service" />
-            <Shortcut Id="StarmentNSCHelp" Directory="ProgramMenuDir" Name="Documentation"
+            <Shortcut Id="StarmentNSCHelp" Directory="ProgramMenuDir" Name="Documentation"
                   Target="[HELP_LINK]" Icon="doc.ico"
                   Description="Visit the NSClient++ WIKI for documentation">
-            </Shortcut>
-            <RegistryValue Root="HKCU" Key="Software\NSClient++\Installer" Name="shortcuts" Type="integer" Value="1" KeyPath="yes"/>
-          </Component>
-          <Component Id="Helpers" Guid="A6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-            <!--
+            </Shortcut>
+            <RegistryValue Root="HKCU" Key="Software\NSClient++\Installer" Name="shortcuts" Type="integer" Value="1" KeyPath="yes"/>
+          </Component>
+          <Component Id="Helpers" Guid="A6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <!--
             <File Id="NSClientTRAY" Name="nstray.exe" DiskId="1"
                 Source="$(var.Source)/nstray.exe" Vital="yes">
@@ -76 +76 @@
             </File>
             -->
-            <File Id="ErrorReporter" Name="reporter.exe" DiskId="1" Source="$(var.Source)/reporter.exe" Vital="yes" />
-            <!--
+            <File Id="ErrorReporter" Name="reporter.exe" DiskId="1" Source="$(var.Source)/reporter.exe" Vital="yes" />
+            <!--
               <File Id="NSClientINI" Name="NSC.ini" LongName="NSC.ini" DiskId="1" Source="$(var.Path.ini)/NSC.ini" Vital="yes"/>
             -->
-          </Component>
-          <Component Id="RandomFiles" Guid="B4636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-            <File Id="Changelog" Name="changelog.txt" DiskId="1" Source="$(var.Source)/changelog" Vital="no" />
-            <File Id="Counters" Name="counters.defs" DiskId="1" Source="$(var.Source)/counters.defs" Vital="no" />
-            <File Id="License" Name="license.txt" DiskId="1" Source="$(var.Source)/license.txt" Vital="no" KeyPath="yes" />
-            <File Id="settingsMap" Name="old-settings.map" DiskId="1" Source="$(var.Source)/old-settings.map" Vital="no" />
-
-            <RemoveFile Id="LogFile1" Name="nsclient.log" On="uninstall" />
-            <RemoveFile Id="LogFile2" Name="nsc.log" On="uninstall" />
-            <RemoveFile Id="OldConfig" Name="nsc.old" On="uninstall" />
-            <RemoveFile Id="NewConfig" Name="nsc.new" On="uninstall" />
-          </Component>
-          <Component Id="NagiosDocumentation" Guid="9B490E67-5472-4267-889C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-            <File Id="doc.usage.nagios" Name="Nagios Usage Guide.pdf" DiskId="1" Source="$(var.Source)/docs/Nagios Usage Guide.pdf" Vital="no" KeyPath="yes">
-              <Shortcut Id="Startmenu.doc.nagios" Directory="ProgramMenuDir" Name="Nagios Usage Guide" Advertise="yes" 
+          </Component>
+          <Component Id="RandomFiles" Guid="B4636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <File Id="Changelog" Name="changelog.txt" DiskId="1" Source="$(var.Source)/changelog" Vital="no" />
+            <File Id="Counters" Name="counters.defs" DiskId="1" Source="$(var.Source)/counters.defs" Vital="no" />
+            <File Id="License" Name="license.txt" DiskId="1" Source="$(var.Source)/license.txt" Vital="no" KeyPath="yes" />
+            <File Id="settingsMap" Name="old-settings.map" DiskId="1" Source="$(var.Source)/old-settings.map" Vital="no" />
+
+            <RemoveFile Id="LogFile1" Name="nsclient.log" On="uninstall" />
+            <RemoveFile Id="LogFile2" Name="nsc.log" On="uninstall" />
+            <RemoveFile Id="OldConfig" Name="nsc.old" On="uninstall" />
+            <RemoveFile Id="NewConfig" Name="nsc.new" On="uninstall" />
+          </Component>
+          <Component Id="NagiosDocumentation" Guid="9B490E67-5472-4267-889C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <File Id="doc.usage.nagios" Name="Nagios Usage Guide.pdf" DiskId="1" Source="$(var.Source)/docs/Nagios Usage Guide.pdf" Vital="no" KeyPath="yes">
+              <Shortcut Id="Startmenu.doc.nagios" Directory="ProgramMenuDir" Name="Nagios Usage Guide" Advertise="yes"
                     WorkingDirectory="INSTALLDIR" Description="Nagios Usage Guide"/>
-            </File>
-          </Component>
-          <Component Id="ReferenceDocumentation" Guid="8B490E67-5472-4267-889C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-            <File Id="doc.reference" Name="NSClient++ Reference Manual.pdf" DiskId="1" Source="$(var.Source)/docs/NSClient++ Reference Manual.pdf" Vital="no" KeyPath="yes">
-              <Shortcut Id="Startmenu.doc.ref" Directory="ProgramMenuDir" Name="NSClient++ Reference Manual" Advertise="yes" 
+            </File>
+          </Component>
+          <Component Id="ReferenceDocumentation" Guid="8B490E67-5472-4267-889C-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+            <File Id="doc.reference" Name="NSClient++ Reference Manual.pdf" DiskId="1" Source="$(var.Source)/docs/NSClient++ Reference Manual.pdf" Vital="no" KeyPath="yes">
+              <Shortcut Id="Startmenu.doc.ref" Directory="ProgramMenuDir" Name="NSClient++ Reference Manual" Advertise="yes"
                     WorkingDirectory="INSTALLDIR" Description="NSClient++ Reference Manual"/>
-            </File>
-          </Component>
-          <Directory Id="INSTALLLOCATION_SECURITY" Name="security">
-            <Component Id="NRPEServerCert" Guid="5A0246F8-5167-45db-2E46-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <File Id="NRPECert" Name="nrpe_dh_512.pem" DiskId="1" Source="$(var.Source)/security/nrpe_dh_512.pem" Vital="no"/>
-            </Component>
-          </Directory>
-          <Directory Id="INSTALLLOCATION_MODS" Name="modules">
-            <Component Id="NRPEServer" Guid="5A0246F8-5167-45db-B246-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <File Id="NRPEListenerDLL" Name="NRPEListener.dll" DiskId="1" Source="$(var.Source)/modules/NRPEServer.dll" Vital="no" />
-              <File Id="NRPEClientDLL" Name="NRPEClient.dll" DiskId="1" Source="$(var.Source)/modules/NRPEClient.dll" Vital="no" />
-            </Component>
-            <Component Id="NSCListener" Guid="6DAF8BB9-9A56-48f5-B2C5-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <File Id="NSCListenerDLL" Name="NSClientListener.dll" DiskId="1" Source="$(var.Source)/modules/NSClientServer.dll" Vital="no" />
-            </Component>
-            <Component Id="NSCA" Guid="8820A304-C596-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <File Id="NSCAAgentDLL" Name="NSCAAgent.dll" DiskId="1" Source="$(var.Source)/modules/NSCAAgent.dll" Vital="no" />
-              <File Id="SchedulerDLL" Name="Scheduler.dll" DiskId="1" Source="$(var.Source)/modules/Scheduler.dll" Vital="no" />
-            </Component>
-            <Component Id="Plugins" Guid="9B490E67-5472-4266-96DC-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <!-- NOT PORTED MODULES !
+            </File>
+          </Component>
+          <Directory Id="INSTALLLOCATION_SECURITY" Name="security">
+            <Component Id="NRPEServerCert" Guid="5A0246F8-5167-45db-2E46-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <File Id="NRPECert" Name="nrpe_dh_512.pem" DiskId="1" Source="$(var.Source)/security/nrpe_dh_512.pem" Vital="no"/>
+            </Component>
+          </Directory>
+          <Directory Id="INSTALLLOCATION_MODS" Name="modules">
+            <Component Id="NRPEServer" Guid="5A0246F8-5167-45db-B246-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <File Id="NRPEListenerDLL" Name="NRPEListener.dll" DiskId="1" Source="$(var.Source)/modules/NRPEServer.dll" Vital="no" />
+              <File Id="NRPEClientDLL" Name="NRPEClient.dll" DiskId="1" Source="$(var.Source)/modules/NRPEClient.dll" Vital="no" />
+            </Component>
+            <Component Id="NSCListener" Guid="6DAF8BB9-9A56-48f5-B2C5-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <File Id="NSCListenerDLL" Name="NSClientListener.dll" DiskId="1" Source="$(var.Source)/modules/NSClientServer.dll" Vital="no" />
+            </Component>
+            <Component Id="NSCA" Guid="8820A304-C596-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <File Id="NSCAAgentDLL" Name="NSCAAgent.dll" DiskId="1" Source="$(var.Source)/modules/NSCAAgent.dll" Vital="no" />
+              <File Id="SchedulerDLL" Name="Scheduler.dll" DiskId="1" Source="$(var.Source)/modules/Scheduler.dll" Vital="no" />
+            </Component>
+            <Component Id="PythonScript" Guid="8820A304-C696-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <File Id="PythonScript" Name="PythonScript.dll" DiskId="1" Source="$(var.Source)/modules/PythonScript.dll" Vital="no" />
+            </Component>
+            <Component Id="Plugins" Guid="9B490E67-5472-4266-96DC-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <!-- NOT PORTED MODULES !
                 <File Id="ModRemoteConfiguration.dll" Name="RmtCfg.dll" LongName="RemoteConfiguration.dll" DiskId="1" Source="$(var.Source)/modules/RemoteConfiguration.dll" Vital="no" />
                 <File Id="ModSysTray.dll" Name="SysTray.dll" LongName="SysTray.dll" DiskId="1" Source="$(var.Source)/modules/SysTray.dll" Vital="no" />
                 <File Id="A_DebugLogMetrics.dll" Name="ADebug.dll" LongName="A_DebugLogMetrics.dll" DiskId="1" Source="$(var.Source)/modules/A_DebugLogMetrics.dll" Vital="no" />
               -->
-              <File Id="ModCheckEventLog.dll" Name="CheckEventLog.dll" DiskId="1" Source="$(var.Source)/modules/CheckEventLog.dll" Vital="no" />
-              <File Id="ModCheckExternalScripts.dll" Name="CheckExternalScripts.dll" DiskId="1" Source="$(var.Source)/modules/CheckExternalScripts.dll" Vital="no" />
-              <File Id="ModCheckHelpers.dll" Name="CheckHelpers.dll" DiskId="1" Source="$(var.Source)/modules/CheckHelpers.dll" Vital="no" />
-              <File Id="ModCheckSystem.dll" Name="CheckSystem.dll" DiskId="1" Source="$(var.Source)/modules/CheckSystem.dll" Vital="no" />
-              <File Id="ModCheckWMI.dll" Name="CheckWMI.dll" DiskId="1" Source="$(var.Source)/modules/CheckWMI.dll" Vital="no" />
-              <File Id="ModFileLogger.dll" Name="FileLogger.dll" DiskId="1" Source="$(var.Source)/modules/FileLogger.dll" Vital="no" />
-              <File Id="ModLUAScript.dll" Name="LUAScript.dll" DiskId="1" Source="$(var.Source)/modules/LUAScript.dll" Vital="no" />
-              <File Id="ModCheckNSCP.dll" Name="CheckNSCP.dll" DiskId="1" Source="$(var.Source)/modules/CheckNSCP.dll" Vital="no" />
-              <File Id="ModCheckDisk.dll" Name="CheckDisk.dll" DiskId="1" Source="$(var.Source)/modules/CheckDisk.dll" Vital="no" />
-              <File Id="ModCheckTaskSched.dll" Name="CheckTaskSched.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched.dll" Vital="no" />
-              <File Id="ModCheckTaskSched2.dll" Name="CheckTaskSched2.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched2.dll" Vital="no" />
-            </Component>
-          </Directory>
-          <Directory Id="INSTALLLOCATION_SCRIPTS" Name="scripts">
-            <Component Id="Scripts" Guid="9B490E67-5472-4268-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-              <File Id="script001" Name="check_60s.bat" DiskId="1" Source="$(var.Source)/scripts/check_60s.bat" Vital="no" />
-              <File Id="script002" Name="check_battery.vbs" DiskId="1" Source="$(var.Source)/scripts/check_battery.vbs" Vital="no" />
-              <File Id="script003" Name="check_no_rdp.bat" DiskId="1" Source="$(var.Source)/scripts/check_no_rdp.bat" Vital="no" />
-              <File Id="script004" Name="check_printer.vbs" DiskId="1" Source="$(var.Source)/scripts/check_printer.vbs" Vital="no" />
-              <File Id="script005" Name="check_ok.bat" DiskId="1" Source="$(var.Source)/scripts/check_ok.bat" Vital="no" />
-              <File Id="script006" Name="check_files.vbs" DiskId="1" Source="$(var.Source)/scripts/check_files.vbs" Vital="no" />
-              <File Id="script007" Name="check_ping.bat" DiskId="1" Source="$(var.Source)/scripts/check_ping.bat" Vital="no" />
-              <File Id="script008" Name="check_updates.vbs" DiskId="1" Source="$(var.Source)/scripts/check_updates.vbs" Vital="no" />
-              <File Id="sample002" Name="check_test.ps1" DiskId="1" Source="$(var.Source)/scripts/check_test.ps1" Vital="no" />
-              <File Id="sample003" Name="check_test.vbs" DiskId="1" Source="$(var.Source)/scripts/check_test.vbs" Vital="no" />
-              <!--
+              <File Id="ModCheckEventLog.dll" Name="CheckEventLog.dll" DiskId="1" Source="$(var.Source)/modules/CheckEventLog.dll" Vital="no" />
+              <File Id="ModCheckExternalScripts.dll" Name="CheckExternalScripts.dll" DiskId="1" Source="$(var.Source)/modules/CheckExternalScripts.dll" Vital="no" />
+              <File Id="ModCheckHelpers.dll" Name="CheckHelpers.dll" DiskId="1" Source="$(var.Source)/modules/CheckHelpers.dll" Vital="no" />
+              <File Id="ModCheckSystem.dll" Name="CheckSystem.dll" DiskId="1" Source="$(var.Source)/modules/CheckSystem.dll" Vital="no" />
+              <File Id="ModCheckWMI.dll" Name="CheckWMI.dll" DiskId="1" Source="$(var.Source)/modules/CheckWMI.dll" Vital="no" />
+              <File Id="ModFileLogger.dll" Name="FileLogger.dll" DiskId="1" Source="$(var.Source)/modules/FileLogger.dll" Vital="no" />
+              <File Id="ModLUAScript.dll" Name="LUAScript.dll" DiskId="1" Source="$(var.Source)/modules/LUAScript.dll" Vital="no" />
+              <File Id="ModCheckNSCP.dll" Name="CheckNSCP.dll" DiskId="1" Source="$(var.Source)/modules/CheckNSCP.dll" Vital="no" />
+              <File Id="ModCheckDisk.dll" Name="CheckDisk.dll" DiskId="1" Source="$(var.Source)/modules/CheckDisk.dll" Vital="no" />
+              <File Id="ModCheckTaskSched.dll" Name="CheckTaskSched.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched.dll" Vital="no" />
+              <File Id="ModCheckTaskSched2.dll" Name="CheckTaskSched2.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched2.dll" Vital="no" />
+            </Component>
+          </Directory>
+          <Directory Id="INSTALLLOCATION_SCRIPTS" Name="scripts">
+            <Component Id="Scripts" Guid="9B490E67-5472-4268-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+              <File Id="script001" Name="check_60s.bat" DiskId="1" Source="$(var.Source)/scripts/check_60s.bat" Vital="no" />
+              <File Id="script002" Name="check_battery.vbs" DiskId="1" Source="$(var.Source)/scripts/check_battery.vbs" Vital="no" />
+              <File Id="script003" Name="check_no_rdp.bat" DiskId="1" Source="$(var.Source)/scripts/check_no_rdp.bat" Vital="no" />
+              <File Id="script004" Name="check_printer.vbs" DiskId="1" Source="$(var.Source)/scripts/check_printer.vbs" Vital="no" />
+              <File Id="script005" Name="check_ok.bat" DiskId="1" Source="$(var.Source)/scripts/check_ok.bat" Vital="no" />
+              <File Id="script006" Name="check_files.vbs" DiskId="1" Source="$(var.Source)/scripts/check_files.vbs" Vital="no" />
+              <File Id="script007" Name="check_ping.bat" DiskId="1" Source="$(var.Source)/scripts/check_ping.bat" Vital="no" />
+              <File Id="script008" Name="check_updates.vbs" DiskId="1" Source="$(var.Source)/scripts/check_updates.vbs" Vital="no" />
+              <File Id="sample002" Name="check_test.ps1" DiskId="1" Source="$(var.Source)/scripts/check_test.ps1" Vital="no" />
+              <File Id="sample003" Name="check_test.vbs" DiskId="1" Source="$(var.Source)/scripts/check_test.vbs" Vital="no" />
+              <!--
                 Scripts missing
               <File Id="lua001" Name="test.lua" LongName="test.lua" DiskId="1" Source="$(var.Source)/scripts/test.lua" Vital="no" />
               -->
-            </Component>
-            <Directory Id="INSTALLLOCATION_SCRIPTS_LIB" Name="lib">
-              <Component Id="ScriptLibs" Guid="9B490E67-5472-4267-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)">
-                <File Id="lib001" Name="NagiosPlugins.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/NagiosPlugins.vbs" Vital="no" />
-                <File Id="lib002" Name="wrapper.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/wrapper.vbs" Vital="no" />
-              </Component>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
+            </Component>
+            <Directory Id="INSTALLLOCATION_SCRIPTS_LIB" Name="lib">
+              <Component Id="ScriptLibs" Guid="9B490E67-5472-4267-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+                <File Id="lib001" Name="NagiosPlugins.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/NagiosPlugins.vbs" Vital="no" />
+                <File Id="lib002" Name="wrapper.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/wrapper.vbs" Vital="no" />
+              </Component>
+            </Directory>
+            <Directory Id="INSTALLLOCATION_SCRIPTS_PYTHON" Name="python">
+              <Component Id="PythonScripts" Guid="8820A304-C697-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)">
+                <File Id="P_script_001" Name="test.py" DiskId="1" Source="$(var.Source)/scripts/python/test.py" Vital="no" />
+                <File Id="P_script_002" Name="test_second.py" DiskId="1" Source="$(var.Source)/scripts/python/test_second.py" Vital="no" />
+              </Component>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
 
       <!-- ### Start Menu Items ### -->
@@ -197 +206 @@
           <ComponentRef Id="NSCListener" />
         </Feature>
-        <Feature Id="NSCAPlugin" Title="NSCA plugin" Description="Plugin to submit passive results to an NSCA server" Level="1" Absent="disallow">
-          <ComponentRef Id="NSCA" />
-        </Feature>
-        <Feature Id="SampleScripts" Title="Sample Scripts" Description="Some sample client-side scripts to use with NRPE" Level="1" Absent="disallow">
+        <Feature Id="NSCAPlugin" Title="NSCA plugin" Description="Plugin to submit passive results to an NSCA server" Level="1" Absent="disallow">
+          <ComponentRef Id="NSCA" />
+        </Feature>
+        <Feature Id="PythonScript" Title="Python Scripting" Description="Python scripting requires python to be installed)" Level="1" Absent="disallow">
+          <ComponentRef Id="PythonScript" />
+          <ComponentRef Id="PythonScripts" />
+        </Feature>
+        <Feature Id="SampleScripts" Title="Sample Scripts" Description="Some sample client-side scripts to use with NRPE" Level="1" Absent="disallow">
           <ComponentRef Id="Scripts" />
           <ComponentRef Id="ScriptLibs" />

helpers/settings_manager/CMakeLists.txt

@@ -37 +37 @@
   )
 ENDIF(WIN32)
+
+ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES})
+
 add_library (${TARGET} ${service_SRCS})
 

include/file_helpers.hpp

@@ -40 +40 @@
     }
     static std::wstring get_filename(boost::filesystem::wpath path) {
-      return path.leaf();
+      return path.filename();
     }
     static std::wstring get_path(std::wstring file) {
@@ -48 +48 @@
     static std::wstring get_filename(std::wstring file) {
       boost::filesystem::wpath path = file;
-      return path.leaf();
+      return path.filename();
     }
   };
@@ -59 +59 @@
       if (boost::filesystem::is_directory(path))
         return pattern_type(path, _T(""));
-      return pattern_type(path.branch_path(), path.leaf() /*filename()*/);
+      return pattern_type(path.branch_path(), path.filename());
     }
     static pattern_type split_path_ex(std::wstring path) {

include/nsca/nsca_packet.hpp

@@ -153 +153 @@
       data->crc32_value= swap_bytes::hton<u_int32_t>(0);
 
-      ZeroMemory(data->get_host_ptr(), host.size()+1);
+      memset(data->get_host_ptr(), 0, host.size()+1);
       host.copy(data->get_host_ptr(), host.size());
-      ZeroMemory(data->get_desc_ptr(nsca::length::host_length), service.size()+1);
+      memset(data->get_desc_ptr(nsca::length::host_length), 0, service.size()+1);
       service.copy(data->get_desc_ptr(nsca::length::host_length), service.size());
-      ZeroMemory(data->get_result_ptr(nsca::length::host_length, nsca::length::desc_length), result.size()+1);
+      memset(data->get_result_ptr(nsca::length::host_length, nsca::length::desc_length), 0, result.size()+1);
       result.copy(data->get_result_ptr(nsca::length::host_length, nsca::length::desc_length), result.size());
 

include/nscapi/functions.hpp

@@ -141 +141 @@
       boost::tokenizer<boost::escaped_list_separator<wchar_t>, std::wstring::const_iterator, std::wstring> tok(perf, boost::escaped_list_separator<wchar_t>(L'\\', L' ', L'\''));
       BOOST_FOREACH(std::wstring s, tok) {
+        if (s.size() == 0)
+          break;
         strEx::splitVector items = strEx::splitV(s, _T(";"));
-        if (items.size() < 3)
+        if (items.size() < 1) {
+          ::PluginCommand::PerformanceData* perfData = resp->add_perf();
+          perfData->set_type(PluginCommand::PerformanceData_Type_STRING);
+          std::pair<std::wstring,std::wstring> fitem = strEx::split(_T(""), _T("="));
+          perfData->set_alias("invalid");
+          ::PluginCommand::PerformanceData_StringValue* stringPerfData = perfData->mutable_string_value();
+          stringPerfData->set_value("invalid performance data");
           break;
+        }
 
         ::PluginCommand::PerformanceData* perfData = resp->add_perf();
@@ -158 +167 @@
           floatPerfData->set_unit(to_string(fitem.second.substr(pend)));
         }
-        floatPerfData->set_warning(trim_to_double(items[1]));
-        floatPerfData->set_critical(trim_to_double(items[2]));
+        if (items.size() > 2) {
+          floatPerfData->set_warning(trim_to_double(items[1]));
+          floatPerfData->set_critical(trim_to_double(items[2]));
+        }
         if (items.size() >= 5) {
           floatPerfData->set_minimum(trim_to_double(items[3]));
@@ -165 +176 @@
         }
       }
+//      std::wcout << _T("Converting performance data") << perf << _T(" -- ") << utf8::cvt<std::wstring>(build_performance_data(*resp)) << std::endl;
     }
     static std::string build_performance_data(::PluginCommand::Response const &payload) {

include/nscapi/nscapi_core_wrapper.cpp

@@ -184 +184 @@
   message.SerializeToString(&request);
 
+  return InjectCommand(command.c_str(), request, result);
+}
+
+NSCAPI::nagiosReturn nscapi::core_wrapper::InjectCommand(const std::wstring command, std::string request, std::string & result) 
+{
+  if (!fNSAPIInject)
+    throw nscapi::nscapi_exception(_T("NSCore has not been initiated..."));
   char *buffer = NULL;
   unsigned int buffer_size = 0;
-
   NSCAPI::nagiosReturn retC = InjectCommandRAW(command.c_str(), request.c_str(), request.size(), &buffer, &buffer_size);
 
@@ -209 +215 @@
   return retC;
 }
-
 /**
  * A wrapper around the InjetCommand that is simpler to use.

include/nscapi/nscapi_core_wrapper.hpp

@@ -134 +134 @@
     NSCAPI::nagiosReturn InjectCommandRAW(const wchar_t* command, const char *request, const unsigned int request_len, char **response, unsigned int *response_len);
     void DestroyBuffer(char**buffer);
+    NSCAPI::nagiosReturn InjectCommand(const std::wstring command, std::string request, std::string & result);
     NSCAPI::nagiosReturn InjectCommand(const std::wstring command, const std::list<std::wstring> argument, std::string & result);
     NSCAPI::nagiosReturn InjectSimpleCommand(const std::wstring command, const std::list<std::wstring> argument, std::wstring & message, std::wstring & perf);

include/parsers/helpers.cpp

@@ -1 +1 @@
 #include <parsers/helpers.hpp>
 
-#include <time.h>
+#include <boost/date_time.hpp>
 
 namespace parsers {
@@ -10 +10 @@
       return now;
     }
+    namespace pt = boost::posix_time;
+    namespace gt = boost::gregorian;
+    namespace dt = boost::date_time;
+
+    inline std::time_t to_time_t(pt::ptime t) { 
+      if( t == dt::neg_infin ) 
+        return 0; 
+      else if( t == dt::pos_infin ) 
+        return LONG_MAX; 
+      pt::ptime start(gt::date(1970,1,1)); 
+      return (t-start).total_seconds(); 
+    } 
+
+
+
     void constants::reset() {
-      __time64_t utctime;
-      _time64(&utctime);
-      now = utctime;
+      now = to_time_t(pt::second_clock::local_time());
+//      __time64_t utctime;
+//      _time64(&utctime);
+//      now = utctime;
 //      struct tm localtime;
 //      _localtime64_s(&localtime, &utctime);

include/parsers/where.cpp

@@ -1 @@
-#pragma once
-
 #include <list>
 #include <iostream> 

include/socket_helpers.hpp

@@ -126 +126 @@
     void read_with_timeout(AsyncReadStream& sock, RawSocket& rawSocket, const MutableBufferSequence& buffers, boost::posix_time::time_duration duration) {
       boost::optional<boost::system::error_code> timer_result;
-      boost::asio::deadline_timer timer(sock.io_service());
+      boost::asio::deadline_timer timer(sock.get_io_service());
       timer.expires_from_now(duration);
       timer.async_wait(boost::bind(set_result, &timer_result, _1));
@@ -133 +133 @@
       async_read(sock, buffers, boost::bind(set_result, &read_result, _1));
 
-      sock.io_service().reset();
-      while (sock.io_service().run_one()) {
+      sock.get_io_service().reset();
+      while (sock.get_io_service().run_one()) {
         if (read_result)
           timer.cancel();
@@ -148 +148 @@
     void write_with_timeout(AsyncWriteStream& sock, RawSocket& rawSocket, const MutableBufferSequence& buffers, boost::posix_time::time_duration duration) {
       boost::optional<boost::system::error_code> timer_result;
-      boost::asio::deadline_timer timer(sock.io_service());
+      boost::asio::deadline_timer timer(sock.get_io_service());
       timer.expires_from_now(duration);
       timer.async_wait(boost::bind(set_result, &timer_result, _1));
@@ -155 +155 @@
       async_write(sock, buffers, boost::bind(set_result, &read_result, _1));
 
-      sock.io_service().reset();
-      while (sock.io_service().run_one()) {
+      sock.get_io_service().reset();
+      while (sock.get_io_service().run_one()) {
         if (read_result)
           timer.cancel();

include/strEx.h

@@ -36 +36 @@
 #include <cctype>
 
+#ifdef __GNUC__
+#include <iconv.h>
+#include <errno.h>
+#endif
+
 #include <boost/lexical_cast.hpp>
 #include <boost/date_time.hpp>
@@ -817 +822 @@
   }
 }
-
+/*
+#ifdef __GNUC__
+size_t Wcslen(const wchar_t*w)
+{
+  size_t size=0;
+  while (*w++)
+    size++;
+  return size;
+}
+#endif
+#ifdef WIN32
+#define Wcslen wcslen
+#endif
+*/
 namespace utf8 {
   /** Converts a std::wstring into a std::string with UTF-8 encoding. */
@@ -853 +871 @@
     WideCharToMultiByte(CP_UTF8, 0, str.c_str(), static_cast<int>(str.length()), const_cast<char*>(buf.c_str()), nChars, NULL, NULL);
     return buf;
+#else
+    size_t wideSize = sizeof(wchar_t)*str.length();
+    size_t outbytesLeft = wideSize+sizeof(char); //We cannot know how many wide character there is yet
+
+    //Copy the instring
+    char *inString = (char*)new wchar_t[str.length()+1];
+    memcpy(inString, str.c_str(), wideSize+sizeof(wchar_t));
+
+    //Create buffer for output
+    char *outString = new char[outbytesLeft];
+    memset(outString, 0, sizeof(char)*(outbytesLeft));
+
+    char *inPointer = inString;
+    char *outPointer = outString;
+
+    iconv_t convDesc = iconv_open("UTF-8", "WCHAR_T");
+    iconv(convDesc, &inPointer, &wideSize, &outPointer, &outbytesLeft);
+    iconv_close(convDesc);
+
+    std::string retval(outString);
+
+    //Cleanup
+    delete[] inString;
+    delete[] outString;
+
+    return retval;
 #endif
   }
@@ -870 +914 @@
     MultiByteToWideChar(CP_UTF8, 0, str.c_str(), static_cast<int>(str.length()), const_cast<wchar_t*>(buf.c_str()), nChars);
     return buf;
+#else
+    size_t utf8Length = str.length();
+    size_t outbytesLeft = utf8Length*sizeof(wchar_t);
+
+    //Copy the instring
+    char *inString = new char[str.length()+1];
+    strcpy(inString, str.c_str());
+
+    //Create buffer for output
+    char *outString = (char*)new wchar_t[utf8Length+1];
+    memset(outString, 0, sizeof(wchar_t)*(utf8Length+1));
+
+    char *inPointer = inString;
+    char *outPointer = outString;
+
+    iconv_t convDesc = iconv_open("WCHAR_T", "UTF-8");
+    iconv(convDesc, &inPointer, &utf8Length, &outPointer, &outbytesLeft);
+    iconv_close(convDesc);
+
+    std::wstring retval( (wchar_t *)outString );
+
+    //Cleanup
+    delete[] inString;
+    delete[] outString;
+
+    return retval;
 #endif
   }

include/unicode_char.hpp

@@ -11 +11 @@
 #define _T(x) L ## x
 #endif
-
+#include <unicode/ustring.h>
 #endif
 
-#include <unicode/ustring.h>

libs/protobuf/log.proto.h

@@ -1 +1 @@
 #pragma once
 
-#include "D:/source/nscp/build/x64/libs/protobuf/log.pb.h"
+#include "/mnt/nscp/build/linux/libs/protobuf/log.pb.h"
 

modules/CheckNSCP/CheckNSCP.cpp

@@ -22 +22 @@
 
 #include <file_helpers.hpp>
+#include <unicode_char.hpp>
 
 #include <settings/client/settings_client.hpp>
@@ -85 +86 @@
 
 int CheckNSCP::get_crashes(std::wstring &last_crash) {
+#ifdef WIN32
   if (!file_helpers::checks::is_directory(crashFolder)) {
     return 0;
@@ -109 +111 @@
     last_crash = last_file;
   return count;
+#else
+  return 0;
+#endif
 }
 
@@ -125 +130 @@
   std::wstring last_crash;
   int crash_count = get_crashes(last_crash);
-  if (crash_count > 0)
-    strEx::append_list(msg, strEx::itos(crash_count) + _T(" crash(es), last crash: ") + last_crash, _T(", "));
+  if (crash_count > 0){
+    std::wstring tmp = strEx::itos(crash_count) + _T(" crash(es), last crash: ") + last_crash;
+    strEx::append_list(msg, tmp, _T(", "));
+  }
 
   std::wstring last_error;
   int err_count = get_errors(last_error);
-  if (err_count > 0)
-    strEx::append_list(msg, strEx::itos(err_count) + _T(" error(s), last error: ") + last_error, _T(", "));
+  if (err_count > 0) {
+    std::wstring tmp = strEx::itos(err_count) + _T(" error(s), last error: ") + last_error;
+    strEx::append_list(msg, tmp, _T(", "));
+  }
 
   if (msg.empty())

modules/LUAScript/LUAScript.cpp

@@ -46 +46 @@
   try {
 
+    root_ = get_core()->getBasePath();
+
     sh::settings_registry settings(get_settings_proxy());
     settings.set_alias(alias, _T("lua"));
@@ -52 +54 @@
       (_T("LUA SCRIPT SECTION"), _T("Section for the LUAScripts module."))
 
-      (_T("scripts"), sh::fun_values_path(boost::bind(&LUAScript::loadScript, this, _1)), 
+      (_T("scripts"), sh::fun_values_path(boost::bind(&LUAScript::loadScript, this, _1, _2)), 
       _T("LUA SCRIPTS SECTION"), _T("A list of scripts available to run from the LuaSCript module."))
       ;
@@ -62 +64 @@
 //      addAllScriptsFrom(scriptDirectory_);
 //    }
-    root_ = get_core()->getBasePath();
+
+
+
+
+    BOOST_FOREACH(script_container &script, scripts_) {
+      try {
+        boost::shared_ptr<script_wrapper::lua_script> instance = boost::shared_ptr<script_wrapper::lua_script>(new script_wrapper::lua_script(script));
+        instance->pre_load(this);
+        instances_.push_back(instance);
+      } catch (script_wrapper::LUAException e) {
+        NSC_LOG_ERROR_STD(_T("Could not load script ") + script.to_wstring() + _T(": ") + e.getMessage());
+      }
+    }
 
     //  } catch (nrpe::server::nrpe_exception &e) {
@@ -81 +95 @@
 
 void LUAScript::register_command(script_wrapper::lua_script* script, std::wstring command, std::wstring function) {
-  NSC_LOG_MESSAGE(_T("Script loading: ") + script->get_script() + _T(": ") + command);
+  NSC_LOG_MESSAGE(_T("Script loading: ") + script->get_wscript() + _T(": ") + command);
   commands_[command] = lua_func(script, function);
 }
 
-bool LUAScript::loadScript(const std::wstring file) {
+boost::optional<boost::filesystem::wpath> LUAScript::find_file(std::wstring file) {
+  std::list<boost::filesystem::wpath> checks;
+  checks.push_back(file);
+  checks.push_back(root_ / _T("scripts") / _T("lua") / file);
+  checks.push_back(root_ / _T("scripts") / file);
+  checks.push_back(root_ / _T("lua") / file);
+  checks.push_back(root_ / file);
+  BOOST_FOREACH(boost::filesystem::wpath c, checks) {
+    NSC_DEBUG_MSG_STD(_T("Looking for: ") + c.string());
+    if (boost::filesystem::exists(c))
+      return boost::optional<boost::filesystem::wpath>(c);
+  }
+  NSC_LOG_ERROR(_T("Script not found: ") + file);
+  return boost::optional<boost::filesystem::wpath>();
+}
+
+bool LUAScript::loadScript(std::wstring alias, std::wstring file) {
   try {
-    std::wstring file_ = file;
+    if (file.empty()) {
+      file = alias;
+      alias = _T("");
+    }
 
-    if (!file_helpers::checks::exists(file_)) {
-      file_ = root_ + file;
-      if (!file_helpers::checks::exists(file_)) {
-        NSC_LOG_ERROR(_T("Script not found: ") + file + _T(" (") + file_ + _T(")"));
-        return false;
-      }
-    }
-    NSC_DEBUG_MSG_STD(_T("Loading script: ") + file + _T(" (") + file_ + _T(")"));
-    script_wrapper::lua_script *script = new script_wrapper::lua_script(file_);
-    script->pre_load(this);
-    scripts_.push_back(script);
+    boost::optional<boost::filesystem::wpath> ofile = find_file(file);
+    if (!ofile)
+      return false;
+    script_container::push(scripts_, alias, *ofile);
+    NSC_DEBUG_MSG_STD(_T("Adding script: ") + ofile->string() + _T(" as ") + alias + _T(")"));
     return true;
-  } catch (script_wrapper::LUAException e) {
-    NSC_LOG_ERROR_STD(_T("Could not load script: ") + file + _T(", ") + e.getMessage());
   } catch (...) {
     NSC_LOG_ERROR_STD(_T("Could not load script: (Unknown exception) ") + file);
@@ -111 +136 @@
 
 bool LUAScript::unloadModule() {
-  for (script_list::const_iterator cit = scripts_.begin(); cit != scripts_.end() ; ++cit) {
-    delete (*cit);
-  }
-  scripts_.clear();
+  instances_.clear();
   return true;
 }
@@ -129 +151 @@
   bool error = false;
   commands_.clear();
-  for (script_list::const_iterator cit = scripts_.begin(); cit != scripts_.end() ; ++cit) {
+  for (script_list::const_iterator cit = instances_.begin(); cit != instances_.end() ; ++cit) {
     try {
       (*cit)->reload(this);
     } catch (script_wrapper::LUAException e) {
       error = true;
-      message += _T("Exception when reloading script: ") + (*cit)->get_script() + _T(": ") + e.getMessage();
-      NSC_LOG_ERROR_STD(_T("Exception when reloading script: ") + (*cit)->get_script() + _T(": ") + e.getMessage());
+      message += _T("Exception when reloading script: ") + (*cit)->get_wscript() + _T(": ") + e.getMessage();
+      NSC_LOG_ERROR_STD(_T("Exception when reloading script: ") + (*cit)->get_wscript() + _T(": ") + e.getMessage());
     } catch (...) {
       error = true;
-      message += _T("Unhandeled Exception when reloading script: ") + (*cit)->get_script();
-      NSC_LOG_ERROR_STD(_T("Unhandeled Exception when reloading script: ") + (*cit)->get_script());
+      message += _T("Unhandeled Exception when reloading script: ") + (*cit)->get_wscript();
+      NSC_LOG_ERROR_STD(_T("Unhandeled Exception when reloading script: ") + (*cit)->get_wscript());
     }
   }

modules/LUAScript/LUAScript.h

@@ -26 +26 @@
 #include "script_wrapper.hpp"
 
+#include <boost/optional.hpp>
+
+#include <scripts/functions.hpp>
+
+
 class LUAScript : public nscapi::impl::SimpleCommand, public script_wrapper::lua_handler, public nscapi::impl::simple_plugin {
 private:
@@ -41 +46 @@
   };
 
+  script_container::list_type scripts_;
+
   typedef std::map<std::wstring,lua_func> cmd_list;
-  typedef std::list<script_wrapper::lua_script*> script_list;
+  typedef std::list<boost::shared_ptr<script_wrapper::lua_script> > script_list;
 
   cmd_list commands_;
-  script_list scripts_;
-  std::wstring root_;
+  script_list instances_;
+  boost::filesystem::wpath root_;
 
 public:
@@ -71 +78 @@
   bool hasCommandHandler();
   bool hasMessageHandler();
-  bool loadScript(const std::wstring script);
+  boost::optional<boost::filesystem::wpath> find_file(std::wstring file);
+  bool loadScript(std::wstring alias, std::wstring file);
   NSCAPI::nagiosReturn handleCommand(const std::wstring command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf);
   //NSCAPI::nagiosReturn RunLUA(const unsigned int argLen, wchar_t **char_args, std::wstring &message, std::wstring &perf);

modules/LUAScript/script_wrapper.hpp

@@ -10 +10 @@
 #include "luna.h"
 
+#include <scripts/functions.hpp>
 
 namespace script_wrapper {
@@ -304 +305 @@
   class lua_script {
     Lua_State L;
-    std::wstring script_;
-  public:
-    lua_script(const std::wstring file) : script_(file) {
+    std::string script_;
+    std::string alias_;
+  public:
+    lua_script(const script_container &script) : script_(utf8::cvt<std::string>(script.script.string())), alias_(utf8::cvt<std::string>(script.alias)) {
       load();
     }
@@ -312 +314 @@
       luaL_openlibs(L);
       nsclient_wrapper::luaopen(L);
-      //Luna<Account>::Register(L);
-      //lua_register(L, "register_command", register_command);
-
-      if (luaL_loadfile(L, strEx::wstring_to_string(script_).c_str()) != 0) {
-        throw LUAException(_T("Failed to load script: ") + script_ + _T(": ") + s2w(lua_tostring(L, -1)));
-      }
-
-    }
-    std::wstring get_script() const {
+      if (luaL_loadfile(L, script_.c_str()) != 0) {
+        throw LUAException(_T("Failed to load script: ") + get_wscript() + _T(": ") + s2w(lua_tostring(L, -1)));
+      }
+
+    }
+    std::wstring get_wscript() const {
+      return utf8::cvt<std::wstring>(script_);
+    }
+    std::string get_script() const {
       return script_;
     }
@@ -333 +335 @@
       lua_manager::set_script(L, this);
       if (lua_pcall(L, 0, 0, 0) != 0) {
-        throw LUAException(_T("Failed to parse script: ") + script_ + _T(": ") + s2w(lua_tostring(L, -1)));
+        throw LUAException(_T("Failed to parse script: ") + get_wscript() + _T(": ") + s2w(lua_tostring(L, -1)));
       }
     }
@@ -368 +370 @@
       if (!lua_isfunction(L, -1)) {
         lua_pop(L, 1); // remove function from LUA stack
-        throw LUAException(_T("Failed to run script: ") + script_ + _T(": Function not found: handle"));
+        throw LUAException(_T("Failed to run script: ") + get_wscript() + _T(": Function not found: handle"));
       }
       lua_pushstring(L, w2s(cmd).c_str()); 
@@ -382 +384 @@
       if (lua_pcall(L, 2, LUA_MULTRET, 0) != 0) {
         std::wstring err = strEx::string_to_wstring(lua_tostring(L, -1));
-        NSC_LOG_ERROR_STD(_T("Failed to call main function in script: ") + script_ + _T(": ") + err);
+        NSC_LOG_ERROR_STD(_T("Failed to call main function in script: ") + get_wscript() + _T(": ") + err);
         lua_pop(L, 1); // remove error message
         return NSCAPI::returnUNKNOWN;

modules/NRPEClient/CMakeLists.txt

@@ -30 +30 @@
 
 add_library(${TARGET} MODULE ${SRCS})
+INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
 
 target_link_libraries(${TARGET}

modules/NRPEServer/CMakeLists.txt

@@ -44 +44 @@
 
 add_library(${TARGET} MODULE ${SRCS})
+INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
 
 target_link_libraries(${TARGET}

modules/NSCAAgent/CMakeLists.txt

@@ -38 +38 @@
 
 add_library(${TARGET} MODULE ${SRCS})
+INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
 
 target_link_libraries(${TARGET}

scripts/CMakeLists.txt

@@ -5 +5 @@
 FILE (GLOB scripts_PS1 "*.ps1")
 FILE (GLOB scripts_LIB "lib/*.vbs")
+FILE (GLOB scripts_PYT "python/*.py")
+FILE (GLOB scripts_LUA "lua/*.lua")
 
 SET(script_ALL ${scripts_BAT} ${scripts_VBS} ${scripts_PS1})
@@ -20 +22 @@
   copy_single_file("script lib" lib/${filename} scripts/lib)
 ENDFOREACH(file ${scripts_LIB})
+
+FOREACH(file ${scripts_PYT})
+  get_filename_component(filename ${file} NAME)
+  #MESSAGE(STATUS " + lib - ${filename}")
+  copy_single_file("script python" python/${filename} scripts/python)
+ENDFOREACH(file ${scripts_PYT})
+
+FOREACH(file ${scripts_LUA})
+  get_filename_component(filename ${file} NAME)
+  #MESSAGE(STATUS " + lib - ${filename}")
+  copy_single_file("script lua" lua/${filename} lua/python)
+ENDFOREACH(file ${scripts_LUA})

service/CMakeLists.txt

@@ -85 +85 @@
 ENDIF(BREAKPAD_FOUND)
 
+ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES})
+
 add_executable (${TARGET} ${service_SRCS})
 
-MESSAGE(STATUS "Extra: ${EXTRA_LIBS}")
+MESSAGE(STATUS "All libraries: ${Boost_FILESYSTEM_LIBRARY}, ${NSCP_DEF_PLUGIN_LIB}, ${EXTRA_LIBS}")
 
 target_link_libraries(${TARGET}

service/NSCPlugin.cpp

@@ -446 +446 @@
 
 bool NSCPlugin::is_duplicate( boost::filesystem::wpath file, std::wstring alias ) {
-  if (alias.empty())
+  if (alias.empty() && alias_.empty())
     return module_.get_file() == dll::dll::fix_module_name(file);
-  return module_.get_file() == dll::dll::fix_module_name(file) || alias == alias_;
-}
+  if (alias.empty() || alias_.empty())
+    return false;
+  return module_.get_file() == dll::dll::fix_module_name(file) && alias == alias_;
+}

service/NSClient++.cpp

@@ -390 +390 @@
 
   settings::string_list list = settings_manager::get_settings()->get_keys(MAIN_MODULES_SECTION);
-  BOOST_FOREACH(std::wstring key, list) {
-    std::wstring val = settings_manager::get_settings()->get_string(MAIN_MODULES_SECTION, key);
-    if ((key.length() > 4) && (key.substr(key.length()-4) == _T(".dll")) )
-      key = key.substr(0, key.length()-4);
-    if (val.empty() || val == _T("enabled")) {
-      ret.insert(plugin_alias_list_type::value_type(_T(""), key));
-    } else if (val == _T("disabled") && !active) {
-      ret.insert(plugin_alias_list_type::value_type(_T("disabled"), key));
-    } else if (val == _T("disabled")) {
-    } else {
-      ret.insert(plugin_alias_list_type::value_type(key, val));
-    }
+  BOOST_FOREACH(std::wstring plugin, list) {
+    std::wstring alias = settings_manager::get_settings()->get_string(MAIN_MODULES_SECTION, plugin);
+    if (plugin == _T("enabled")) {
+      plugin = alias;
+      alias = _T("");
+    } else if ((active && plugin == _T("disabled")) || (active && alias == _T("disabled")))
+      continue;
+    else if (plugin == _T("disabled")) {
+      plugin = alias;
+      alias = _T("");
+    } else if (alias == _T("disabled")) {
+      alias = _T("");
+    }
+    if (!alias.empty()) {
+      std::wstring tmp = plugin;
+      plugin = alias;
+      alias = tmp;
+    }
+    LOG_DEBUG_CORE_STD(_T("Found: ") + plugin + _T(" as ") + alias);
+    if (plugin.length() > 4 && plugin.substr(plugin.length()-4) == _T(".dll"))
+      plugin = plugin.substr(0, plugin.length()-4);
+    ret.insert(plugin_alias_list_type::value_type(alias, plugin));
   }
   if (!active) {
@@ -459 +469 @@
     BOOST_FOREACH(v, plugins) {
       try {
-        addPlugin(pluginPath / v.second, _T(""));
+        addPlugin(pluginPath / v.second, v.first);
       } catch (NSPluginException &e) {
         LOG_CRITICAL_CORE_STD(_T("Failed to register plugin: ") + e.what());
@@ -974 +984 @@
 NSClientT::plugin_type NSClientT::addPlugin(boost::filesystem::wpath file, std::wstring alias) {
   {
-    LOG_DEBUG_CORE_STD(_T("addPlugin(") + file.string() + _T(", ") + alias + _T(")"));
+    LOG_DEBUG_CORE_STD(_T("addPlugin(") + file.string() + _T(" as ") + alias + _T(")"));
     // Check if this is a duplicate plugin (if so return that instance)
     boost::unique_lock<boost::shared_mutex> writeLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(10));

service/settings_logger_impl.cpp

@@ -1 @@
-#pragma once
-
 #include "settings_logger_impl.hpp"
 #include "NSClient++.h"

service/simple_client.hpp

@@ -43 +43 @@
           break;
         } else if (s == _T("plugins")) {
-          log(_T("Listing plugins..."));
+          log(_T("Plugins: "));
           core_->listPlugins();
-        } else if (s == _T("list")) {
-          log(_T("Listing commands..."));
+        } else if (s == _T("list") || s == _T("commands")) {
+          log(_T("Commands:"));
           std::list<std::wstring> lst = core_->list_commands();
           for (std::list<std::wstring>::const_iterator cit = lst.begin(); cit!=lst.end();++cit)
-            std::wcout << *cit << _T(": ") << core_->describeCommand(*cit) << std::endl;
-          log(_T("Listing commands...Done"));
+            log(_T("| ") + *cit + _T(": ") + core_->describeCommand(*cit));
         } else if (s == _T("debug off")) {
           log(_T("Setting debug log off..."));

tools/error_reporter/CMakeLists.txt

@@ -3 +3 @@
 SET(TARGET reporter)
 
-PROJECT(reporter)
+IF(BREAKPAD_FOUND)
+  PROJECT(reporter)
 
-ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES})
+  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
-    
-# /breakpad//common
-# /breakpad//crash_report_sender
+  IF(WIN32)
+    SET(reporter_SRCS ${reporter_SRCS}
+      ${NSCP_INCLUDEDIR}/ServiceCmd.cpp
+      
+  # /breakpad//common
+  # /breakpad//crash_report_sender
 
-    reporter.h
-    StdAfx.h
+      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}
+  # ${NSCP_DEF_PLUGIN_LIB}
+    ${BREAKPAD_COMMON_LIBRARY}
+    ${BREAKPAD_CRASH_REPORT_SENDER_LIBRARY}
+    ${EXTRA_LIBS}
   )
-  SET(EXTRA_LIBS Wininet.lib)
-ENDIF(WIN32)
+  SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "tools")
 
-add_executable (${TARGET} ${reporter_SRCS})
-target_link_libraries(${TARGET}
-  ${Boost_FILESYSTEM_LIBRARY}
-  ${Boost_SYSTEM_LIBRARY}
-# ${NSCP_DEF_PLUGIN_LIB}
-  ${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})")
+  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)

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,77
-#define STRPRODUCTVER  "0,4,0,77"
-#define STRPRODUCTDATE "2011-07-06"
+#define PRODUCTVER     0,4,0,83
+#define STRPRODUCTVER  "0,4,0,83"
+#define STRPRODUCTDATE "2011-08-07"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=77
-date=2011-07-06
+build=83
+date=2011-08-07