[gnome-builder] vala: use GLib.Environment to avoid collisions



commit 10cccef81655e31958aed28e1b8e0f9b7fe3f093
Author: Christian Hergert <chergert redhat com>
Date:   Sun Feb 14 20:34:29 2016 -0800

    vala: use GLib.Environment to avoid collisions

 plugins/vala-pack/Makefile.am         |    8 ++++++++
 plugins/vala-pack/ide-vala-index.vala |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/plugins/vala-pack/Makefile.am b/plugins/vala-pack/Makefile.am
index 6457edb..5f17f1d 100644
--- a/plugins/vala-pack/Makefile.am
+++ b/plugins/vala-pack/Makefile.am
@@ -27,6 +27,7 @@ libvala_pack_plugin_la_VALAFLAGS = \
        --target-glib=2.44 \
        --thread \
        --vapidir $(top_builddir)/libide \
+       --vapidir $(top_builddir)/contrib/egg \
        --vapidir $(top_builddir)/contrib/tmpl \
        --pkg gtksourceview-3.0 \
        --pkg libide-1.0 \
@@ -44,6 +45,13 @@ libvala_pack_plugin_la_CFLAGS = \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/contrib/tmpl \
+       -Wno-deprecated-declarations \
+       -Wno-discarded-qualifiers \
+       -Wno-implicit-function-declaration \
+       -Wno-incompatible-pointer-types \
+       -Wno-unused-but-set-variable \
+       -Wno-unused-label \
+       -Wno-unused-function \
        $(NULL)
 
 libvala_pack_plugin_la_LDFLAGS = \
diff --git a/plugins/vala-pack/ide-vala-index.vala b/plugins/vala-pack/ide-vala-index.vala
index 2640b56..d50de2c 100644
--- a/plugins/vala-pack/ide-vala-index.vala
+++ b/plugins/vala-pack/ide-vala-index.vala
@@ -65,8 +65,8 @@ namespace Ide
                        this.code_context.compile_only = true;
                        this.code_context.use_header = false;
                        this.code_context.includedir = null;
-                       this.code_context.basedir = Environment.get_current_dir ();
-                       this.code_context.directory = Environment.get_current_dir ();
+                       this.code_context.basedir = GLib.Environment.get_current_dir ();
+                       this.code_context.directory = GLib.Environment.get_current_dir ();
                        this.code_context.debug = false;
                        this.code_context.thread = true;
                        this.code_context.mem_profiler = false;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]