Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2018-02-20 00:51:49 +0000
committerJeff Johnston2018-02-20 01:37:43 +0000
commitdcfc27606278789b788c680e8678f0c577267c8e (patch)
treeea541e1c27f2c6ddafdd747047480eb15cab314c /build/org.eclipse.cdt.meson.ui
parent70151ce491ebf3ce6e6a33edf7a5cc130ad4c676 (diff)
downloadorg.eclipse.cdt-dcfc27606278789b788c680e8678f0c577267c8e.tar.gz
org.eclipse.cdt-dcfc27606278789b788c680e8678f0c577267c8e.tar.xz
org.eclipse.cdt-dcfc27606278789b788c680e8678f0c577267c8e.zip
Bug 530000 - Add Meson Build support
- use sh -c to invoke meson and ninja commands so that the default environment including PATH is set up - don't bother trying to find the commands locally and don't bother trying to find local environment (only use env options from property page or run ninja command) - add a check after running meson to ensure that ninja.build file gets created, otherwise issue error message and stop build - fix comments for RunNinjaPage - add future Container support by allowing a special target OS when checking for isLocal build Change-Id: Ie8d736c0909b44fe8db14265afbc8b05262b51f3
Diffstat (limited to 'build/org.eclipse.cdt.meson.ui')
-rw-r--r--build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/wizards/RunNinjaPage.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/wizards/RunNinjaPage.java b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/wizards/RunNinjaPage.java
index 466bbc7c2bf..d59ee157bdc 100644
--- a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/wizards/RunNinjaPage.java
+++ b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/wizards/RunNinjaPage.java
@@ -22,21 +22,13 @@ import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
/**
- * A standard file selection dialog which solicits a list of files from the user.
- * The <code>getResult</code> method returns the selected files.
+ * A Wizard dialog page to allow a user to specify environment variables
+ * and options for a ninja command to be run against the active
+ * build configuration for the project.
* <p>
* This class may be instantiated; it is not intended to be subclassed.
* </p>
- * <p>
- * Example:
- * <pre>
- * FileSelectionDialog dialog =
- * new FileSelectionDialog(getShell(), rootElement, msg);
- * dialog.setInitialSelections(selectedResources);
- * dialog.open();
- * return dialog.getResult();
- * </pre>
- * </p>
+ *
* @noextend This class is not intended to be subclassed by clients.
*/
public class RunNinjaPage extends WizardPage {
@@ -91,10 +83,18 @@ public class RunNinjaPage extends WizardPage {
setControl(composite);
}
+ /**
+ * Return the user-specified environment variables (NAME=VALUE pairs)
+ * @return the environment String
+ */
public String getEnvStr() {
return envText.getText();
}
+ /**
+ * Return the user-specified ninja arguments
+ * @return the ninja arg String
+ */
public String getNinjaArgs() {
return ninjaArgs.getText();
}

Back to the top