[gnome-builder] autotools: fix program discover for some GJS templates

[Christian Hergert <chergert src gnome org>]

commit 3abfecab652efd2a8240f56f9332bab174b904ee
Author: Christian Hergert <chergert redhat com>
Date:   Sun Oct 9 14:13:42 2016 -0700

    autotools: fix program discover for some GJS templates
    
    The GJS templates that do nodist_app_SCRIPTS were not getting
    discovered do to the levels of abstraction being employed. This
    works around the issue by discovering where the program is
    installed to $appdir. While this isn't an autotools'ism, it is
    at least a GNOME'ism for now, so we should support it.

 plugins/autotools/ide-makecache.c |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/plugins/autotools/ide-makecache.c b/plugins/autotools/ide-makecache.c
index c4ecb82..b225f76 100644
--- a/plugins/autotools/ide-makecache.c
+++ b/plugins/autotools/ide-makecache.c
@@ -1831,9 +1831,18 @@ static GFile *
 find_install_dir (const gchar *key,
                   GHashTable  *dirs)
 {
-  g_auto(GStrv) parts = g_strsplit (key, "_", 2);
-  g_autofree gchar *lookup = g_strdup_printf ("%sdir", parts[0]);
-  const gchar *path = g_hash_table_lookup (dirs, lookup);
+  g_auto(GStrv) parts = NULL;
+  g_autofree gchar *lookup = NULL;
+  const gchar *dirkey = NULL;
+  const gchar *path = NULL;
+
+  if (g_str_has_prefix (key, "nodist_"))
+    key += IDE_LITERAL_LENGTH ("nodist_");
+
+  parts = g_strsplit (key, "_", 2);
+  dirkey = parts[0];
+  lookup = g_strdup_printf ("%sdir", dirkey);
+  path = g_hash_table_lookup (dirs, lookup);
 
   if (path != NULL)
     return g_file_new_for_path (path);
@@ -1914,11 +1923,25 @@ ide_makecache_get_build_targets_worker (GTask        *task,
   ide_subprocess_launcher_push_argv (launcher, "-f");
   ide_subprocess_launcher_push_argv (launcher, "-");
   ide_subprocess_launcher_push_argv (launcher, "print-bindir");
-  ide_subprocess_launcher_push_argv (launcher, "print-libexecdir");
   ide_subprocess_launcher_push_argv (launcher, "print-bin_PROGRAMS");
-  ide_subprocess_launcher_push_argv (launcher, "print-noinst_PROGRAMS");
-  ide_subprocess_launcher_push_argv (launcher, "print-libexec_PROGRAMS");
   ide_subprocess_launcher_push_argv (launcher, "print-bin_SCRIPTS");
+  ide_subprocess_launcher_push_argv (launcher, "print-nodist_bin_SCRIPTS");
+
+  /*
+   * app_SCRIPTS is a GNOME'ism used by some GJS templates. We support it here
+   * mostly because figuring out the other crack (like $(LN_S) gapplication
+   * launch rules borders on insanity.
+   */
+  ide_subprocess_launcher_push_argv (launcher, "print-appdir");
+  ide_subprocess_launcher_push_argv (launcher, "print-app_SCRIPTS");
+  ide_subprocess_launcher_push_argv (launcher, "print-nodist_app_SCRIPTS");
+
+  /*
+   * Do these last so that other discoveries have higher priority.
+   */
+  ide_subprocess_launcher_push_argv (launcher, "print-libexecdir");
+  ide_subprocess_launcher_push_argv (launcher, "print-libexec_PROGRAMS");
+  ide_subprocess_launcher_push_argv (launcher, "print-noinst_PROGRAMS");
 
   /*
    * We need to extract the common automake targets from each of the