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

Bug 505882: Drop internal IManagedBuildGnuToolInfo interface

Browse source 
The interface has no use as it's hardcoded to be an instance of
ManagedBuildGnuToolInfo in the GnuMakefileGenerator anyway.

Contributed by STMicroelectronics

Change-Id: I0e9130ef485d103e7114e0d122015c062253b4bb
Signed-off-by: Torbjörn Svensson <torbjorn.svensson@st.com>
This commit is contained in:
Torbjörn Svensson 2021-10-22 12:12:18 +02:00
parent 81a85f8ae9
commit 38d45364cf
3 changed files with 3 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/GnuMakefileGenerator.java
View file

@ -1909,7 +1909,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
ManagedBuildGnuToolInfo[] gnuToolInfos = h.gnuToolInfos;
// Get the information regarding the tool's inputs and outputs from the objects
// created by calculateToolInputsOutputs
IManagedBuildGnuToolInfo toolInfo = null;
ManagedBuildGnuToolInfo toolInfo = null;
for (int i = 0; i < buildTools.length; i++) {
if (tool == buildTools[i]) {
toolInfo = gnuToolInfos[i];

128
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/IManagedBuildGnuToolInfo.java
View file

@ -1,128 +0,0 @@
/*******************************************************************************
* Copyright (c) 2005, 2010 Intel Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Intel Corporation - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.makegen.gnu2;
import java.util.Vector;
/**
* This interface returns information about a Tool's inputs
* and outputs while a Gnu makefile is being generated.
*
* @noextend This class is not intended to be subclassed by clients.
* @noimplement This interface is not intended to be implemented by clients.
*/
public interface IManagedBuildGnuToolInfo {
public final String DOT = "."; //$NON-NLS-1$
/**
* Returns <code>true</code> if the tool's inputs have been calculated,
* else <code>false</code>.
*
* @return boolean
*/
public boolean areInputsCalculated();
/**
* Returns the tool's inputs in command line format. This will use
* variables rather than actual file names as appropriate.
*
* @return Vector
*/
public Vector<String> getCommandInputs();
/**
* Returns the raw list of tool's input file names.
*
* @return Vector
*/
public Vector<String> getEnumeratedInputs();
/**
* Returns <code>true</code> if the tool's outputs have been calculated,
* else <code>false</code>.
*
* @return boolean
*/
public boolean areOutputsCalculated();
/**
* Returns the tool's outputs in command line format. This will use
* variables rather than actual file names as appropriate.
*
* @return Vector
*/
public Vector<String> getCommandOutputs();
/**
* Returns the raw list of tool's primary output file names.
*
* @return Vector
*/
public Vector<String> getEnumeratedPrimaryOutputs();
/**
* Returns the raw list of tool's secondary output file names.
*
* @return Vector
*/
public Vector<String> getEnumeratedSecondaryOutputs();
/**
* Returns the raw list of tool's output variable names.
*
* @return Vector
*/
public Vector<String> getOutputVariables();
/**
* Returns <code>true</code> if the tool's dependencies have been calculated,
* else <code>false</code>.
*
* @return boolean
*/
public boolean areDependenciesCalculated();
/**
* Returns the tool's dependencies in command line format. This will use
* variables rather than actual file names as appropriate.
* Dependencies are top build directory relative.
*
* @return Vector
*/
public Vector<String> getCommandDependencies();
/**
* Returns the tool's additional targets as determined by the
* dependency calculator.
* Additional targets are top build directory relative
*
* @return Vector
*/
public Vector<String> getAdditionalTargets();
/**
* Returns the raw list of tool's input dependencies.
*
* @return Vector
*/
//public Vector<String> getEnumeratedDependencies();
/**
* Returns <code>true</code> if this is the target tool
* else <code>false</code>.
*
* @return boolean
*/
public boolean isTargetTool();
}

18
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu2/ManagedBuildGnuToolInfo.java
View file

@ -56,7 +56,8 @@ import org.eclipse.core.runtime.Path;
*
* @noextend This class is not intended to be subclassed by clients.
*/
public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo {
public class ManagedBuildGnuToolInfo {
public final String DOT = "."; //$NON-NLS-1$
/*
* Members
@ -94,48 +95,37 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo {
}
}
/*
* IManagedBuildGnuToolInfo Methods
*/
@Override
public boolean areInputsCalculated() {
return inputsCalculated;
}
// Command inputs are top build directory relative
@Override
public Vector<String> getCommandInputs() {
return commandInputs;
}
// Enumerated inputs are project relative
@Override
public Vector<String> getEnumeratedInputs() {
return enumeratedInputs;
}
@Override
public boolean areOutputsCalculated() {
return outputsCalculated;
}
// Command outputs are top build directory relative
@Override
public Vector<String> getCommandOutputs() {
return commandOutputs;
}
@Override
public Vector<String> getEnumeratedPrimaryOutputs() {
return enumeratedPrimaryOutputs;
}
@Override
public Vector<String> getEnumeratedSecondaryOutputs() {
return enumeratedSecondaryOutputs;
}
@Override
public Vector<String> getOutputVariables() {
return outputVariables;
}
@ -144,19 +134,16 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo {
return outputVariablesCalculated;
}
@Override
public boolean areDependenciesCalculated() {
return dependenciesCalculated;
}
// Command dependencies are top build directory relative
@Override
public Vector<String> getCommandDependencies() {
return commandDependencies;
}
// Additional targets are top build directory relative
@Override
public Vector<String> getAdditionalTargets() {
return additionalTargets;
}
@ -165,7 +152,6 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo {
// return enumeratedDependencies;
//}
@Override
public boolean isTargetTool() {
return bIsTargetTool;
}