[valadoc] libvaladoc: Improve plugin selection (#676453)
- From: Florian Brosch <flobrosch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [valadoc] libvaladoc: Improve plugin selection (#676453)
- Date: Mon, 6 Aug 2012 21:20:29 +0000 (UTC)
commit 482fb8025a05eb3763648c9e20c42eef1a9e787b
Author: Florian Brosch <flo brosch gmail com>
Date: Sat Jul 21 19:39:00 2012 +0200
libvaladoc: Improve plugin selection (#676453)
src/libvaladoc/moduleloader.vala | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/libvaladoc/moduleloader.vala b/src/libvaladoc/moduleloader.vala
index 9ac5d7b..a4e8697 100644
--- a/src/libvaladoc/moduleloader.vala
+++ b/src/libvaladoc/moduleloader.vala
@@ -75,12 +75,17 @@ public class Valadoc.ModuleLoader : Object {
return FileUtils.test (path, FileTest.EXISTS) && FileUtils.test (library_path, FileTest.EXISTS);
}
+ public static bool is_doclet (string path) {
+ string library_path = Path.build_filename (path, "libdoclet." + Module.SUFFIX);
+ return FileUtils.test (path, FileTest.EXISTS) && FileUtils.test (library_path, FileTest.EXISTS);
+ }
+
private static string get_plugin_path (string pluginpath, string pluginsubdir) {
if (Path.is_absolute (pluginpath) == false) {
// Test to see if the plugin exists in the expanded path and then fallback
// to using the configured plugin directory
string local_path = Path.build_filename (Environment.get_current_dir(), pluginpath);
- if (FileUtils.test(local_path, FileTest.EXISTS)) {
+ if (is_doclet(local_path)) {
return local_path;
} else {
return Path.build_filename (Config.plugin_dir, pluginsubdir, pluginpath);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]