mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Bug 530478 - Relax AC_INIT macro validation in AutoconfEditor

Browse source 
When AutoconfEditor is set to 2.67 or newer, relax the validation of
AC_INIT version string.

Change-Id: I65221857905e867e3eea2de219ddf68c60f6d39b
Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
This commit is contained in:
Chin Huat Ang 2018-01-30 14:54:29 +08:00 • committed by Jeff Johnston
parent 127e71423e
commit 59669d9aed
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java
View file

@ -39,11 +39,12 @@ public class AutotoolsPropertyConstants {
public static final QualifiedName OPEN_INCLUDE_P = new QualifiedName(PREFIX, "PersistentIncludeResourceMapping"); //$NON-NLS-1$ public static final QualifiedName OPEN_INCLUDE_P = new QualifiedName(PREFIX, "PersistentIncludeResourceMapping"); //$NON-NLS-1$
public static final QualifiedName SCANNER_INFO_DIRTY = new QualifiedName(PREFIX, "ScannerInfoDirty"); // $NON-NLSp-1$ public static final QualifiedName SCANNER_INFO_DIRTY = new QualifiedName(PREFIX, "ScannerInfoDirty"); // $NON-NLSp-1$
public static final String[] fACVersions = {"2.13", "2.59", "2.61", "2.68"}; //$NON-NLS-1$ public static final String[] fACVersions = { "2.13", "2.59", "2.61", "2.67", "2.68" }; //$NON-NLS-1$
public static final String AC_VERSION_2_13 = fACVersions[0]; public static final String AC_VERSION_2_13 = fACVersions[0];
public static final String AC_VERSION_2_59 = fACVersions[1]; public static final String AC_VERSION_2_59 = fACVersions[1];
public static final String AC_VERSION_2_61 = fACVersions[2]; public static final String AC_VERSION_2_61 = fACVersions[2];
public static final String AC_VERSION_2_68 = fACVersions[3]; public static final String AC_VERSION_2_67 = fACVersions[3];
public static final String AC_VERSION_2_68 = fACVersions[4];
public static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1]; public static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
public static final String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6", "1.11.1"}; //$NON-NLS-1$ public static final String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6", "1.11.1"}; //$NON-NLS-1$

3
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AcInitElement.java
View file

@ -37,6 +37,9 @@ public class AcInitElement extends AutoconfMacroElement {
if (this.getChildren().length < 2) if (this.getChildren().length < 2)
return; return;
// autoconf 2.67 onwards allows a more relaxed VERSION string format,
// so only validate arguments for earlier versions
if (VersionComparator.compare(version, AutotoolsPropertyConstants.AC_VERSION_2_67) < 0)
this.validateMultipleArguments(); this.validateMultipleArguments();
} }