diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AbstractMakefile.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AbstractMakefile.java index f0703b3ca91..ffb662302a8 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AbstractMakefile.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AbstractMakefile.java @@ -15,6 +15,14 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IInferenceRule; +import org.eclipse.cdt.make.core.makefile.IMacroDefinition; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider; +import org.eclipse.cdt.make.core.makefile.IRule; +import org.eclipse.cdt.make.core.makefile.ITargetRule; + /** * Makefile : ( statement ) * * statement : rule | macro_definition | comments | empty diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeCompletionProcessor.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeCompletionProcessor.java index 767c8d91298..a947c857c63 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeCompletionProcessor.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeCompletionProcessor.java @@ -18,6 +18,11 @@ import java.util.Arrays; import java.util.Comparator; import org.eclipse.cdt.internal.autotools.ui.MakeUIImages; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IMacroDefinition; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.core.makefile.IRule; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.TextPresentation; import org.eclipse.jface.text.contentassist.CompletionProposal; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeDocumentProvider.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeDocumentProvider.java index c14d8756ae2..373b65fd12d 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeDocumentProvider.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeDocumentProvider.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.IOException; import java.util.Iterator; +import org.eclipse.cdt.make.core.makefile.IMakefile; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.IDocument; import org.eclipse.ui.IEditorInput; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeEditor.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeEditor.java index 08e5323c9ef..71c7445de56 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeEditor.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeEditor.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import org.eclipse.cdt.autotools.core.AutotoolsPlugin; import org.eclipse.cdt.internal.autotools.ui.preferences.AutomakeEditorPreferencePage; import org.eclipse.cdt.internal.autotools.ui.preferences.AutotoolsEditorPreferenceConstants; +import org.eclipse.cdt.make.core.makefile.IMakefile; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.source.ISourceViewer; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeEditorFactory.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeEditorFactory.java index 3793d626d2b..1cdf453794a 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeEditorFactory.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeEditorFactory.java @@ -12,6 +12,7 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import org.eclipse.cdt.autotools.core.AutotoolsPlugin; import org.eclipse.cdt.internal.autotools.ui.preferences.ColorManager; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.swt.graphics.Color; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeErrorHandler.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeErrorHandler.java index 90938949fa8..6d90b71be84 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeErrorHandler.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeErrorHandler.java @@ -11,6 +11,9 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.core.makefile.IParent; import org.eclipse.core.runtime.AssertionFailedException; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeTextHover.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeTextHover.java index 978b827a093..69985505734 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeTextHover.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakeTextHover.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IMacroDefinition; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IInformationControlCreator; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Automakefile.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Automakefile.java index c3234f36fda..3b59bcbdfa4 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Automakefile.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Automakefile.java @@ -14,6 +14,8 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.IOException; +import org.eclipse.cdt.make.core.makefile.IDirective; + public class Automakefile extends GNUAutomakefile { public Automakefile() { diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java index 0072f842596..0f42a48e793 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java @@ -16,6 +16,20 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.cdt.internal.autotools.ui.MakeUIImages; +import org.eclipse.cdt.make.core.makefile.IBadDirective; +import org.eclipse.cdt.make.core.makefile.ICommand; +import org.eclipse.cdt.make.core.makefile.IComment; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IEmptyLine; +import org.eclipse.cdt.make.core.makefile.IInferenceRule; +import org.eclipse.cdt.make.core.makefile.IMacroDefinition; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.core.makefile.IParent; +import org.eclipse.cdt.make.core.makefile.IRule; +import org.eclipse.cdt.make.core.makefile.ITargetRule; +import org.eclipse.cdt.make.core.makefile.gnu.IInclude; +import org.eclipse.cdt.make.core.makefile.gnu.ITerminal; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TreeViewer; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java index d01c5692001..f30e025f240 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.IOException; import java.io.StringReader; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.reconciler.DirtyRegion; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/BadDirective.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/BadDirective.java index f9d46c96cff..69de7fa70f0 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/BadDirective.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/BadDirective.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IBadDirective; + public class BadDirective extends Directive implements IBadDirective { String line; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Command.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Command.java index b975590395c..090eec2ec50 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Command.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Command.java @@ -13,6 +13,8 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.File; import java.io.IOException; +import org.eclipse.cdt.make.core.makefile.ICommand; + /** * Makefile : ( statement ) * * statement : command | .. diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Comment.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Comment.java index 3165326e448..e5e4f7c68f2 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Comment.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Comment.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IComment; + public class Comment extends Directive implements IComment { String comment; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Conditional.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Conditional.java index 1d147b0dd25..dbe6675f228 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Conditional.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Conditional.java @@ -11,6 +11,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.IConditional; public abstract class Conditional extends Parent implements IConditional { diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/DefaultRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/DefaultRule.java index 76d9880ec72..45d7e7ba9ae 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/DefaultRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/DefaultRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IDefaultRule; + /** * .DEFAULT * If the makefile uses this special target, the application shall ensure that it is diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/DeleteOnErrorRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/DeleteOnErrorRule.java index 3f550161de0..fbd8e1315f4 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/DeleteOnErrorRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/DeleteOnErrorRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.IDeleteOnErrorRule; + /** * .DELETE_ON_ERROR * If `.DELETE_ON_ERROR' is mentioned as a target anywhere in the diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Directive.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Directive.java index d069b4597d6..6e06c7944fd 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Directive.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Directive.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IMakefile; + public abstract class Directive implements IDirective { int endLine; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Else.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Else.java index 9bf9d4a5d46..a674221fd10 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Else.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Else.java @@ -13,6 +13,8 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.File; +import org.eclipse.cdt.make.core.makefile.ICommand; + public class Else extends Conditional implements IAutomakeConditional, ICommand { private boolean isAutomake; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/EmptyLine.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/EmptyLine.java index 814094fe1f0..6008a9803b1 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/EmptyLine.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/EmptyLine.java @@ -11,6 +11,8 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IEmptyLine; + public class EmptyLine extends Directive implements IEmptyLine { final public static char NL = '\n'; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ExportAllVariablesRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ExportAllVariablesRule.java index 4fcb3b60ee3..03bbc423cb2 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ExportAllVariablesRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ExportAllVariablesRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.IExportAllVariablesRule; + /** * .EXPORT_ALL_VARIABLES * Simply by being mentioned as a target, this tells `make' to export diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUAutomakefile.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUAutomakefile.java index 65ab06d1c8f..9164598d68d 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUAutomakefile.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUAutomakefile.java @@ -27,6 +27,11 @@ import java.util.StringTokenizer; import org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin; import org.eclipse.cdt.make.core.MakeCorePlugin; +import org.eclipse.cdt.make.core.makefile.IAutomaticVariable; +import org.eclipse.cdt.make.core.makefile.IBuiltinFunction; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.core.makefile.gnu.IGNUMakefile; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileInfo; import org.eclipse.core.filesystem.IFileStore; @@ -893,9 +898,6 @@ public class GNUAutomakefile extends AbstractMakefile implements IGNUMakefile { return list.toArray(new IDirective[list.size()]); } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.autotools.ui.editors.automake.AbstractMakefile#getBuiltins() - */ @Override public IDirective[] getBuiltins() { if (builtins == null) { @@ -985,4 +987,14 @@ public class GNUAutomakefile extends AbstractMakefile implements IGNUMakefile { } } + @Override + public IBuiltinFunction[] getBuiltinFunctions() { + return new IBuiltinFunction[0]; + } + + @Override + public IAutomaticVariable[] getAutomaticVariables() { + return new IAutomaticVariable[0]; + } + } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUTargetRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUTargetRule.java index 38e383ce360..619e030f544 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUTargetRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUTargetRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.ICommand; + /** */ public class GNUTargetRule extends TargetRule { diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUVariableDef.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUVariableDef.java index 7c38994109c..c1d4b701d3e 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUVariableDef.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/GNUVariableDef.java @@ -11,6 +11,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.IVariableDefinition; + /** */ public class GNUVariableDef extends MacroDefinition implements IVariableDefinition { diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IArchiveTarget.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IArchiveTarget.java deleted file mode 100644 index 9a2b555e967..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IArchiveTarget.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * IArchiveTarget - * Archive files, are files maintained by the program "ar". - * They contain objects, the members of the Archive. - * For example: - * foolib(hack.o) : hack.o - * ar cr foolib hack.o - * ArchiveTarget(member) -- foolib(hack.o); - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IArchiveTarget extends ITarget { - - /** - * Returns the members the point by archive target. - * @return String - */ - String[] getMembers(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IBadDirective.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IBadDirective.java deleted file mode 100644 index c7c5b914346..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IBadDirective.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * Represent an error in the makefile syntax - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IBadDirective { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ICommand.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ICommand.java deleted file mode 100644 index c78bbb77ede..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ICommand.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -import java.io.File; -import java.io.IOException; - - -/** - * ICommand - * Commands are associated with a rule and executed by - * the make program when building a target. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ICommand extends IDirective { - - char HYPHEN = '-'; - - String HYPHEN_STRING = "-"; //$NON-NLS-1$ - - char AT = '@'; - - String AT_STRING = "@"; //$NON-NLS-1$ - - char PLUS = '+'; - - String PLUS_STRING = "+"; //$NON-NLS-1$ - - char TAB = '\t'; - - /** - * - If the command prefix contains a hyphen, or the -i option is - * present, or the special target .IGNORE has either the current - * target as a prerequisite or has no prerequisites, any error - * found while executing the command will be ignored. - */ - boolean shouldIgnoreError(); - - /** - * @ If the command prefix contains an at sign and the - * command-line -n option is not specified, or the -s option is - * present, or the special target .SILENT has either the current - * target as a prerequisite or has no prerequisites, the command - * will not be written to standard output before it is executed. - */ - boolean shouldBeSilent(); - - /** - * + If the command prefix contains a plus sign, this indicates a - * command line that will be executed even if -n, -q or -t is - * specified. - */ - boolean shouldExecute(); - - - /** - * Executes the command in a separate process with the - * specified environment and working directory. - * - */ - Process execute(String shell, String[] envp, File dir) throws IOException; -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IComment.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IComment.java deleted file mode 100644 index 40286b48853..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IComment.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * Comments start with '#' and until the end of the line. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IComment extends IDirective { - - char POUND = '#'; - - String POUND_STRING = "#"; //$NON-NLS-1$ - -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IConditional.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IConditional.java deleted file mode 100644 index f1be19b3676..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IConditional.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IConditional extends IDirective { - - String getConditional(); - - String getArg1(); - - String getArg2(); - - boolean isIfdef(); - - boolean isIfndef(); - - boolean isIfeq(); - - boolean isIfneq(); - - boolean isElse(); - -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IDefaultRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IDefaultRule.java deleted file mode 100644 index f44c04c7589..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IDefaultRule.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .DEFAULT - * If the makefile uses this special target, the application shall ensure that it is - * specified with commands, but without prerequisites. - * The commands shall be used by make if there are no other rules available to build a target. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IDefaultRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IDeleteOnErrorRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IDeleteOnErrorRule.java deleted file mode 100644 index 09ee9daf9b5..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IDeleteOnErrorRule.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .DELETE_ON_ERROR' - * If `.DELETE_ON_ERROR' is mentioned as a target anywhere in the - * makefile, then `make' will delete the target of a rule if it has - * changed and its commands exit with a nonzero exit status, just as - * it does when it receives a signal. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IDeleteOnErrorRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IDirective.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IDirective.java deleted file mode 100644 index a58a108e640..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IDirective.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * A Makefile can contain rules, macro definitons and comments. - * They are call directives. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IDirective { - - /** - * @return the parent of this directive, null if none. - */ - IDirective getParent(); - - /** - * @return the starting line number of this directive. - * The numbering starts at 1 .i.e the first line is not 0 - */ - int getStartLine(); - - /** - * @return the ending line number of this directive. - * The numbering starts at 1 .i.e the first line is not 0 - */ - int getEndLine(); - - /** - * Returns the makefile where the directive was found. - * - * @return IMakefile - */ - IMakefile getMakefile(); - - @Override - String toString(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IEmptyLine.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IEmptyLine.java deleted file mode 100644 index ea7e67df764..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IEmptyLine.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * IEmptyLine - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IEmptyLine extends IDirective { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IExportAllVariablesRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IExportAllVariablesRule.java deleted file mode 100644 index 681b82d8823..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IExportAllVariablesRule.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .EXPORT_ALL_VARIABLES - * Simply by being mentioned as a target, this tells `make' to export - * all variables to child processes by default. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IExportAllVariablesRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IGNUMakefile.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IGNUMakefile.java deleted file mode 100644 index 505710cd254..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IGNUMakefile.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IGNUMakefile extends IMakefile { - - /** - * Set the search include directories for the - * "include" directive - */ - void setIncludeDirectories(String[] paths); - - /** - * @return the include directories search paths. - */ - String[] getIncludeDirectories(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IIgnoreRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IIgnoreRule.java deleted file mode 100644 index a367a321a9d..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IIgnoreRule.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .IGNORE - * Prerequisites of this special target are targets themselves; this shall cause errors - * from commands associated with them to be ignored in the same manner as specified by the -i option. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IIgnoreRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IInclude.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IInclude.java deleted file mode 100644 index adf50b70f19..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IInclude.java +++ /dev/null @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IInclude extends IParent { - String[] getFilenames(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IInferenceRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IInferenceRule.java deleted file mode 100644 index 54163f56299..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IInferenceRule.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * IInferenceRules are formated as follows: - * target: - * command - * [command] - * - * The target is of the form .s2 or .s1.s2 - * There are no prerequisites. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IInferenceRule extends IRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IIntermediateRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IIntermediateRule.java deleted file mode 100644 index b0c6d21564a..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IIntermediateRule.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .INTERMEDIATE - * The targets which `.INTERMEDIATE' depends on are treated as intermediate files. - * `.INTERMEDIATE' with no prerequisites has no effect. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IIntermediateRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ILowResolutionTimeRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ILowResolutionTimeRule.java deleted file mode 100644 index 836e09287c9..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ILowResolutionTimeRule.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .LOW_RESOLUTION_TIME - * If you specify prerequisites for `.LOW_RESOLUTION_TIME', `make' - * assumes that these files are created by commands that generate low - * resolution time stamps. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ILowResolutionTimeRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMacroDefinition.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMacroDefinition.java deleted file mode 100644 index f4a99738efa..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMacroDefinition.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * IMacroDefinitions are in the form: - * string1 = [string2] - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IMacroDefinition extends IDirective { - - /** - * @return the name of the macro - */ - String getName(); - - /** - * @return the value of the macro - */ - StringBuffer getValue(); - - /** - * @return the macro is a built-in - */ - boolean isFromDefault(); - - /** - * @return the macro was found in a Makefile. - * - */ - boolean isFromMakefile(); - - /** - * @return the macro came from the environment. - */ - boolean isFromEnviroment(); - - /** - * The macro came from the make command option -e - */ - boolean isFromEnvironmentOverride(); - - /** - * @return the macro was pass from an option to make. - */ - boolean isFromCommand(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefile.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefile.java deleted file mode 100644 index 585aea80085..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefile.java +++ /dev/null @@ -1,138 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -import java.io.IOException; -import java.io.Reader; -import java.net.URI; - - -/** - * IMakefile: - * - * Makefile : ( directive ) * - * directive : rule | macro_definition | comments | empty - * rule : inference_rule | target_rule | special_rule - * inference_rule : target ':' [ ';' command ] - * [ ( command ) * ] - * target_rule : [ ( target ) + ] ':' [ ( prerequisite ) * ] [ ';' command ] - * [ ( command ) * ] - * macro_definition : string '=' ( string )* - * comments : ('#' ( string ) ) * - * empty : - * command : prefix_command string - * target : string - * prefix_command : '-' | '@' | '+' - * internal_macro : "$<" | "$*" | "$@" | "$?" | "$%" - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IMakefile extends IParent { - - /** - * ITargetRule | IInferenceRule | ISpecialRule - */ - IRule[] getRules(); - - /** - * @return the IRule for target. - */ - IRule[] getRules(String target); - - /** - * @return IInferenceRule - * - */ - IInferenceRule[] getInferenceRules(); - - /** - * @return the IInferenceRules for target. - */ - IInferenceRule[] getInferenceRules(String target); - - /** - * @return ITargetRule - */ - ITargetRule[] getTargetRules(); - - /** - * @return the ITargetRules for name. - */ - ITargetRule[] getTargetRules(String target); - - /** - * @return the IMacroDefinitions. - */ - IMacroDefinition[] getMacroDefinitions(); - - /** - * @return the IMacroDefinitions for name. - */ - IMacroDefinition[] getMacroDefinitions(String name); - - /** - * @return all the built-in directives. - */ - IDirective[] getBuiltins(); - - /** - * @return all the built-in MacroDefintions - */ - IMacroDefinition[] getBuiltinMacroDefinitions(); - - /** - * @return the built-in macro definition for name. - */ - IMacroDefinition[] getBuiltinMacroDefinitions(String name); - - /** - * @return line after expanding any macros. - */ - String expandString(String line); - - /** - * @return line after expanding any macros. - * - * @param line - line to expand - * @param recursive - if true recursively expand. - */ - String expandString(String line, boolean recursive); - - /** - * @return the makefile Reader provider used to create this makefile or null - */ - IMakefileReaderProvider getMakefileReaderProvider(); - - /** - * Clear all statements and (re)parse the Makefile - */ - void parse(String filePath, Reader makefile) throws IOException; - - /** - * Clear all statements and (re)parse the Makefile - */ - void parse(URI fileURI, Reader makefile) throws IOException; - - /** - * Clear the all statements and (re)parse the Makefile - * using the given makefile Reader provider - * - * @param makefileReaderProvider provider, or null to use a FileReader - */ - void parse(URI fileURI, IMakefileReaderProvider makefileReaderProvider) throws IOException; - - - /** - * @return the URI of this makefile - */ - URI getFileURI(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileDocumentProvider.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileDocumentProvider.java index 4b204c475fb..6880dd9d4a0 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileDocumentProvider.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileDocumentProvider.java @@ -12,6 +12,7 @@ */ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IMakefile; import org.eclipse.ui.texteditor.IDocumentProvider; /** diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileReaderProvider.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileReaderProvider.java deleted file mode 100644 index 9d4626104bb..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileReaderProvider.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2010 Nokia and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Nokia (Ed Swartz) - initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -import java.io.IOException; -import java.io.Reader; -import java.net.URI; - -/** - * Provide an abstraction to loading the contents of a makefile - * @author eswartz - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IMakefileReaderProvider { - /** - * Get a reader for the contents of the file at filename. - * @param fileURI the file to read. It's up to the implementation how to read - * it, but usually EFS.getFileStore(fileURI).getInputStream(...) is the best bet. - * @return Reader a reader for the contents of the existing file - * @throws IOException if the file cannot be found according to the implementation - */ - Reader getReader(URI fileURI) throws IOException; -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileValidator.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileValidator.java deleted file mode 100644 index 1e1cea553ac..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IMakefileValidator.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -import org.eclipse.cdt.core.IMarkerGenerator; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IProgressMonitor; - -/** - * @author alain - * - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IMakefileValidator { - void setMarkerGenerator(IMarkerGenerator errorHandler); - - void checkFile(IFile file, IProgressMonitor monitor); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/INotParallelRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/INotParallelRule.java deleted file mode 100644 index 0ca249712b1..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/INotParallelRule.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .NOTPARALLEL - * If `.NOTPARALLEL' is mentioned as a target, then this invocation of - * `make' will be run serially, even if the `-j' option is given. - * Any recursively invoked `make' command will still be run in - * parallel (unless its makefile contains this target). Any - * prerequisites on this target are ignored. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface INotParallelRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IParent.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IParent.java deleted file mode 100644 index 9182adb5964..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IParent.java +++ /dev/null @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IParent extends IDirective { - IDirective[] getDirectives(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IPhonyRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IPhonyRule.java deleted file mode 100644 index b11f5484692..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IPhonyRule.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .PHONY - * The prerequisites of the special target `.PHONY' are considered to be phony targets. - * When it is time to consider such a target, `make' will run its commands unconditionally, regardless of - * whether a file with that name exists or what its last-modification time is. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IPhonyRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IPosixRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IPosixRule.java deleted file mode 100644 index 404498a0a1b..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IPosixRule.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .POSIX - * The application shall ensure that this special target is specified without - * prerequisites or commands. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IPosixRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IPreciousRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IPreciousRule.java deleted file mode 100644 index ef0fa1a1aa8..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IPreciousRule.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .PRECIOUS - * Prerequisites of this special target shall not be removed if make recieves an - * asynchronous events. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IPreciousRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IRule.java deleted file mode 100644 index ed300035952..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IRule.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * There are several kinds of rules: Inference rules, target rules - * Some make provides special rules for example: - * .DEFAULT, .IGNORE etc ... - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IRule extends IParent { - /** - * @return Array of command for the rule. - */ - ICommand[] getCommands(); - - /** - * @return The rule target name. - * - */ - ITarget getTarget(); - -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISccsGetRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISccsGetRule.java deleted file mode 100644 index 647d5801ef4..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISccsGetRule.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .SCCS_GET - * The application shall ensure that this special target is specified without prerequesites. - * The commands specified with this target shall replace the default - * commands associated with this special target. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISccsGetRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISecondaryRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISecondaryRule.java deleted file mode 100644 index 59c8f6abb97..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISecondaryRule.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .SECONDARY - * The targets which `.SECONDARY' depends on are treated as - * intermediate files, except that they are never automatically deleted. - * - * `.SECONDARY' with no prerequisites causes all targets to be treated - * as secondary (i.e., no target is removed because it is considered intermediate). - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISecondaryRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISilentRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISilentRule.java deleted file mode 100644 index de830bb9ba2..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISilentRule.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .SILENT - * Prerequisites of this special target are targets themselves; this shall case - * commands associated with them not to be written to the standard output before - * they are executed. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISilentRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISpecialRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISpecialRule.java deleted file mode 100644 index 4ec637b442b..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISpecialRule.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * Target rule that have special meaning for Make. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISpecialRule extends IRule { - - /** - * The meaning of the prerequistes are specific to - * each rules. - */ - String[] getPrerequisites(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISuffixesRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISuffixesRule.java deleted file mode 100644 index 3e9c822a900..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ISuffixesRule.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * .SUFFIXES - * Prerequesites of .SUFFIXES shall be appended to the list of known suffixes and are - * used in conjunction with the inference rules. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ISuffixesRule extends ISpecialRule { -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ITarget.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ITarget.java deleted file mode 100644 index 6ea0e1bfc37..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ITarget.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ITarget { - - @Override - String toString(); - -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ITargetRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ITargetRule.java deleted file mode 100644 index ff803b1a873..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ITargetRule.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ITargetRule extends IRule { - - String[] getPrerequisites(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ITerminal.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ITerminal.java deleted file mode 100644 index 38625a517c5..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ITerminal.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * ITerminal finish a block. - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface ITerminal extends IDirective { - - boolean isEndef(); - - boolean isEndif(); - -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IUnExport.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IUnExport.java deleted file mode 100644 index bfae468441c..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IUnExport.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IUnExport extends IDirective { - - String getVariable(); -} - diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IVPath.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IVPath.java deleted file mode 100644 index ebb6c0e2777..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IVPath.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IVPath extends IDirective { - - String[] getDirectories(); - - String getPattern(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IVariableDefinition.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IVariableDefinition.java deleted file mode 100644 index 0a36672db10..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IVariableDefinition.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -/** - */ -/** - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IVariableDefinition extends IMacroDefinition { - - boolean isRecursivelyExpanded(); - - boolean isSimplyExpanded(); - - boolean isConditional(); - - boolean isAppend(); - - boolean isTargetSpecific(); - - boolean isExport(); - - boolean isMultiLine(); - - /** - * Variable from an `override' directive. - */ - boolean isOverride(); - - /** - * Automatic variable -- cannot be set. - */ - boolean isAutomatic(); - String getTarget(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IWorkingCopyManager.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IWorkingCopyManager.java deleted file mode 100644 index 521c8a058d1..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IWorkingCopyManager.java +++ /dev/null @@ -1,75 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.ui.IEditorInput; - -/** - * Interface for accessing working copies of IMakefile - * objects. The original unit is only given indirectly by means - * of an IEditorInput. The life cycle is as follows: - *
    - *
  • connect creates and remembers a working copy of the - * unit which is encoded in the given editor input
    • - *
  • getWorkingCopy returns the working copy remembered on - * connect
    • - *
  • disconnect destroys the working copy remembered on - * connect
    • - *
- *

- * This interface is not intended to be implemented by clients. - *

- * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IWorkingCopyManager { - - /** - * Connects the given editor input to this manager. After calling - * this method, a working copy will be available for the compilation unit encoded - * in the given editor input (does nothing if there is no encoded compilation unit). - * - * @param input the editor input - * @exception CoreException if the working copy cannot be created for the - * unit - */ - void connect(IEditorInput input) throws CoreException; - - /** - * Disconnects the given editor input from this manager. After calling - * this method, a working copy for the compilation unit encoded - * in the given editor input will no longer be available. Does nothing if there - * is no encoded compilation unit, or if there is no remembered working copy for - * the compilation unit. - * - * @param input the editor input - */ - void disconnect(IEditorInput input); - - /** - * Returns the working copy remembered for the compilation unit encoded in the - * given editor input. - * - * @param input the editor input - * @return the working copy of the compilation unit, or null if the - * input does not encode an editor input, or if there is no remembered working - * copy for this compilation unit - */ - IMakefile getWorkingCopy(IEditorInput input); - - /** - * Shuts down this working copy manager. All working copies still remembered - * by this manager are destroyed. - */ - void shutdown(); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IWorkingCopyManagerExtension.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IWorkingCopyManagerExtension.java deleted file mode 100644 index 21b03b562b7..00000000000 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IWorkingCopyManagerExtension.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.autotools.ui.editors.automake; - -import org.eclipse.ui.IEditorInput; - -/** - * Extension interface for IWorkingCopyManager. - * @since 2.1 - * - * @noextend This class is not intended to be subclassed by clients. - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IWorkingCopyManagerExtension { - - /** - * Sets the given working copy for the given editor input. If the given editor input - * is not connected to this working copy manager, this call has no effect.

- * This working copy manager does not assume the ownership of this working copy, i.e., - * the given working copy is not automatically be freed when this manager is shut down. - * - * @param input the editor input - * @param workingCopy the working copy - */ - void setWorkingCopy(IEditorInput input, IMakefile workingCopy); - - /** - * Removes the working copy set for the given editor input. If there is no - * working copy set for this input or this input is not connected to this - * working copy manager, this call has no effect. - * - * @param input the editor input - */ - void removeWorkingCopy(IEditorInput input); -} diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/If.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/If.java index d2fcf4a0a7a..8fcf4f64fef 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/If.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/If.java @@ -13,6 +13,8 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.File; +import org.eclipse.cdt.make.core.makefile.ICommand; + public class If extends Conditional implements IAutomakeConditional, ICommand { private static final String EMPTY = ""; //$NON-NLS-1$ private Rule rules[] = null; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IgnoreRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IgnoreRule.java index 8739dc76d1b..1f89bb70f4d 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IgnoreRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IgnoreRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IIgnoreRule; + /** * .IGNORE * Prerequisites of this special target are targets themselves; this shall cause errors diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Include.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Include.java index 6fe507d9419..f72c1a5d5c4 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Include.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Include.java @@ -12,6 +12,9 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.IOException; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.gnu.IInclude; + public class Include extends Parent implements IInclude { String[] filenames; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/InferenceRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/InferenceRule.java index c8645470e84..40775430649 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/InferenceRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/InferenceRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.ICommand; + public class InferenceRule extends Rule { public InferenceRule(Directive parent, Target target) { diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IntermediateRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IntermediateRule.java index 0d7d5acedc0..acbd3572754 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IntermediateRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/IntermediateRule.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.IIntermediateRule; /** * .INTERMEDIATE diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/LowResolutionTimeRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/LowResolutionTimeRule.java index d425208b113..ba2e83a0736 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/LowResolutionTimeRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/LowResolutionTimeRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.ILowResolutionTimeRule; + /** * .LOW_RESOLUTION_TIME' * If you specify prerequisites for `.LOW_RESOLUTION_TIME', `make' diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MacroDefinition.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MacroDefinition.java index dfde4b2955a..e115770e17d 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MacroDefinition.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MacroDefinition.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IMacroDefinition; + /** */ public class MacroDefinition extends Directive implements IMacroDefinition { diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileCompletionProcessor.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileCompletionProcessor.java index ec7f537616f..1b831e9a485 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileCompletionProcessor.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileCompletionProcessor.java @@ -16,6 +16,11 @@ import java.util.Arrays; import java.util.Comparator; import org.eclipse.cdt.internal.autotools.ui.MakeUIImages; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IMacroDefinition; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.core.makefile.IRule; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.TextPresentation; import org.eclipse.jface.text.contentassist.CompletionProposal; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileContentOutlinePage.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileContentOutlinePage.java index 768f3e4ab7c..1a848e8a0de 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileContentOutlinePage.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileContentOutlinePage.java @@ -16,6 +16,20 @@ import java.util.List; import org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin; import org.eclipse.cdt.internal.autotools.ui.MakeUIImages; +import org.eclipse.cdt.make.core.makefile.IBadDirective; +import org.eclipse.cdt.make.core.makefile.ICommand; +import org.eclipse.cdt.make.core.makefile.IComment; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IEmptyLine; +import org.eclipse.cdt.make.core.makefile.IInferenceRule; +import org.eclipse.cdt.make.core.makefile.IMacroDefinition; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.core.makefile.IParent; +import org.eclipse.cdt.make.core.makefile.IRule; +import org.eclipse.cdt.make.core.makefile.ITargetRule; +import org.eclipse.cdt.make.core.makefile.gnu.IInclude; +import org.eclipse.cdt.make.core.makefile.gnu.ITerminal; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileDocumentProvider.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileDocumentProvider.java index 34e6c69b1e8..763884e8979 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileDocumentProvider.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileDocumentProvider.java @@ -13,6 +13,7 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.util.Iterator; +import org.eclipse.cdt.make.core.makefile.IMakefile; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileEditor.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileEditor.java index 59966a185ca..54c8243c4ea 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileEditor.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileEditor.java @@ -17,6 +17,7 @@ import java.util.ResourceBundle; import org.eclipse.cdt.autotools.core.AutotoolsPlugin; import org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin; import org.eclipse.cdt.internal.autotools.ui.MakeUIMessages; +import org.eclipse.cdt.make.core.makefile.IDirective; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.ListenerList; import org.eclipse.jface.action.IAction; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileReconcilingStrategy.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileReconcilingStrategy.java index 7483074ab94..5544178ed6b 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileReconcilingStrategy.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileReconcilingStrategy.java @@ -15,6 +15,8 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.IOException; import java.io.StringReader; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.reconciler.DirtyRegion; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileTextHover.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileTextHover.java index 631d259e467..29a89889a03 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileTextHover.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileTextHover.java @@ -12,6 +12,9 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IMacroDefinition; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextHover; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/NotParallelRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/NotParallelRule.java index 54c77ccbcda..f230eb14a5c 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/NotParallelRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/NotParallelRule.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.INotParallelRule; /** * .NOTPARALLEL diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/NullMakefile.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/NullMakefile.java index 23d899e09c1..83ff1fd542a 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/NullMakefile.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/NullMakefile.java @@ -13,6 +13,10 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.Reader; import java.net.URI; +import org.eclipse.cdt.make.core.makefile.IAutomaticVariable; +import org.eclipse.cdt.make.core.makefile.IBuiltinFunction; +import org.eclipse.cdt.make.core.makefile.IDirective; + /** * Makefile : ( statement ) * * statement : rule | macro_definition | comments | empty @@ -65,4 +69,14 @@ public class NullMakefile extends AbstractMakefile { protected void parse(URI fileURI, MakefileReader reader) { } + + @Override + public IBuiltinFunction[] getBuiltinFunctions() { + return new IBuiltinFunction[0]; + } + + @Override + public IAutomaticVariable[] getAutomaticVariables() { + return new IAutomaticVariable[0]; + } } diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/OpenDeclarationAction.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/OpenDeclarationAction.java index 6f2a9346e79..6cab9e00142 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/OpenDeclarationAction.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/OpenDeclarationAction.java @@ -16,6 +16,9 @@ import java.net.URI; import org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin; import org.eclipse.cdt.core.resources.FileStorage; import org.eclipse.cdt.internal.autotools.ui.MakeUIMessages; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.core.filesystem.URIUtil; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IStorage; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Parent.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Parent.java index 378698c336e..b324f63b1bd 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Parent.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Parent.java @@ -13,6 +13,9 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.util.ArrayList; import java.util.Arrays; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IParent; + /** * IParent */ diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PhonyRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PhonyRule.java index 45f02ff08b7..de6556fa234 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PhonyRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PhonyRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.IPhonyRule; + /** * .PHONY * The prerequisites of the special target `.PHONY' are considered to be phony targets. diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PosixRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PosixRule.java index 803cc5b1cf6..2870fc1f944 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PosixRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PosixRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IPosixRule; + /** * .POSIX * The appliation shall ensure that this special target is specified without diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PreciousRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PreciousRule.java index 2e031a8b0d5..a7a7359d529 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PreciousRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/PreciousRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.IPreciousRule; + /** * .PRECIOUS * Prerequisites of this special target shall not be removed if make recieves an diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ProjectionMakefileUpdater.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ProjectionMakefileUpdater.java index ef264e7eb70..8ea06ec2d5b 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ProjectionMakefileUpdater.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ProjectionMakefileUpdater.java @@ -19,6 +19,12 @@ import java.util.List; import java.util.Map; import org.eclipse.cdt.autotools.core.AutotoolsPlugin; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IMacroDefinition; +import org.eclipse.cdt.make.core.makefile.IParent; +import org.eclipse.cdt.make.core.makefile.IRule; +import org.eclipse.cdt.make.core.makefile.gnu.IConditional; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Rule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Rule.java index 3ebf0b87f73..0d757885590 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Rule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Rule.java @@ -12,6 +12,11 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.util.ArrayList; +import org.eclipse.cdt.make.core.makefile.ICommand; +import org.eclipse.cdt.make.core.makefile.IDirective; +import org.eclipse.cdt.make.core.makefile.IRule; +import org.eclipse.cdt.make.core.makefile.ITarget; + public abstract class Rule extends Parent implements IRule { Target target; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SccsGetRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SccsGetRule.java index 465c4a2d0e2..077d422e992 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SccsGetRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SccsGetRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.ISccsGetRule; + /** * .SCCS_GET * The application shall ensure that this special target is specified without diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SecondaryRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SecondaryRule.java index af753c0f0d9..ba711c0d81e 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SecondaryRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SecondaryRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.ISecondaryRule; + /** * .SECONDARY * The targets which `.SECONDARY' depends on are treated as diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SilentRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SilentRule.java index c706e36899e..9d86c71aed4 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SilentRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SilentRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.ISilentRule; + /** * .SILENT * Prerequisties of this special target are targets themselves; this shall cause diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SpecialRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SpecialRule.java index b0b9005da2c..a4fd5a9068b 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SpecialRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SpecialRule.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.ICommand; +import org.eclipse.cdt.make.core.makefile.ISpecialRule; + /** * Targets that have special meaning for Make. */ diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/StaticTargetRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/StaticTargetRule.java index a15e3d3caab..5707670c5d7 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/StaticTargetRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/StaticTargetRule.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.ICommand; +import org.eclipse.cdt.make.core.makefile.IInferenceRule; + /** * Here is the syntax of a static pattern rule: * diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SuffixesRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SuffixesRule.java index f61990318fc..ea92b4e95a9 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SuffixesRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SuffixesRule.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.ISuffixesRule; + /** * .SUFFIXES * Prerequisites of .SUFFIXES shall be appended to the list of known suffixes and are diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Target.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Target.java index 30acadfbbe1..fa7b3bfc5b6 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Target.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Target.java @@ -12,6 +12,8 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.io.File; +import org.eclipse.cdt.make.core.makefile.ITarget; + public class Target implements ITarget { String target; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/TargetRule.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/TargetRule.java index 2f184bbc38b..213e389f929 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/TargetRule.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/TargetRule.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.ICommand; +import org.eclipse.cdt.make.core.makefile.ITargetRule; + /** * Makefile : ( statement ) * * statement : rule | macro_definition | comments | empty diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Terminal.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Terminal.java index 8df03a19b1e..b5af43c19a3 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Terminal.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/Terminal.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.ITerminal; + public abstract class Terminal extends Directive implements ITerminal { public Terminal(Directive parent) { diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/UnExport.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/UnExport.java index a8d87e40794..45b40c2b64d 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/UnExport.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/UnExport.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.IUnExport; + public class UnExport extends Directive implements IUnExport { String variable; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/VPath.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/VPath.java index 2aa1b4e9822..7111da441c2 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/VPath.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/VPath.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.IVPath; + public class VPath extends Directive implements IVPath { String pattern; diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/VariableDefinition.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/VariableDefinition.java index 213e189eb2b..1e36175668e 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/VariableDefinition.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/VariableDefinition.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.editors.automake; +import org.eclipse.cdt.make.core.makefile.gnu.IVariableDefinition; + /** */ public class VariableDefinition extends MacroDefinition implements IVariableDefinition { diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/WorkingCopyManager.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/WorkingCopyManager.java index 2ea5cbb4d52..e799469ffe4 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/WorkingCopyManager.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/WorkingCopyManager.java @@ -15,6 +15,9 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.make.core.makefile.IMakefile; +import org.eclipse.cdt.make.ui.IWorkingCopyManager; +import org.eclipse.cdt.make.ui.IWorkingCopyManagerExtension; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.IEditorInput;