Merge branch 'IEP-90' into 'master'

kolipakakondal · kolipakakondal · commit b45efcb308e3 · 2019-11-08T16:40:41.000+08:00
IEP-90: Fix for NPE while configuring cmake toolchain

Closes IEP-90

See merge request idf/idf-eclipse-plugin!80
diff --git a/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/ESPToolChainManager.java b/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/ESPToolChainManager.java
@@ -209,6 +209,12 @@ protected String getIdfToolsExportPath()
 
 	public void initCMakeToolChain(IToolChainManager tcManager, ICMakeToolChainManager manager)
 	{
+		String idfPath = IDFUtil.getIDFPath();
+		if (StringUtil.isEmpty(idfPath)) //not yet configured
+		{
+			return;
+		}
+		
 		Map<String, String> properties = new HashMap<>();
 		properties.put(IToolChain.ATTR_OS, ESPToolChain.OS);
 		properties.put(IToolChain.ATTR_ARCH, ESPToolChain.ARCH);
@@ -217,7 +223,6 @@ public void initCMakeToolChain(IToolChainManager tcManager, ICMakeToolChainManag
 			for (IToolChain tc : tcManager.getToolChainsMatching(properties))
 			{
 
-				String idfPath = IDFUtil.getIDFPath();
 				if (!new File(idfPath).exists())
 				{
 					String errorMsg = MessageFormat.format(Messages.ESP32CMakeToolChainProvider_PathDoesnNotExist,

Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,12 @@ protected String getIdfToolsExportPath()`
`209`	`209`
`210`	`210`	`public void initCMakeToolChain(IToolChainManager tcManager, ICMakeToolChainManager manager)`
`211`	`211`	`{`
	`212`	`+ String idfPath = IDFUtil.getIDFPath();`
	`213`	`+ if (StringUtil.isEmpty(idfPath)) //not yet configured`
	`214`	`+ {`
	`215`	`+ return;`
	`216`	`+ }`
	`217`	`+`
`212`	`218`	`Map<String, String> properties = new HashMap<>();`
`213`	`219`	`properties.put(IToolChain.ATTR_OS, ESPToolChain.OS);`
`214`	`220`	`properties.put(IToolChain.ATTR_ARCH, ESPToolChain.ARCH);`
`@@ -217,7 +223,6 @@ public void initCMakeToolChain(IToolChainManager tcManager, ICMakeToolChainManag`
`217`	`223`	`for (IToolChain tc : tcManager.getToolChainsMatching(properties))`
`218`	`224`	`{`
`219`	`225`
`220`		`- String idfPath = IDFUtil.getIDFPath();`
`221`	`226`	`if (!new File(idfPath).exists())`
`222`	`227`	`{`
`223`	`228`	`String errorMsg = MessageFormat.format(Messages.ESP32CMakeToolChainProvider_PathDoesnNotExist,`