Changeset 5735dda in nscp for modules/CheckExternalScripts

Timestamp:

06/13/10 22:02:07 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

f0607c4

Parents:

5cd6bcf (diff), f1d6990 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged back all (some?) of the new changes from 0.3.8

Location:

modules/CheckExternalScripts

Files:

• CheckExternalScripts.cpp (modified) (2 diffs)
• CheckExternalScripts.h (modified) (1 diff)
• CMakeLists.txt (added)
• CheckExternalScripts-2005.vcproj (deleted)
• CheckExternalScripts-2008.vcproj (deleted)
• CheckExternalScripts.def (modified) (1 diff)
• Jamfile (deleted)
• stdafx.h (modified) (1 diff)

modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -56 +56 @@
     }
   }
+}
+
+
+std::wstring CheckExternalScripts::getWrapping(std::wstring val) {
+  strEx::token tok = strEx::getToken(val, ' ', true);
+  std::wstring::size_type pos = tok.first.find_last_of(_T("."));
+  if (pos == std::wstring::npos)
+    return _T("");
+  return tok.first.substr(pos+1);
+}
+
+void CheckExternalScripts::addWrappedCommand(std::wstring key, std::wstring tpl, std::wstring command ) {
+  strEx::token tok = strEx::getToken(command, ' ', true);
+  strEx::replace(tpl, _T("%SCRIPT%"), tok.first);
+  strEx::replace(tpl, _T("%ARGS%"), tok.second);
+  tok = strEx::getToken(tpl, ' ', true);
+  addCommand(key.c_str(),tok.first, tok.second);
 }
 
@@ -99 +116 @@
   }
 
+  std::map<std::wstring,std::wstring> wrappers;
+  std::list<std::wstring> wrappings = GET_CORE()->getSettingsSection(setting_keys::external_scripts::WRAPPINGS_SECTION_PATH);
+  for (it = wrappings.begin(); it != wrappings.end(); ++it) {
+    std::wstring val = GET_CORE()->getSettingsString(setting_keys::external_scripts::WRAPPINGS_SECTION_PATH, *it, _T(""));
+    if (!(*it).empty() && !val.empty()) {
+      wrappers[(*it)] = val;
+    }
+  }
+  std::list<std::wstring> wscript = GET_CORE()->getSettingsSection(setting_keys::external_scripts::WRAPPED_SCRIPT_PATH);
+  for (it = wscript.begin(); it != wscript.end(); ++it) {
+    std::wstring val = GET_CORE()->getSettingsString(setting_keys::external_scripts::WRAPPED_SCRIPT_PATH, *it, _T(""));
+    if (!(*it).empty() && !val.empty()) {
+      std::wstring type = getWrapping(val);
+      std::map<std::wstring,std::wstring>::const_iterator cit = wrappers.find(type);
+      if (cit == wrappers.end()) {
+        NSC_LOG_ERROR_STD(_T("Failed to find wrappings for: ") + type + _T(" (" + (*it) + _T(")")));
+      } else {
+        addWrappedCommand((*it), (*cit).second, val);
+      }
+    }
+  }
+
   if (!scriptDirectory_.empty()) {
     addAllScriptsFrom(scriptDirectory_);

modules/CheckExternalScripts/CheckExternalScripts.h

@@ -96 +96 @@
     GET_CORE()->registerCommand(key, _T("Alias for: ") + cd.to_string());
   }
+  std::wstring getWrapping( std::wstring val );
+  void addWrappedCommand( std::wstring key, std::wstring tpl, std::wstring command );
 };
 

modules/CheckExternalScripts/CheckExternalScripts.def

@@ -11 +11 @@
   NSHandleCommand
   NSUnloadModule
-  NSGetConfigurationMeta
   NSGetModuleDescription
+  NSDeleteBuffer

modules/CheckExternalScripts/stdafx.h

@@ -21 +21 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN   // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-
 #include <string>
 #include <functional>
-
-#include <config.h>
 #include <utils.h>
 
+#include <boost/lexical_cast.hpp>
+
+#include <types.hpp>
 #include <NSCAPI.h>
-#include <NSCHelper.h>
+#include <nscapi/plugin.hpp>
 
 #ifdef MEMCHECK