From 59669d9aed66af5573cc40a7546c59f5b12df55c Mon Sep 17 00:00:00 2001 From: Chin Huat Ang Date: Tue, 30 Jan 2018 14:54:29 +0800 Subject: [PATCH] Bug 530478 - Relax AC_INIT macro validation in AutoconfEditor 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 --- .../internal/autotools/core/AutotoolsPropertyConstants.java | 5 +++-- .../org/eclipse/cdt/autotools/ui/editors/AcInitElement.java | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java index 2d78a7e4a07..b501c22cf08 100644 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java +++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java @@ -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 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_59 = fACVersions[1]; 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[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6", "1.11.1"}; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AcInitElement.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AcInitElement.java index 6d061cd1ca6..a3e6c755520 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AcInitElement.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AcInitElement.java @@ -37,7 +37,10 @@ public class AcInitElement extends AutoconfMacroElement { if (this.getChildren().length < 2) return; - this.validateMultipleArguments(); + // 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(); } return;