diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugin.c | 45 | ||||
-rw-r--r-- | src/plugin.h | 5 |
2 files changed, 20 insertions, 30 deletions
diff --git a/src/plugin.c b/src/plugin.c index e33a5a7..3b2e54f 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -973,9 +973,8 @@ update_path (AnjutaPluginSdk *sp) char **pathv = NULL; int i = 0; gchar *poky_scripts_dir = NULL; - gchar *poky_host_staging_bin_dir = NULL; - gchar *poky_host_staging_usr_bin_dir = NULL; - gchar *poky_cross_dir = NULL; + gchar *poky_host_sysroots_bin_dir = NULL; + gchar *poky_host_sysroots_usr_bin_dir = NULL; gchar *host_component = NULL; /* Create new versions of path bits */ @@ -988,12 +987,10 @@ update_path (AnjutaPluginSdk *sp) { host_component = get_host_component (); poky_scripts_dir = g_build_filename (sp->poky_root, "scripts", NULL); - poky_host_staging_usr_bin_dir = g_build_filename (sp->poky_root, "build", "tmp", - "staging", host_component, "usr", "bin", NULL); - poky_host_staging_bin_dir = g_build_filename (sp->poky_root, "build", "tmp", - "staging", host_component, "bin", NULL); - poky_cross_dir = g_build_filename (sp->poky_root, "build", "tmp", - "cross", "bin", NULL); + poky_host_sysroots_usr_bin_dir = g_build_filename (sp->poky_root, "build", "tmp", + "sysroots", host_component, "usr", "bin", NULL); + poky_host_sysroots_bin_dir = g_build_filename (sp->poky_root, "build", "tmp", + "sysroots", host_component, "bin", NULL); g_free (host_component); } } @@ -1017,11 +1014,10 @@ update_path (AnjutaPluginSdk *sp) if ((sp->path_component && g_str_equal (tmp, sp->path_component)) || (sp->poky_scripts_dir && g_str_equal (tmp, sp->poky_scripts_dir)) || - (sp->poky_host_staging_bin_dir - && g_str_equal (tmp, sp->poky_host_staging_bin_dir)) || - (sp->poky_host_staging_usr_bin_dir - && g_str_equal (tmp, sp->poky_host_staging_usr_bin_dir)) || - (sp->poky_cross_dir && g_str_equal (tmp, sp->poky_cross_dir))) + (sp->poky_host_sysroots_bin_dir + && g_str_equal (tmp, sp->poky_host_sysroots_bin_dir)) || + (sp->poky_host_sysroots_usr_bin_dir + && g_str_equal (tmp, sp->poky_host_sysroots_usr_bin_dir))) { path_array = g_array_remove_index (path_array, i); i--; /* because we've deleted something */ @@ -1037,14 +1033,11 @@ update_path (AnjutaPluginSdk *sp) if (poky_scripts_dir) path_array = g_array_prepend_val (path_array, poky_scripts_dir); - if (poky_cross_dir) - path_array = g_array_prepend_val (path_array, poky_cross_dir); + if (poky_host_sysroots_bin_dir) + path_array = g_array_prepend_val (path_array, poky_host_sysroots_bin_dir); - if (poky_host_staging_bin_dir) - path_array = g_array_prepend_val (path_array, poky_host_staging_bin_dir); - - if (poky_host_staging_usr_bin_dir) - path_array = g_array_prepend_val (path_array, poky_host_staging_usr_bin_dir); + if (poky_host_sysroots_usr_bin_dir) + path_array = g_array_prepend_val (path_array, poky_host_sysroots_usr_bin_dir); } /* Create our new path */ @@ -1054,15 +1047,13 @@ update_path (AnjutaPluginSdk *sp) /* Save the components */ g_free (sp->path_component); g_free (sp->poky_scripts_dir); - g_free (sp->poky_cross_dir); - g_free (sp->poky_host_staging_bin_dir); - g_free (sp->poky_host_staging_usr_bin_dir); + g_free (sp->poky_host_sysroots_bin_dir); + g_free (sp->poky_host_sysroots_usr_bin_dir); sp->path_component = new_path_component; sp->poky_scripts_dir = poky_scripts_dir; - sp->poky_cross_dir = poky_cross_dir; - sp->poky_host_staging_bin_dir = poky_host_staging_bin_dir; - sp->poky_host_staging_usr_bin_dir = poky_host_staging_usr_bin_dir; + sp->poky_host_sysroots_bin_dir = poky_host_sysroots_bin_dir; + sp->poky_host_sysroots_usr_bin_dir = poky_host_sysroots_usr_bin_dir; g_array_free (path_array, TRUE); g_strfreev (pathv); diff --git a/src/plugin.h b/src/plugin.h index 1d1f348..b0a7a25 100644 --- a/src/plugin.h +++ b/src/plugin.h @@ -81,9 +81,8 @@ struct _AnjutaPluginSdk gchar *path_component; gchar *poky_scripts_dir; - gchar *poky_host_staging_usr_bin_dir; - gchar *poky_host_staging_bin_dir; - gchar *poky_cross_dir; + gchar *poky_host_sysroots_usr_bin_dir; + gchar *poky_host_sysroots_bin_dir; gint uiid; |