Skip to content

IEP-1272 Improve UX in Build Settings Tab #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kolipakakondal merged 2 commits into from
Jul 9, 2024
Merged

IEP-1272 Improve UX in Build Settings Tab #1003

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47dbf24
feat: improved UX in build settings tab
sigmaaa Jun 24, 2024
3ad6215
fix: improving readability
sigmaaa Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 42 additions & 7 deletions bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/dialogs/CMakeBuildTab2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*******************************************************************************/
package com.espressif.idf.ui.dialogs;

import java.nio.file.Path;
import java.util.Map;

import org.eclipse.cdt.cmake.core.internal.CMakeBuildConfiguration;
Expand Down Expand Up @@ -44,9 +45,12 @@
@SuppressWarnings("restriction")
public class CMakeBuildTab2 extends CommonBuildTab
{

private static final String LOCAL_CMAKE_ARGUMENTS = "local_cmake_arguments"; //$NON-NLS-1$
private static final String UNIX_MAKEFILES = "Unix Makefiles"; //$NON-NLS-1$
private static final String NINJA = "Ninja"; //$NON-NLS-1$
private static final String DEFAULT_CMAKE_MSG = "-B customBuildFolder"; //$NON-NLS-1$
private static final String DEFAULT_BUILD_MSG = "cmake --build ."; //$NON-NLS-1$
private static final String DEFAULT_CLEAN_MSG = "ninja clean"; //$NON-NLS-1$
private Button unixGenButton;
private Button ninjaGenButton;
private Text cmakeArgsText;
Expand Down Expand Up @@ -106,20 +110,23 @@ public void widgetSelected(SelectionEvent e)
label.setText(Messages.CMakeBuildTab2_AdditionalCMakeArgs);

cmakeArgsText = new Text(cmakeGroup, SWT.BORDER);
cmakeArgsText.setMessage(DEFAULT_CMAKE_MSG);
cmakeArgsText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
cmakeArgsText.addModifyListener(e -> updateLaunchConfigurationDialog());

label = new Label(cmakeGroup, SWT.NONE);
label.setText(Messages.CMakeBuildTab2_BuildCmd);

buildCommandText = new Text(cmakeGroup, SWT.BORDER);
buildCommandText.setMessage(DEFAULT_BUILD_MSG);
buildCommandText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
buildCommandText.addModifyListener(e -> updateLaunchConfigurationDialog());

label = new Label(cmakeGroup, SWT.NONE);
label.setText(Messages.CMakeBuildTab2_CleanCmd);

cleanCommandText = new Text(cmakeGroup, SWT.BORDER);
cleanCommandText.setMessage(DEFAULT_CLEAN_MSG);
cleanCommandText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
cleanCommandText.addModifyListener(e -> updateLaunchConfigurationDialog());
}
Expand Down Expand Up @@ -160,7 +167,8 @@ public void initializeFrom(ILaunchConfiguration configuration)
String generator = configuration.getAttribute(CMakeBuildConfiguration.CMAKE_GENERATOR, StringUtil.EMPTY);
updateGeneratorButtons(generator);

String cmakeArgs = configuration.getAttribute(CMakeBuildConfiguration.CMAKE_ARGUMENTS, StringUtil.EMPTY);
String cmakeArgs = configuration.getAttribute(LOCAL_CMAKE_ARGUMENTS,
configuration.getAttribute(CMakeBuildConfiguration.CMAKE_ARGUMENTS, StringUtil.EMPTY));
cmakeArgsText.setText(cmakeArgs);

String buildCommand = configuration.getAttribute(CMakeBuildConfiguration.BUILD_COMMAND, StringUtil.EMPTY);
Expand Down Expand Up @@ -193,10 +201,10 @@ private void updateGeneratorButtons(String generator)
public void performApply(ILaunchConfigurationWorkingCopy configuration)
{
super.performApply(configuration);

IProject project = null;
try
{
IProject project = CoreBuildLaunchConfigDelegate.getProject(configuration);
project = CoreBuildLaunchConfigDelegate.getProject(configuration);
RecheckConfigsHelper.revalidateToolchain(project);
}
catch (CoreException e)
Expand All @@ -210,10 +218,14 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration)
String cmakeArgs = cmakeArgsText.getText().trim();
if (!cmakeArgs.isEmpty())
{
configuration.setAttribute(CMakeBuildConfiguration.CMAKE_ARGUMENTS, cmakeArgs);
configuration.setAttribute(LOCAL_CMAKE_ARGUMENTS, cmakeArgs);
if (project != null)
configuration.setAttribute(CMakeBuildConfiguration.CMAKE_ARGUMENTS,
getCmakeArgumentsWithAbsProjectPath(project, cmakeArgs));
}
else
{
configuration.removeAttribute(LOCAL_CMAKE_ARGUMENTS);
configuration.removeAttribute(CMakeBuildConfiguration.CMAKE_ARGUMENTS);
}

Expand Down Expand Up @@ -245,7 +257,7 @@ protected void saveProperties(Map<String, String> properties)
super.saveProperties(properties);
properties.put(CMakeBuildConfiguration.CMAKE_GENERATOR, ninjaGenButton.getSelection() ? NINJA : UNIX_MAKEFILES);

properties.put(CMakeBuildConfiguration.CMAKE_ARGUMENTS, cmakeArgsText.getText().trim());
properties.put(LOCAL_CMAKE_ARGUMENTS, cmakeArgsText.getText().trim());
properties.put(CMakeBuildConfiguration.BUILD_COMMAND, buildCommandText.getText().trim());
properties.put(CMakeBuildConfiguration.CLEAN_COMMAND, cleanCommandText.getText().trim());
}
Expand All @@ -271,7 +283,7 @@ protected void restoreProperties(Map<String, String> properties)
}
}

String cmakeArgs = properties.get(CMakeBuildConfiguration.CMAKE_ARGUMENTS);
String cmakeArgs = properties.get(LOCAL_CMAKE_ARGUMENTS);
if (cmakeArgs != null)
{
cmakeArgsText.setText(cmakeArgs);
Expand Down Expand Up @@ -340,4 +352,27 @@ public String getName()
return "CMake"; //$NON-NLS-1$
}

private String getCmakeArgumentsWithAbsProjectPath(IProject project, String cmakeArgumets)
{
String buildFolder = StringUtil.EMPTY;
String[] cmakeArgsArr = cmakeArgsText.getText().trim().split("\\s+"); // Split on any whitespace //$NON-NLS-1$

for (int i = 0; i < cmakeArgsArr.length - 1; i++)
{
if (cmakeArgsArr[i].equals("-B")) //$NON-NLS-1$
{
buildFolder = cmakeArgsArr[i + 1];
break;
}
}

if (!Path.of(buildFolder).isAbsolute())
{
// Getting the first argument after -B option
cmakeArgumets = cmakeArgumets.replaceFirst("(?<=-B)\\s+(\\S+)", //$NON-NLS-1$
" " + project.getLocation().append(buildFolder)); //$NON-NLS-1$
}
return cmakeArgumets;
}

}