[WIP] Release/v4.0.0 This is just to have the release 4.0 builds for testing (Please dont merge it yet #1217
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -5,9 +5,13 @@ name: Java CI with Maven on Windows | |||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| on: | ||||||||||||||||||||||||||||||||||||
| push: | ||||||||||||||||||||||||||||||||||||
| branches: | ||||||||||||||||||||||||||||||||||||
| - master | ||||||||||||||||||||||||||||||||||||
| - release/** | ||||||||||||||||||||||||||||||||||||
| pull_request: | ||||||||||||||||||||||||||||||||||||
| branches: | ||||||||||||||||||||||||||||||||||||
| - master | ||||||||||||||||||||||||||||||||||||
| - release/** | ||||||||||||||||||||||||||||||||||||
|
Comment on lines
+8
to
+14
There was a problem hiding this comment. Fix YAML indentation under triggers Proposed patch: on:
push:
- branches:
- - master
- - release/**
+ branches:
+ - master
+ - release/**
pull_request:
- branches:
- - master
- - release/**
+ branches:
+ - master
+ - release/**📝 Committable suggestion
Suggested change
🧰 Tools🪛 YAMLlint (1.35.1)[warning] 9-9: wrong indentation: expected 6 but found 5 (indentation) [warning] 13-13: wrong indentation: expected 6 but found 5 (indentation) |
||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| jobs: | ||||||||||||||||||||||||||||||||||||
| build_windows: | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,6 +45,7 @@ Export-Package: com.espressif.idf.core, | |
| com.espressif.idf.core.tools, | ||
| com.espressif.idf.core.tools.util, | ||
| com.espressif.idf.core.tools.vo, | ||
| com.espressif.idf.core.tools.watcher, | ||
| com.espressif.idf.core.util, | ||
| com.espressif.idf.core.variable, | ||
| org.json.simple, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,14 +7,11 @@ | |
|
|
||
| import org.eclipse.core.resources.IProject; | ||
| import org.eclipse.core.resources.ProjectScope; | ||
| import org.eclipse.core.runtime.preferences.ConfigurationScope; | ||
| import org.eclipse.core.runtime.preferences.DefaultScope; | ||
| import org.eclipse.core.runtime.preferences.IEclipsePreferences; | ||
| import org.eclipse.core.runtime.preferences.InstanceScope; | ||
|
|
||
| /** | ||
| * @author Kondal Kolipaka | ||
| * | ||
|
|
@@ -32,16 +29,6 @@ public class IDFCorePreferenceConstants | |
| public static final boolean CMAKE_CCACHE_DEFAULT_STATUS = true; | ||
| public static final boolean AUTOMATE_BUILD_HINTS_DEFAULT_STATUS = true; | ||
| public static final boolean HIDE_ERRORS_IDF_COMPONENTS_DEFAULT_STATUS = true; | ||
|
|
||
| /** | ||
| * Returns the node in the preference in the given context. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,6 @@ | |
| import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable; | ||
|
|
||
| import com.espressif.idf.core.logging.Logger; | ||
| import com.espressif.idf.core.util.StringUtil; | ||
|
|
||
| /** | ||
|
|
@@ -52,6 +51,8 @@ public class IDFEnvironmentVariables | |
|
|
||
| public static final String IDF_CCACHE_ENABLE = "IDF_CCACHE_ENABLE"; //$NON-NLS-1$ | ||
|
|
||
| public static final String ESP_IDF_EIM_ID = "ESP_IDF_EIM_ID"; //$NON-NLS-1$ | ||
|
|
||
| /** | ||
| * @param variableName Environment variable Name | ||
| * @return IEnvironmentVariable | ||
|
|
@@ -129,16 +130,12 @@ public Map<String, String> getSystemEnvMap() | |
| IEnvironmentVariableManager buildEnvironmentManager = CCorePlugin.getDefault().getBuildEnvironmentManager(); | ||
| IEnvironmentVariable[] variables = buildEnvironmentManager.getVariables((ICConfigurationDescription) null, | ||
| true); | ||
| Map<String, String> envMap = new HashMap<String, String>(System.getenv()); | ||
| if (variables != null) | ||
| { | ||
| for (IEnvironmentVariable iEnvironmentVariable : variables) | ||
| { | ||
| String key = iEnvironmentVariable.getName(); | ||
| String value = iEnvironmentVariable.getValue(); | ||
| envMap.put(key, value); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -359,9 +359,6 @@ private void runCmakeBuildCommand(IConsole console, IProgressMonitor monitor, IP | |
| } | ||
| } | ||
|
|
||
| String buildCommand = getProperty(BUILD_COMMAND); | ||
| if (buildCommand.isBlank()) | ||
| { | ||
|
|
@@ -479,10 +476,8 @@ private void runCmakeCommand(IConsole console, IProgressMonitor monitor, IProjec | |
| // Set PYTHONUNBUFFERED to 1/TRUE to dump the messages back immediately without | ||
| // buffering | ||
| IEnvironmentVariable bufferEnvVar = new EnvironmentVariable("PYTHONUNBUFFERED", "1"); //$NON-NLS-1$ //$NON-NLS-2$ | ||
|
|
||
| Process p = startBuildProcess(command, new IEnvironmentVariable[] { bufferEnvVar }, | ||
| workingDir, errConsole, monitor); | ||
| if (p == null) | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,8 +33,23 @@ public class Messages extends NLS | |
| public static String ToolsInitializationDifferentPathMessageBoxOptionYes; | ||
| public static String ToolsInitializationDifferentPathMessageBoxOptionNo; | ||
| public static String IDFToolChainsMissingErrorMsg; | ||
|
|
||
| public static String ToolsInitializationEimMissingMsgBoxTitle; | ||
| public static String ToolsInitializationEimMissingMsgBoxMessage; | ||
|
|
||
| public static String RefreshingProjects_JobName; | ||
|
|
||
| public static String NoActiveEspIdfInWorkspaceMsgTitle; | ||
| public static String NoActiveEspIdfInWorkspaceMsg; | ||
|
|
||
| public static String OldConfigFoundMsgBoxTitle; | ||
| public static String OldConfigFoundMsgBoxMsg; | ||
| public static String OldConfigExportDirectorSelectionDialogTitle; | ||
| public static String OldConfigExportDirectorSelectionDialogInfo; | ||
| public static String OldConfigExportCompleteSuccessMsgTitle; | ||
| public static String OldConfigExportCompleteSuccessMsg; | ||
| public static String OldConfigExportCompleteFailMsgTitle; | ||
| public static String OldConfigExportCompleteFailMsg; | ||
|
|
||
| static | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,9 +19,23 @@ IDFBuildConfiguration_ParseCommand=Parse Compile Commands File | |
| IncreasePartitionSizeTitle=Low Application Partition Size | ||
| IncreasePartitionSizeMessage=Less than 30% of application partition size is free({0} of {1} bytes), would you like to increase it? Please click <a href={2}>here</a> to check more details. | ||
| ToolsInitializationDifferentPathMessageBoxTitle=Different IDF path found in the config file | ||
| ToolsInitializationEimMissingMsgBoxTitle=ESP-IDF Not Found | ||
| ToolsInitializationEimMissingMsgBoxMessage=ESP-IDF is not found on your system. To use the IDE, install ESP-IDF using <a href="{0}">EIM - GUI Installer</a>. \n\nOnce installed, the IDE will automatically detect ESP-IDF. You can verify and activate it from the ESP-IDF Manager, accessible via the menu: Espressif > ESP-IDF Manager.\n\n | ||
| ToolsInitializationDifferentPathMessageBoxMessage=A different ESP-IDF path was found in the esp_idf.json.json configuration file. Do you want to install the tools in the new path or the old path? Please click on the appropriate button.\nNew Path: {0}\nOld Path: {1} | ||
| ToolsInitializationDifferentPathMessageBoxOptionYes=Use New Path | ||
| ToolsInitializationDifferentPathMessageBoxOptionNo=Use Old Path | ||
| RefreshingProjects_JobName=Refreshing Projects... | ||
| IDFBuildConfiguration_PreCheck_DifferentIdfPath=The project was built using the ESP-IDF located at the {0} path.\nThe currently active ESP-IDF path in the IDE is {1}.\nPlease clean the project using "ESP-IDF:Project Full Clean" menu option to use the active ESP-IDF configuration. | ||
| IDFToolChainsMissingErrorMsg=Toolchains are missing. Please use ESP-IDF Manager for configuring | ||
|
|
||
| NoActiveEspIdfInWorkspaceMsgTitle=ESP-IDF Setup | ||
| NoActiveEspIdfInWorkspaceMsg=ESP-IDF is required to use Espressif IDE. Would you like to configure it now? | ||
|
|
||
| OldConfigFoundMsgBoxTitle=Old Configuration Found | ||
| OldConfigFoundMsgBoxMsg=An old ESP-IDF configuration has been detected.\nIf you want to use these you need to export these configuration and pass them on to EIM for updated configurations.\nWould you like to export these settings?\n\nPress 'Yes' to choose a location to save. | ||
| OldConfigExportDirectorSelectionDialogTitle=Select Destination | ||
| OldConfigExportDirectorSelectionDialogInfo=Choose a directory to save the exported settings. | ||
| OldConfigExportCompleteSuccessMsgTitle=Export Successful | ||
| OldConfigExportCompleteSuccessMsg=The configuration has been successfully copied to:\n{0} | ||
| OldConfigExportCompleteFailMsgTitle=Export Failed | ||
| OldConfigExportCompleteFailMsg=An error occurred while copying the configuration.\n{0} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -177,7 +177,7 @@ public File findToolChain(List<String> paths, String filePattern) | |
|
|
||
| private Path[] getDirectories(String path) | ||
| { | ||
| return Arrays.stream(path.split(File.pathSeparator)).map(String::trim).map(Paths::get).filter(Files::exists).filter(Files::isDirectory) | ||
| .toArray(Path[]::new); | ||
| } | ||
|
|
||
|
|
@@ -316,7 +316,7 @@ protected String getIdfToolsExportPath() | |
| Logger.log(commands.toString()); | ||
|
|
||
| IStatus idfToolsExportStatus = new ProcessBuilderFactory().runInBackground(commands, | ||
| org.eclipse.core.runtime.Path.ROOT, System.getenv()); | ||
| if (idfToolsExportStatus != null && idfToolsExportStatus.isOK()) | ||
| { | ||
| String message = idfToolsExportStatus.getMessage(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.espressif.idf.core.tools; | ||
|
|
||
| public interface EimConstants | ||
| { | ||
| String EIM_JSON = "eim_idf.json"; //$NON-NLS-1$ | ||
|
|
||
| String EIM_POSIX_DIR = System.getProperty("user.home").concat("/.espressif/tools/"); //$NON-NLS-1$//$NON-NLS-2$ | ||
|
|
||
| String EIM_WIN_DIR = "C:\\Espressif\\tools\\"; //$NON-NLS-1$ | ||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Avoid hardcoding installation paths The Windows installation directory is hardcoded, which may not respect user customizations or non-standard installation locations. Consider using environment variables or configuration settings to allow for customization. |
||
|
|
||
| String EIM_WIN_PATH = EIM_WIN_DIR + EIM_JSON; | ||
|
|
||
| String EIM_URL = "https://dl.espressif.com/dl/eim/"; //$NON-NLS-1$ | ||
|
|
||
| String EIM_POSIX_PATH = EIM_POSIX_DIR + EIM_JSON; | ||
|
|
||
| String INSTALL_TOOLS_FLAG = "INSTALL_TOOLS_FLAG"; //$NON-NLS-1$ | ||
|
|
||
| String TOOL_SET_CONFIG_LEGACY_CONFIG_FILE = "tool_set_config.json"; //$NON-NLS-1$ | ||
|
|
||
| String OLD_CONFIG_EXPORTED_FLAG = "OLD_CONFIG_EXPORTED_FLAG"; //$NON-NLS-1$ | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,47 @@ | ||||||||||||||||||||||||||||||||||||||||||||||||||
| package com.espressif.idf.core.tools; | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
| import java.io.FileReader; | ||||||||||||||||||||||||||||||||||||||||||||||||||
| import java.io.IOException; | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
| import org.eclipse.core.runtime.Platform; | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
| import com.espressif.idf.core.tools.vo.EimJson; | ||||||||||||||||||||||||||||||||||||||||||||||||||
| import com.google.gson.Gson; | ||||||||||||||||||||||||||||||||||||||||||||||||||
| import com.google.gson.GsonBuilder; | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
| public class EimIdfConfiguratinParser | ||||||||||||||||||||||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||||||||||||||||||||||
| private EimJson eimJson; | ||||||||||||||||||||||||||||||||||||||||||||||||||
| private Gson gson; | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
| public EimIdfConfiguratinParser() | ||||||||||||||||||||||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||||||||||||||||||||||
| gson = new GsonBuilder().setPrettyPrinting().enableComplexMapKeySerialization() | ||||||||||||||||||||||||||||||||||||||||||||||||||
| .excludeFieldsWithoutExposeAnnotation().create(); | ||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
| private void load() throws IOException | ||||||||||||||||||||||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||||||||||||||||||||||
| try (FileReader fileReader = new FileReader( | ||||||||||||||||||||||||||||||||||||||||||||||||||
| Platform.getOS().equals(Platform.OS_WIN32) ? EimConstants.EIM_WIN_PATH : EimConstants.EIM_POSIX_PATH)) | ||||||||||||||||||||||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||||||||||||||||||||||
| eimJson = gson.fromJson(fileReader, EimJson.class); | ||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+23
to
+30
There was a problem hiding this comment. 🛠️ Refactor suggestion Add file existence check before attempting to read The private void load() throws IOException
{
+ File file = new File(Platform.getOS().equals(Platform.OS_WIN32) ? EimConstants.EIM_WIN_PATH : EimConstants.EIM_POSIX_PATH);
+ if (!file.exists()) {
+ throw new FileNotFoundException("EIM JSON configuration file not found: " + file.getAbsolutePath());
+ }
try (FileReader fileReader = new FileReader(
- Platform.getOS().equals(Platform.OS_WIN32) ? EimConstants.EIM_WIN_PATH : EimConstants.EIM_POSIX_PATH))
+ file))
{
eimJson = gson.fromJson(fileReader, EimJson.class);
}
}📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
| public EimJson getEimJson(boolean reload) throws IOException | ||||||||||||||||||||||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||||||||||||||||||||||
| if (reload) | ||||||||||||||||||||||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||||||||||||||||||||||
| load(); | ||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
| if (eimJson == null) | ||||||||||||||||||||||||||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||||||||||||||||||||||||||
| load(); | ||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||
| return eimJson; | ||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+32
to
+46
There was a problem hiding this comment. 🛠️ Refactor suggestion Improve method efficiency and thread safety The -public EimJson getEimJson(boolean reload) throws IOException
+public synchronized EimJson getEimJson(boolean reload) throws IOException
{
- if (reload)
+ if (reload || eimJson == null)
{
load();
}
-
- if (eimJson == null)
- {
- load();
- }
return eimJson;
} |
||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix YAML indentation under triggers
The list items for
push.branchesandpull_request.branchesare mis-indented (5 spaces instead of 6). Correcting this will prevent YAML parsing issues.on: push: - branches: - - master - - release/** + branches: + - master + - release/** pull_request: - branches: - - master - - release/** + branches: + - master + - release/**🧰 Tools
🪛 YAMLlint (1.35.1)
[warning] 9-9: wrong indentation: expected 6 but found 5
(indentation)
[warning] 13-13: wrong indentation: expected 6 but found 5
(indentation)