mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 17:25:38 +02:00
Code Issues Wiki Activity

Bug 505882: Remove deprecated functions

Browse source 
Contributed by STMicroelectronics

Change-Id: Ib811a02cc97ee8afd2343b82b1c7e2e76f9ed0e6
Signed-off-by: Torbjörn Svensson <torbjorn.svensson@st.com>
This commit is contained in:
Torbjörn Svensson 2021-10-22 08:19:20 +02:00
parent a6808f07ab
commit 81a85f8ae9
1 changed files with 10 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -498,7 +498,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
}
}
if (callPopulateDummyTargets) {
populateDummyTargets(rcInfo, depFile, force);
generateDummyTargets(rcInfo, depFile, force);
}
} catch (CoreException e) {
throw e;
@ -1036,7 +1036,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
// Master list of "object" dependencies, i.e. dependencies between input files and output files.
StringBuffer macroBuffer = new StringBuffer();
List<String> valueList;
macroBuffer.append(addDefaultHeader());
macroBuffer.append(addGenericHeader());
// Map of macro names (String) to its definition (List of Strings)
HashMap<String, List<String>> outputMacros = new HashMap<>();
@ -1088,7 +1088,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
protected void populateSourcesMakefile(IFile fileHandle) throws CoreException {
// Add the comment
StringBuffer buffer = addDefaultHeader();
StringBuffer buffer = addGenericHeader();
// Determine the set of macros
toolInfos.accept(new IPathSettingsContainerVisitor() {
@ -1212,7 +1212,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
* for the top-level makefile.
*/
protected StringBuffer addTopHeader() {
return addDefaultHeader();
return addGenericHeader();
}
/**
@ -1603,7 +1603,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
// appear to be used there (and tool outputs are consulted directly), but
// we quote it anyway just in case it starts to use it in future.
if (addRuleForTool(targetTool, buffer, true, ensurePathIsGNUMakeTargetRuleCompatibleSyntax(buildTargetName),
buildTargetExt, outputVarsAdditionsList, managedProjectOutputs, false)) {
buildTargetExt, outputVarsAdditionsList, managedProjectOutputs)) {
// Mark the target tool as processed
for (int i = 0; i < buildTools.length; i++) {
if (targetTool == buildTools[i]) {
@ -1623,7 +1623,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
IInputType type = tool.getPrimaryInputType();
if (type != null && type.getMultipleOfType()) {
if (!buildToolsUsed[i]) {
addRuleForTool(tool, buffer, false, null, null, outputVarsAdditionsList, null, false);
addRuleForTool(tool, buffer, false, null, null, outputVarsAdditionsList, null);
// Mark the target tool as processed
buildToolsUsed[i] = true;
// Look for tools that consume the output
@ -1690,17 +1690,6 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
return buffer;
}
/**
* @deprecated Use {@link #addRuleForTool(ITool, StringBuffer, boolean, String, String, List, Vector)}
*/
@Deprecated
protected boolean addRuleForTool(ITool tool, StringBuffer buffer, boolean bTargetTool, String targetName,
String targetExt, List<String> outputVarsAdditionsList, Vector<String> managedProjectOutputs,
boolean bEmitPostBuildStepCall) {
return addRuleForTool(tool, buffer, bTargetTool, targetName, targetExt, outputVarsAdditionsList,
managedProjectOutputs);
}
/**
* Create the rule
*
@ -1897,7 +1886,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
if ((outVariable == null && inVariable == null) || (outVariable != null
&& inVariable != null && outVariable.equals(inVariable))) {
if (addRuleForTool(buildTools[k], buffer, false, null, null,
outputVarsAdditionsList, null, false)) {
outputVarsAdditionsList, null)) {
buildToolsUsed[k] = true;
// Look for tools that consume the output
generateRulesForConsumers(buildTools[k], outputVarsAdditionsList, buffer);
@ -2043,7 +2032,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
* for a fragment makefile (subdir.mk).
*/
protected StringBuffer addFragmentMakefileHeader() {
return addDefaultHeader();
return addGenericHeader();
}
/**
@ -3564,15 +3553,6 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
return h.outputExtensionsSet;
}
/**
* @deprecated Use {@link GnuMakefileGenerator#generateDummyTargets(IConfiguration, IFile, boolean)}
*/
@Deprecated
static public boolean populateDummyTargets(IConfiguration cfg, IFile makefile, boolean force)
throws CoreException, IOException {
return new GnuMakefileGenerator().generateDummyTargets(cfg, makefile, force);
}
/**
* This method postprocesses a .d file created by a build.
* It's main job is to add dummy targets for the header files dependencies.
@ -3593,15 +3573,6 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
return generateDummyTargets(cfg.getRootFolderInfo(), makefile, force);
}
/**
* @deprecated Use {@link GnuMakefileGenerator#generateDummyTargets(IResourceInfo, IFile, boolean)}
*/
@Deprecated
static public boolean populateDummyTargets(IResourceInfo rcInfo, IFile makefile, boolean force)
throws CoreException, IOException {
return new GnuMakefileGenerator().generateDummyTargets(rcInfo, makefile, force);
}
/**
* @since 9.3
*/
@ -3638,7 +3609,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
String[] bufferLines = inBufferString.split("[\\r\\n]"); //$NON-NLS-1$
for (String bufferLine : bufferLines) {
if (bufferLine.endsWith(":")) { //$NON-NLS-1$
StringBuffer outBuffer = addDefaultHeader();
StringBuffer outBuffer = addGenericHeader();
outBuffer.append(inBuffer);
save(outBuffer, makefile);
return true;
@ -3681,7 +3652,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
// Put the generated comments in the output buffer
if (!firstToken.startsWith(COMMENT_SYMBOL)) {
outBuffer = addDefaultHeader();
outBuffer = addGenericHeader();
} else {
outBuffer = new StringBuffer();
}
@ -3799,14 +3770,6 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
static public String ECHO_BLANK_LINE = ECHO + WHITESPACE + SINGLE_QUOTE + WHITESPACE + SINGLE_QUOTE + NEWLINE;
/**
* @deprecated Use {@link GnuMakefileGenerator#addGenericHeader()}
*/
@Deprecated
static protected StringBuffer addDefaultHeader() {
return new GnuMakefileGenerator().addGenericHeader();
}
/**
* Outputs a comment formatted as follows:
* ##### ....... #####