Merge branch 'IEP-315' into 'master'

IEP-315: Eclipse support 4.18 Closes IEP-315 See merge request idf/idf-eclipse-plugin!129
espressif · Jan 4, 2021 · bbccbb4 · bbccbb4
2 parents 7231ba1 + a8352d4
commit bbccbb4
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 14 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ image: ${CI_DOCKER_REGISTRY}/esp32-ci-env
 
 variables:
   ARCHIVE_DIR: "dist"
-  ORIGIN_NAME: "com.espressif.idf.update-1.2.3-SNAPSHOT.zip"
+  ORIGIN_NAME: "com.espressif.idf.update-1.2.4-SNAPSHOT.zip"
 
 .add_gh_key_remote: &add_gh_key_remote |
   cit_add_ssh_key "${GH_PUSH_KEY}"
@@ -32,7 +32,7 @@ build:
     # Use an unique name for the archive
     - UNIQ_SUFFIX="$(git describe --tags --dirty --abbrev=8)"
     - mkdir -p ${ARCHIVE_DIR} && echo "${UNIQ_SUFFIX}" > ${ARCHIVE_DIR}/uniq_suffix_value
-    - ARCHIVE_NAME=${ORIGIN_NAME/1.2.3-SNAPSHOT/$UNIQ_SUFFIX}
+    - ARCHIVE_NAME=${ORIGIN_NAME/1.2.4-SNAPSHOT/$UNIQ_SUFFIX}
     # build
     - export JARSIGNER_KEYSTORE_B64=${JARSIGNER_REL_KEYSTORE_B64:-${JARSIGNER_DEV_KEYSTORE_B64}}
     - export JARSIGNER_STOREPASS=${JARSIGNER_REL_STOREPASS:-${JARSIGNER_DEV_STOREPASS}}
@@ -53,7 +53,7 @@ build:
   script:
     # getting the corresponding unique suffix
     - UNIQ_SUFFIX=$(cat ${ARCHIVE_DIR}/uniq_suffix_value)
-    - ARCHIVE_NAME=${ORIGIN_NAME/1.2.3-SNAPSHOT/$UNIQ_SUFFIX}
+    - ARCHIVE_NAME=${ORIGIN_NAME/1.2.4-SNAPSHOT/$UNIQ_SUFFIX}
     # upload archive
     - cit_add_ssh_key "${SRV_KEY}"
     - cd ${ARCHIVE_DIR}

diff --git a/bundles/com.espressif.idf.branding/META-INF/MANIFEST.MF b/bundles/com.espressif.idf.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.espressif.idf.branding;singleton:=true
-Bundle-Version: 1.2.3.qualifier
+Bundle-Version: 1.2.4.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/com.espressif.idf.branding/pom.xml b/bundles/com.espressif.idf.branding/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.espressif.idf.branding</artifactId>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.4-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<parent>

diff --git a/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfiguration.java b/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfiguration.java
@@ -28,7 +28,6 @@
 import org.eclipse.cdt.cmake.core.internal.Activator;
 import org.eclipse.cdt.cmake.core.internal.CMakeBuildConfiguration;
 import org.eclipse.cdt.cmake.core.internal.CMakeUtils;
-import org.eclipse.cdt.cmake.core.internal.Messages;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.ConsoleOutputStream;
 import org.eclipse.cdt.core.ErrorParserManager;
@@ -196,7 +195,7 @@ public IProject[] build(int kind, Map<String, String> args, IConsole console, IP
 				if (toolChainFile == null)
 				{
 					// error
-					console.getErrorStream().write(Messages.CMakeBuildConfiguration_NoToolchainFile);
+					console.getErrorStream().write(Messages.IDFBuildConfiguration_CMakeBuildConfiguration_NoToolchainFile);
 					return null;
 				}
 			}
