[vala/wip/transform: 114/121] Do not load plugins from libdir. Issue a warning when using --plugindir
- From: Luca Bruno <lucabru src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/wip/transform: 114/121] Do not load plugins from libdir. Issue a warning when using --plugindir
- Date: Tue, 25 Mar 2014 21:01:50 +0000 (UTC)
commit 7e05e4e0e566b0da408f6551b6518acc47acc472
Author: Luca Bruno <lucabru src gnome org>
Date: Wed Feb 5 00:10:09 2014 +0100
Do not load plugins from libdir. Issue a warning when using --plugindir
configure.ac | 1 -
vala/Makefile.am | 1 -
vala/valacodecontext.vala | 6 ++++--
vapi/config.vapi | 1 -
4 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6c962e5..686b64b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,6 @@ AC_DEFINE_UNQUOTED(PACKAGE_SUFFIX, "$PACKAGE_SUFFIX", [Define to the suffix of t
program_transform_name="s,\$\$,${PACKAGE_SUFFIX},"
AC_SUBST(pkgdatadir, [${datadir}/vala${PACKAGE_SUFFIX}])
-AC_SUBST(pkglibdir, [${libdir}/vala${PACKAGE_SUFFIX}])
# Checks for programs.
AC_PROG_CC
diff --git a/vala/Makefile.am b/vala/Makefile.am
index a872483..0a48f8c 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
- -DPACKAGE_LIBDIR=\"$(pkglibdir)\" \
$(NULL)
BUILT_SOURCES = vala.vala.stamp
diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
index b656e8d..b2277bc 100644
--- a/vala/valacodecontext.vala
+++ b/vala/valacodecontext.vala
@@ -492,12 +492,14 @@ public class Vala.CodeContext {
}
if (plugin_directories != null) {
+ if (!experimental) {
+ Report.warning (null, "plugins are experimental and their API is unstable");
+ }
+
foreach (string dir in plugin_directories) {
load_plugins_in_directory (dir);
}
}
-
- load_plugins_in_directory (Config.PACKAGE_LIBDIR);
}
public void load_plugins_in_directory (string dirname) {
diff --git a/vapi/config.vapi b/vapi/config.vapi
index e4afb86..2c6df9e 100644
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -25,6 +25,5 @@ namespace Config {
[CCode (cheader_filename = "version.h")]
public const string BUILD_VERSION;
public const string PACKAGE_DATADIR;
- public const string PACKAGE_LIBDIR;
public const string PACKAGE_SUFFIX;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]