mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +02:00
Code Issues Wiki Activity

added description control on Build Variables page

Browse source 
Change-Id: Ib2f6b30bedb88e6ab2c886306171a5668ac1a415
This commit is contained in:
Alena Laskavaia 2016-01-27 10:22:27 -05:00 • committed by Gerrit Code Review @ Eclipse.org
parent e7ef5fb9ac
commit f57e0c8acf
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/IMakeCommonBuildInfo.java
View file

@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IPath;
*/ */
public interface IMakeCommonBuildInfo { public interface IMakeCommonBuildInfo {
public final static String ARGS_PREFIX = "org.eclipse.cdt.make.core"; //$NON-NLS-1$ public final static String ARGS_PREFIX = "org.eclipse.cdt.make.core"; //$NON-NLS-1$
public final static String BUILD_LOCATION = ARGS_PREFIX + ".build.location"; //$NON-NLS-1$ public final static String BUILD_LOCATION = ARGS_PREFIX + ".build.location"; //$NON-NLS-1$
public final static String BUILD_COMMAND = ARGS_PREFIX + ".build.command"; //$NON-NLS-1$ public final static String BUILD_COMMAND = ARGS_PREFIX + ".build.command"; //$NON-NLS-1$
public final static String BUILD_ARGUMENTS = ARGS_PREFIX + ".build.arguments"; //$NON-NLS-1$ public final static String BUILD_ARGUMENTS = ARGS_PREFIX + ".build.arguments"; //$NON-NLS-1$
@ -34,11 +34,11 @@ public interface IMakeCommonBuildInfo {
IPath getBuildLocation(); IPath getBuildLocation();
/** /**
* @deprecated - use setBuildString(BUILD_LOCATION...) * @deprecated - use {@link #setBuildAttribute(BUILD_LOCATION, String)}
*/ */
@Deprecated @Deprecated
void setBuildLocation(IPath location) throws CoreException; void setBuildLocation(IPath location) throws CoreException;
boolean isStopOnError(); boolean isStopOnError();
void setStopOnError(boolean on) throws CoreException; void setStopOnError(boolean on) throws CoreException;
boolean supportsStopOnError(boolean on); boolean supportsStopOnError(boolean on);
@ -52,7 +52,7 @@ public interface IMakeCommonBuildInfo {
* Sets maximum number of parallel threads/jobs to be used by builder. * Sets maximum number of parallel threads/jobs to be used by builder.
* Note that this number can be interpreted by builder in a special way. * Note that this number can be interpreted by builder in a special way.
* @see Builder#setParallelizationNum(int) * @see Builder#setParallelizationNum(int)
* *
* @param jobs - maximum number of jobs. * @param jobs - maximum number of jobs.
*/ */
void setParallelizationNum(int jobs) throws CoreException; void setParallelizationNum(int jobs) throws CoreException;
@ -73,14 +73,14 @@ public interface IMakeCommonBuildInfo {
/** /**
* Set parallel execution mode for the builder. * Set parallel execution mode for the builder.
* @see Builder#setParallelBuildOn(boolean) * @see Builder#setParallelBuildOn(boolean)
* *
* @param on - the flag to enable or disable parallel mode. * @param on - the flag to enable or disable parallel mode.
*/ */
void setParallelBuildOn(boolean on) throws CoreException; void setParallelBuildOn(boolean on) throws CoreException;
boolean isDefaultBuildCmd(); boolean isDefaultBuildCmd();
void setUseDefaultBuildCmd(boolean on) throws CoreException; void setUseDefaultBuildCmd(boolean on) throws CoreException;
IPath getBuildCommand(); IPath getBuildCommand();
/** /**
@ -104,10 +104,10 @@ public interface IMakeCommonBuildInfo {
Map<String, String> getEnvironment(); Map<String, String> getEnvironment();
void setEnvironment(Map<String, String> env) throws CoreException; void setEnvironment(Map<String, String> env) throws CoreException;
boolean appendEnvironment(); boolean appendEnvironment();
void setAppendEnvironment(boolean append) throws CoreException; void setAppendEnvironment(boolean append) throws CoreException;
boolean isManagedBuildOn(); boolean isManagedBuildOn();
void setManagedBuildOn(boolean on) throws CoreException; void setManagedBuildOn(boolean on) throws CoreException;
boolean supportsBuild(boolean managed); boolean supportsBuild(boolean managed);

1
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
View file

@ -77,6 +77,7 @@ public class Messages extends NLS {
public static String CMainWizardPage_1; public static String CMainWizardPage_1;
public static String CNewWizard_0; public static String CNewWizard_0;
public static String CPropertyVarsTab_0; public static String CPropertyVarsTab_0;
public static String CPropertyVarsTab_Description;
public static String CWizardHandler_0; public static String CWizardHandler_0;
public static String CWizardHandler_1; public static String CWizardHandler_1;
public static String CWizardHandler_2; public static String CWizardHandler_2;

1
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties
View file

@ -47,6 +47,7 @@ ArtifactTab_1=Artifact name:
ArtifactTab_2=Artifact extension: ArtifactTab_2=Artifact extension:
ArtifactTab_3=Output prefix: ArtifactTab_3=Output prefix:
CPropertyVarsTab_0=Show system variables CPropertyVarsTab_0=Show system variables
CPropertyVarsTab_Description=Build Variables are IDE only variables, which can be used for string substitution when defining external builder configuration, such as environment variable value or command line parameter in form of ${VAR}, internal builder may use them directly.
DiscoveryTab_0=Discovery profiles scope DiscoveryTab_0=Discovery profiles scope
DiscoveryTab_1=Per Language DiscoveryTab_1=Per Language
DiscoveryTab_2=Configuration-wide DiscoveryTab_2=Configuration-wide

9
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java
View file

@ -39,6 +39,7 @@ import org.eclipse.cdt.utils.envvar.EnvVarOperationProcessor;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.preference.JFacePreferences; import org.eclipse.jface.preference.JFacePreferences;
import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnLayoutData;
@ -356,14 +357,14 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
} }
} }
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
@Override @Override
public void createControls(Composite parent) { public void createControls(Composite parent) {
super.createControls(parent); super.createControls(parent);
initButtons(new String[] {ADD_STR, EDIT_STR, DEL_STR});
usercomp.setLayout(new GridLayout(2, true)); usercomp.setLayout(new GridLayout(2, true));
Label desc = new Label(usercomp.getParent(), SWT.WRAP);
desc.setText(Messages.CPropertyVarsTab_Description);
GridDataFactory.fillDefaults().grab(true, false).span(2, 1).applyTo(desc);
initButtons(new String[] {ADD_STR, EDIT_STR, DEL_STR});
createTableControl(); createTableControl();
// Create a "show parent levels" button // Create a "show parent levels" button