@@ -230,7 +229,7 @@ public IProject[] build(int kind, Map<String, String> args, IConsole console, IP
 				if (launchtarget != null)
 				{
 					String idfTargetName = launchtarget.getAttribute("com.espressif.idf.launch.serial.core.idfTarget", //$NON-NLS-1$
-							"");
+							""); //$NON-NLS-1$
 					if (!idfTargetName.isEmpty())
 					{
 						command.add("-DIDF_TARGET=" + idfTargetName); //$NON-NLS-1$
@@ -291,7 +290,7 @@ public IProject[] build(int kind, Map<String, String> args, IConsole console, IP
 					command.add("cmake"); //$NON-NLS-1$
 					command.add("--build"); //$NON-NLS-1$
 					command.add("."); //$NON-NLS-1$
-					if ("Ninja".equals(generator))
+					if ("Ninja".equals(generator)) //$NON-NLS-1$
 					{
 						command.add("--"); //$NON-NLS-1$
 						command.add("-v"); //$NON-NLS-1$
@@ -453,7 +452,7 @@ public boolean processLine(String line, List<Job> jobsArray) {
 				}
 			}
 
-			if (Platform.getOS().equals("win32") && !arg.endsWith(".exe")) { //$NON-NLS-1$
+			if (Platform.getOS().equals("win32") && !arg.endsWith(".exe")) { //$NON-NLS-1$ //$NON-NLS-2$
 				// Try with exe
 				arg = arg + ".exe"; //$NON-NLS-1$
 				for (String cc : compileCommands) {
@@ -505,7 +504,7 @@ public boolean processLine(String line, List<Job> jobsArray) {
 						if (commandPath != null) {
 							command.set(0, commandPath.toString());
 							Job job = new ScannerInfoJob(
-									String.format("Calculating scanner info for %s", resource),
+									String.format("Calculating scanner info for %s", resource), //$NON-NLS-1$
 									getToolChain(), command, resource, getBuildDirectoryURI(), commandStrings);
 							job.schedule();
 							jobsArray.add(job);

diff --git a/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/Messages.java b/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/Messages.java
@@ -10,6 +10,19 @@ public class Messages extends NLS
 {
 	private static final String BUNDLE_NAME = "com.espressif.idf.core.build.messages"; //$NON-NLS-1$
 	public static String ESP32CMakeToolChainProvider_PathDoesnNotExist;
+	public static String CMakeBuildConfiguration_Building;
+	public static String CMakeBuildConfiguration_BuildingIn;
+	public static String CMakeBuildConfiguration_BuildingComplete;
+
+	public static String CMakeBuildConfiguration_BuildComplete;
+	public static String CMakeBuildConfiguration_Configuring;
+	public static String CMakeBuildConfiguration_Cleaning;
+	public static String CMakeBuildConfiguration_NotFound;
+	public static String CMakeBuildConfiguration_ProcCompCmds;
+	public static String CMakeBuildConfiguration_ProcCompJson;
+	public static String CMakeBuildConfiguration_Failure;
+	public static String CMakeErrorParser_NotAWorkspaceResource;
+	public static String IDFBuildConfiguration_CMakeBuildConfiguration_NoToolchainFile;
 	static
 	{
 		// initialize resource bundle

diff --git a/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/messages.properties b/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/messages.properties
@@ -3,3 +3,15 @@
 # Use is subject to license terms.
 ###############################################################################
 ESP32CMakeToolChainProvider_PathDoesnNotExist=IDF path does not exist: {0}
+CMakeBuildConfiguration_Building=Building %s
+CMakeBuildConfiguration_BuildingIn=Building in: %s\n
+CMakeBuildConfiguration_BuildingComplete=Build complete (%d errors, %d warnings): %s\n
+CMakeBuildConfiguration_BuildComplete=Build complete\n
+CMakeBuildConfiguration_Configuring=Configuring in: %s\n
+CMakeBuildConfiguration_Cleaning=Cleaning %s
+CMakeBuildConfiguration_NotFound=CMakeFiles not found. Assuming clean.
+CMakeBuildConfiguration_ProcCompCmds=Processing compile commands %s
+CMakeBuildConfiguration_ProcCompJson=Processing compile_commands.json
+CMakeBuildConfiguration_Failure=Failure running cmake: %s\n
+CMakeErrorParser_NotAWorkspaceResource=Could not map %s to a workspace resource. Did the build run in a container?
+IDFBuildConfiguration_CMakeBuildConfiguration_NoToolchainFile=No toolchain file found
diff --git a/features/com.espressif.idf.feature/feature.xml b/features/com.espressif.idf.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.espressif.idf.feature"
       label="Espressif IDF Plugins for Eclipse"
-      version="1.2.3.qualifier"
+      version="1.2.4.qualifier"
       provider-name="ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD"
       plugin="com.espressif.idf.branding">
 

diff --git a/features/com.espressif.idf.feature/pom.xml b/features/com.espressif.idf.feature/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.espressif.idf.feature</groupId>
 	<artifactId>com.espressif.idf.feature</artifactId>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.4-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 	<parent>

diff --git a/releng/com.espressif.idf.update/pom.xml b/releng/com.espressif.idf.update/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.espressif.idf.update</artifactId>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.4-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<parent>