[gnome-builder] makecache: fix vala flags extraction for Builder templates
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] makecache: fix vala flags extraction for Builder templates
- Date: Thu, 28 Apr 2016 08:31:17 +0000 (UTC)
commit eb5dccb9c65e2a6a5ff062b2ec82f4558e8cc77c
Author: Christian Hergert <christian hergert me>
Date: Thu Apr 28 01:08:11 2016 -0700
makecache: fix vala flags extraction for Builder templates
I can't figure out if I was always wrong about this, or if I really did
see other options. Either way, we need to ship something that works with
our templates for now and figure out the details later.
plugins/autotools/ide-makecache.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/plugins/autotools/ide-makecache.c b/plugins/autotools/ide-makecache.c
index 1eb25a6..032646c 100644
--- a/plugins/autotools/ide-makecache.c
+++ b/plugins/autotools/ide-makecache.c
@@ -1216,18 +1216,17 @@ ide_makecache_get_file_targets_worker (GTask *task,
/*
* Follow the automake vala renaming rules the best I can decipher.
- * Which seems to be that libraries get libfoo_la.stamp (ignoring
- * the filename portion) but programs get program_foo.stamp.
+ * I mostly see _vala.stamp, but I have seen others. However, we
+ * need to ship this product and our templates are generating
+ * _vala.stamp with libraries, so at least make that work out of
+ * the box.
*/
if (NULL != (endptr = strchr (name, '-')))
{
GString *str = g_string_new (NULL);
g_string_append_len (str, name, endptr - name);
- if (g_str_has_prefix (name, "lib"))
- g_string_append (str, ".stamp");
- else
- g_string_append (str, "_vala.stamp");
+ g_string_append (str, "_vala.stamp");
ide_makecache_target_set_target (target, str->str);
g_string_free (str, TRUE);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]