From 8ff69340663aebaf075b69d93f06c87fbea255aa Mon Sep 17 00:00:00 2001 From: Kondal Kolipaka Date: Mon, 4 Jan 2021 15:44:03 +0530 Subject: [PATCH 1/3] Fix: Plugin support for Eclipse 4.18 --- .../idf/core/build/IDFBuildConfiguration.java | 11 +++++------ .../src/com/espressif/idf/core/build/Messages.java | 13 +++++++++++++ .../espressif/idf/core/build/messages.properties | 12 ++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) 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 index a1b15ef6b..f07bb0176 100644 --- 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 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 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 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 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 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 index 14f7e1a5d..e29d029c7 100644 --- 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 index 28defd489..19c917c30 100644 --- 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 From 6e41e3652538795a774679d1da64c57cc6f39cf0 Mon Sep 17 00:00:00 2001 From: Kondal Kolipaka Date: Mon, 4 Jan 2021 15:52:13 +0530 Subject: [PATCH 2/3] Update version to v1.2.4 --- bundles/com.espressif.idf.branding/META-INF/MANIFEST.MF | 2 +- bundles/com.espressif.idf.branding/pom.xml | 2 +- features/com.espressif.idf.feature/feature.xml | 2 +- features/com.espressif.idf.feature/pom.xml | 2 +- releng/com.espressif.idf.update/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bundles/com.espressif.idf.branding/META-INF/MANIFEST.MF b/bundles/com.espressif.idf.branding/META-INF/MANIFEST.MF index 98773d494..f5643e33e 100644 --- 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 index d4e66d04a..ebb470626 100644 --- 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"> 4.0.0 com.espressif.idf.branding - 1.2.3-SNAPSHOT + 1.2.4-SNAPSHOT eclipse-plugin diff --git a/features/com.espressif.idf.feature/feature.xml b/features/com.espressif.idf.feature/feature.xml index 8daf17886..b2a6d3a08 100644 --- a/features/com.espressif.idf.feature/feature.xml +++ b/features/com.espressif.idf.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/com.espressif.idf.feature/pom.xml b/features/com.espressif.idf.feature/pom.xml index 2e357e85f..032b09f25 100644 --- a/features/com.espressif.idf.feature/pom.xml +++ b/features/com.espressif.idf.feature/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.espressif.idf.feature com.espressif.idf.feature - 1.2.3-SNAPSHOT + 1.2.4-SNAPSHOT eclipse-feature diff --git a/releng/com.espressif.idf.update/pom.xml b/releng/com.espressif.idf.update/pom.xml index 161c9f61f..fb5f79079 100644 --- 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"> 4.0.0 com.espressif.idf.update - 1.2.3-SNAPSHOT + 1.2.4-SNAPSHOT eclipse-repository From a8352d4a8a3d5f1b52ff755c162d2e8ca58505bf Mon Sep 17 00:00:00 2001 From: Kondal Kolipaka Date: Mon, 4 Jan 2021 16:03:19 +0530 Subject: [PATCH 3/3] Fix build error with v1.2.4 release build --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e28a316c1..d31d8bec4 100644 --- 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}