mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 11:55:40 +02:00
Code Issues Wiki Activity

Fixed an NPE.

Browse source
This commit is contained in:
Sergey Prigogin 2015-01-06 16:29:55 -08:00
parent 91d2fb6a4b
commit ce73d736bd
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java
View file

@ -32,9 +32,7 @@ import org.eclipse.core.runtime.Path;
* *
* @noextend This class is not intended to be subclassed by clients. * @noextend This class is not intended to be subclassed by clients.
*/ */
public class LlvmEnvironmentVariableSupplier implements public class LlvmEnvironmentVariableSupplier implements IConfigurationEnvironmentVariableSupplier {
IConfigurationEnvironmentVariableSupplier {
//toggle for preference changes //toggle for preference changes
private static boolean preferencesChanged = true; private static boolean preferencesChanged = true;
//LLVM environment variable data structure //LLVM environment variable data structure
@ -257,7 +255,7 @@ public class LlvmEnvironmentVariableSupplier implements
} }
/** /**
* Get LLVM executable path. * Returns LLVM executable path.
* *
* @param candidatePath Suggestion for LLVM executable path * @param candidatePath Suggestion for LLVM executable path
* @param subPath Additional sub-path for LLVM executable path * @param subPath Additional sub-path for LLVM executable path
@ -269,12 +267,14 @@ public class LlvmEnvironmentVariableSupplier implements
if (candidatePath.endsWith(Separators.getFileSeparator()) && candidatePath.length() > 1) { if (candidatePath.endsWith(Separators.getFileSeparator()) && candidatePath.length() > 1) {
llvmPath = candidatePath.substring(0, candidatePath.length() - 1); llvmPath = candidatePath.substring(0, candidatePath.length() - 1);
} }
//if subPath exists and is not empty -> append it to candidatePath // If subPath exists and is not empty -> append it to candidatePath.
if ((null != subPath) && (subPath.length()!=0)) { if (null != subPath && !subPath.isEmpty()) {
//form full path // Form full path.
llvmPath = candidatePath + Separators.getFileSeparator() + subPath; llvmPath = candidatePath + Separators.getFileSeparator() + subPath;
} }
//return a full path for LLVM executable if it's valid, otherwise null if (llvmPath == null)
return null;
// Return a full path for LLVM executable if it's valid, otherwise null.
return getBinDirIfLlvm_ar(llvmPath); return getBinDirIfLlvm_ar(llvmPath);
} }
@ -290,16 +290,15 @@ public class LlvmEnvironmentVariableSupplier implements
if (new Path(binPathTemp).toFile().isDirectory()) { if (new Path(binPathTemp).toFile().isDirectory()) {
String llvm_executable = "llvm-ar"; //$NON-NLS-1$ String llvm_executable = "llvm-ar"; //$NON-NLS-1$
File arFileFullPath = null; File arFileFullPath = null;
//if OS is Windows -> add .exe to the executable name // If OS is Windows -> add .exe to the executable name.
if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) { //$NON-NLS-1$//$NON-NLS-2$ if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) { //$NON-NLS-1$//$NON-NLS-2$
llvm_executable = llvm_executable + ".exe"; //$NON-NLS-1$ llvm_executable = llvm_executable + ".exe"; //$NON-NLS-1$
} }
//form full executable path // Form full executable path
arFileFullPath = new File(binPathTemp + Separators.getFileSeparator() arFileFullPath = new File(binPathTemp, llvm_executable);
+ llvm_executable); // Check if file exists -> proper LLVM installation exists.
//check if file exists -> proper LLVM installation exists
if (arFileFullPath.isFile()) { if (arFileFullPath.isFile()) {
//return path where llvm-ar exists // Return path where llvm-ar exists
return binPathTemp; return binPathTemp;
} }
} }
@ -307,7 +306,7 @@ public class LlvmEnvironmentVariableSupplier implements
} }
/** /**
* Get stdc++ library path located in MinGW installation. * Returns stdc++ library path located in MinGW installation.
* *
* @return stdc++ library path for MinGW * @return stdc++ library path for MinGW
*/ */