Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2016-05-12 17:50:23 +0000
committerGerrit Code Review @ Eclipse.org2016-05-12 19:32:51 +0000
commit0d7ee343e017f753a6bb8e2d3165d6b8fb2e9e9e (patch)
tree7752ffc3ff385d0f3b8a19ae1c34d0fbaec2b16a /build/org.eclipse.cdt.managedbuilder.gnu.ui/src
parente091657eafa69252ce0777b83d6ef7560dacfd3b (diff)
downloadorg.eclipse.cdt-0d7ee343e017f753a6bb8e2d3165d6b8fb2e9e9e.tar.gz
org.eclipse.cdt-0d7ee343e017f753a6bb8e2d3165d6b8fb2e9e9e.tar.xz
org.eclipse.cdt-0d7ee343e017f753a6bb8e2d3165d6b8fb2e9e9e.zip
Add MSYS2 support for managed build. A few Qt cleanups on Windows.
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.gnu.ui/src')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java37
1 files changed, 2 insertions, 35 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
index 64f4b897fce..58ef685197b 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
@@ -33,40 +33,6 @@ public class MingwEnvironmentVariableSupplier implements IConfigurationEnvironme
private static final String BACKSLASH = java.io.File.separator;
private static final String PATH_DELIMITER = EnvironmentVariableManager.getDefault().getDefaultDelimiter();
- /**
- * @return location of $MINGW_HOME/bin folder on the file-system.
- * @deprecated. Deprecated as of CDT 8.2. Note that MinGW root path in general may depend on configuration.
- *
- * If you use this do not cache results to ensure user preferences are accounted for.
- * Please rely on internal caching.
- */
- @Deprecated
- public static IPath getBinDir() {
- IPath binDir = null;
- String minGWHome = MinGW.getMinGWHome();
- if (minGWHome != null) {
- binDir = new Path(minGWHome).append("bin"); //$NON-NLS-1$
- }
- return binDir;
- }
-
- /**
- * @return location of $MINGW_HOME/msys/bin folder on the file-system.
- * @deprecated. Deprecated as of CDT 8.2. Note that MinGW root path in general may depend on configuration.
- *
- * If you use this do not cache results to ensure user preferences are accounted for.
- * Please rely on internal caching.
- */
- @Deprecated
- public static IPath getMsysBinDir() {
- IPath msysBinDir = null;
- String msysHome = MinGW.getMSysHome();
- if (msysHome != null) {
- msysBinDir = new Path(msysHome).append("bin"); //$NON-NLS-1$
- }
- return msysBinDir;
- }
-
@Override
public IBuildEnvironmentVariable getVariable(String variableName, IConfiguration configuration, IEnvironmentVariableProvider provider) {
if (variableName.equals(MinGW.ENV_MINGW_HOME)) {
@@ -98,7 +64,8 @@ public class MingwEnvironmentVariableSupplier implements IConfigurationEnvironme
} else if (variableName.equals(ENV_PATH)) {
@SuppressWarnings("nls")
String path = "${" + MinGW.ENV_MINGW_HOME + "}" + BACKSLASH + "bin" + PATH_DELIMITER
- + "${" + MinGW.ENV_MSYS_HOME + "}" + BACKSLASH + "bin";
+ + "${" + MinGW.ENV_MSYS_HOME + "}" + BACKSLASH + "bin" + PATH_DELIMITER
+ + "${" + MinGW.ENV_MSYS_HOME + "}" + BACKSLASH + "usr" + BACKSLASH + "bin";
return new BuildEnvVar(ENV_PATH, path, IBuildEnvironmentVariable.ENVVAR_PREPEND);
}

Back to the top