[gnome-code-assistance] [backends/vala] Use vapi file for config
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-code-assistance] [backends/vala] Use vapi file for config
- Date: Wed, 5 Mar 2014 19:10:59 +0000 (UTC)
commit 6eb9730073442907e343f04737169fb05f9d9589
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Wed Mar 5 20:09:10 2014 +0100
[backends/vala] Use vapi file for config
This fixes a distcheck issue where due to a newly generated config.vala, all
vala files were going to be rebuild (instead of using pre-generated c files)
backends/vala/Makefile.am | 5 +++--
backends/vala/config.vala.in | 26 --------------------------
backends/vala/service.vala | 2 +-
configure.ac | 3 ++-
4 files changed, 6 insertions(+), 30 deletions(-)
---
diff --git a/backends/vala/Makefile.am b/backends/vala/Makefile.am
index 6215376..2fdb4fb 100644
--- a/backends/vala/Makefile.am
+++ b/backends/vala/Makefile.am
@@ -15,12 +15,13 @@ backends_vala_vala_SOURCES = \
backends/vala/document.vala \
backends/vala/service.vala \
backends/vala/makefileintegration.vala \
- backends/vala/config.vala
+ backends/vala/config.vapi
backends_vala_valahelper_SOURCES = \
backends/vala/valaoptionparser.vala \
backends/vala/diagnostics.vala \
- backends/vala/helper.vala
+ backends/vala/helper.vala \
+ backends/vala/libvalashared.vapi
backends_vala_common_valaflags = \
--target-glib=2.36 \
diff --git a/backends/vala/service.vala b/backends/vala/service.vala
index 7f7c2cc..61f86a0 100644
--- a/backends/vala/service.vala
+++ b/backends/vala/service.vala
@@ -65,7 +65,7 @@ public class Service
private async Rpc.Reply spawn_helper(Document[] documents, string wd, string[] flags)
{
SourceFunc cb = spawn_helper.callback;
- var argv = new string[] {Path.build_filename(Config.BackendExecDir, "valahelper")};
+ var argv = new string[] {Path.build_filename(Config.BACKENDEXECDIR, "valahelper")};
Pid pid;
int inp, outp;
diff --git a/configure.ac b/configure.ac
index fdaa5f8..4d2b7bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -574,6 +574,8 @@ fi
AC_SUBST(PYTHON_VERSION_MAJOR)
+AC_DEFINE_UNQUOTED([BACKENDEXECDIR], ["$backendexecdir"], [The backend exec dir])
+
AC_CONFIG_FILES([
Makefile
backends/c/org.gnome.CodeAssist.v1.c.service
@@ -586,7 +588,6 @@ backends/ruby/ruby
backends/xml/org.gnome.CodeAssist.v1.xml.service
backends/xml/xml
backends/vala/org.gnome.CodeAssist.v1.vala.service
-backends/vala/config.vala
backends/go/org.gnome.CodeAssist.v1.go.service
backends/js/org.gnome.CodeAssist.v1.js.service
backends/js/js
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]