comparison checker/plugincandidates.h @ 45:ad02dff8ebfb

Merge from branch errorcode

 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 /*
-    Copyright (c) 2016 Queen Mary, University of London
+    Copyright (c) 2016-2018 Queen Mary, University of London
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
     files (the "Software"), to deal in the Software without
     restriction, including without limitation the rights to use, copy,

 #define PLUGIN_CANDIDATES_H
 
 #include <string>
 #include <vector>
 #include <map>
+
+#include "checkcode.h"
 
 /**
  * Class to identify and list candidate shared-library files possibly
  * containing plugins. Uses a separate process (the "helper", whose
  * executable name must be provided at construction) to test-load each

 
     /** Return list of plugin library paths that were checked
      *  successfully during the scan for the given tag.
      */
     stringlist getCandidateLibrariesFor(std::string tag) const;
+    
+    struct FailureRec {
 
-    struct FailureRec {
+        /// Path of failed library file
         std::string library;
+
+        /// General class of failure
+        PluginCheckCode code;
+
+        /// Optional additional system-level message, already translated
         std::string message;
     };
 
     /** Return list of failure reports arising from the prior scan for
      *  the given tag. 

     std::map<std::string, stringlist> m_candidates;
     std::map<std::string, std::vector<FailureRec> > m_failures;
     LogCallback *m_logCallback;
 
     stringlist getLibrariesInPath(stringlist path);
+    std::string getHelperCompatibilityVersion();
     stringlist runHelper(stringlist libraries, std::string descriptor);
     void recordResult(std::string tag, stringlist results);
     void log(std::string);
 };