mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Added support for MinGW to be a sibling of the install directory.

Browse source
This commit is contained in:
Doug Schaefer 2007-08-09 01:55:49 +00:00
parent ee3108360d
commit 6d2009968e
1 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
View file

@ -11,13 +11,13 @@
package org.eclipse.cdt.managedbuilder.gnu.mingw; package org.eclipse.cdt.managedbuilder.gnu.mingw;
import java.io.File;
import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable; import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
import org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier; import org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier;
import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider; import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider;
import org.eclipse.cdt.utils.WindowsRegistry; import org.eclipse.cdt.utils.WindowsRegistry;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
/** /**
@ -55,35 +55,52 @@ public class MingwEnvironmentVariableSupplier implements
} }
} }
private final IBuildEnvironmentVariable path; private IBuildEnvironmentVariable path;
public MingwEnvironmentVariableSupplier() { public static IPath getBinDir() {
IPath subPath = new Path("mingw\\bin");
// 1. Try the mingw directory in the platform install directory // 1. Try the mingw directory in the platform install directory
String bin = Platform.getInstallLocation().getURL().getFile().substring(1) + "mingw/bin"; IPath installPath = new Path(Platform.getInstallLocation().getURL().getFile());
IPath binPath = installPath.append(subPath);
if (binPath.toFile().isDirectory())
return binPath;
if (!new File(bin).exists()) { // 2. Try the directory above the install dir
// 2. Try looking if the mingw installer ran binPath = installPath.removeLastSegments(1).append(subPath);
bin = WindowsRegistry.getRegistry().getLocalMachineValue( if (binPath.toFile().isDirectory())
return binPath;
// 3. Try looking if the mingw installer ran
String mingwPath = WindowsRegistry.getRegistry().getLocalMachineValue(
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW", "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW",
"InstallLocation"); "InstallLocation");
if (bin != null) if (mingwPath != null) {
bin += "\\bin"; binPath = new Path(mingwPath).append("bin");
if (binPath.toFile().isDirectory())
if (bin == null || !new File(bin).exists()) { return binPath;
// 3. Try the standard location
bin = "C:/MinGW/bin";
}
} }
// 4. Try the default MinGW install dir
binPath = new Path("C:\\MinGW\\bin");
if (binPath.toFile().isDirectory())
return binPath;
// No dice, return null
return null;
}
public MingwEnvironmentVariableSupplier() {
IPath binPath = getBinDir();
if (binPath != null)
path = new MingwBuildEnvironmentVariable( path = new MingwBuildEnvironmentVariable(
"PATH", "PATH",
bin, binPath.toOSString(),
IBuildEnvironmentVariable.ENVVAR_PREPEND); IBuildEnvironmentVariable.ENVVAR_PREPEND);
} }
public IBuildEnvironmentVariable getVariable(String variableName, public IBuildEnvironmentVariable getVariable(String variableName,
IConfiguration configuration, IEnvironmentVariableProvider provider) { IConfiguration configuration, IEnvironmentVariableProvider provider) {
if (variableName.equals(path.getName())) if (path != null && variableName.equals(path.getName()))
return path; return path;
else else
return null; return null;
@ -91,7 +108,9 @@ public class MingwEnvironmentVariableSupplier implements
public IBuildEnvironmentVariable[] getVariables( public IBuildEnvironmentVariable[] getVariables(
IConfiguration configuration, IEnvironmentVariableProvider provider) { IConfiguration configuration, IEnvironmentVariableProvider provider) {
return new IBuildEnvironmentVariable[] { path }; return path != null
? new IBuildEnvironmentVariable[] { path }
: new IBuildEnvironmentVariable[0];
} }
} }