diff options
| -rw-r--r-- | plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/wizards/bsp/PropertiesPage.java | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/wizards/bsp/PropertiesPage.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/wizards/bsp/PropertiesPage.java index b6b6e6e..14de18c 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/wizards/bsp/PropertiesPage.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/wizards/bsp/PropertiesPage.java @@ -196,8 +196,8 @@ public class PropertiesPage extends WizardPage { new Label (choiceContainer, SWT.NONE).setText(name+":"); Combo combo = new Combo(choiceContainer, SWT.BORDER | SWT.READ_ONLY); combo.setLayout(new FillLayout()); - - updateKernelValues(KERNEL_CHOICES, name); + combo.setItems(getBSPComboProperties(name)); + //updateKernelValues(KERNEL_CHOICES, name); propertyControlMap.put(propElem, (Control)combo); } @@ -431,6 +431,47 @@ public class PropertiesPage extends WizardPage { } else if (action.getMessage() != null) MessageDialog.openError(getShell(), "Yocto-BSP", action.getMessage()); } + + private String[] getBSPComboProperties(String property) { + String build_dir = ""; + ArrayList<String> values = new ArrayList<String>(); + if ((bspElem.getBuildLoc() == null) || bspElem.getBuildLoc().isEmpty()) + build_dir = bspElem.getMetadataLoc()+"/build"; + else + build_dir = bspElem.getBuildLoc(); + + String valuesCmd = "export BUILDDIR=" + build_dir + ";" + bspElem.getMetadataLoc() + "/scripts/" + VALUES_CMD_PREFIX + bspElem.getKarch() + VALUES_CMD_SURFIX + property; + try { + ProcessBuilder builder = new ProcessBuilder(new String[] {"sh", "-c", valuesCmd}); + builder.redirectErrorStream(true); + Process process = builder.start(); + BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); + String line = null; + String error_message = ""; + while ( (line = br.readLine()) != null) { + if (!line.startsWith("[")) { + error_message += line + "\n"; + continue; + } + String[] items = line.split(","); + + String value = items[0]; + value = value.replace("[\"", ""); + value = value.replaceAll("\"$", ""); + values.add(value); + } + int exitVal = process.waitFor(); + if (exitVal != 0) { + MessageDialog.openError(getShell(), "Yocto-BSP", error_message); + return new String[]{}; + } else + return values.toArray(new String[values.size()]); + } catch (Exception e) { + MessageDialog.openError(getShell(), "Yocto-BSP",e.getMessage()); + return new String[] {}; + } + + } class ValuesGetter implements Runnable { private String property; |