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

Gnu tool-chain definition update

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-04-19 12:32:53 +00:00
parent cb5454c394
commit 62a8f0c061
3 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
View file

@ -3694,7 +3694,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
return supportsManagedBuild.booleanValue(); return supportsManagedBuild.booleanValue();
} }
private class MatchKey { private static class MatchKey {
Tool tool; Tool tool;
public MatchKey(Tool tch) { public MatchKey(Tool tch) {
@ -3711,11 +3711,11 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
} }
public int hashCode() { public int hashCode() {
String name = getName(); String name = tool.getName();
if(name == null) if(name == null)
name = getId(); name = tool.getId();
int code = name.hashCode(); int code = name.hashCode();
String version = ManagedBuildManager.getVersionFromIdAndVersion(getId()); String version = ManagedBuildManager.getVersionFromIdAndVersion(tool.getId());
if(version != null) if(version != null)
code += version.hashCode(); code += version.hashCode();
return code; return code;

14
build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
View file

@ -76,10 +76,24 @@ ToolName.linker.gnu.cpp = GCC C++ Linker
ToolName.archiver.gnu = GCC Archiver ToolName.archiver.gnu = GCC Archiver
ToolName.assembler.gnu = GCC Assembler ToolName.assembler.gnu = GCC Assembler
#Cygwin tool names
ToolName.linker.cygwin.gnu.c=Cygwin C Linker
ToolName.linker.cygwin.gnu.cpp=Cygwin C++ Linker
ToolName.compiler.cygwin.gnu.c = Cygwin C Compiler
ToolName.compiler.cygwin.gnu.cpp = Cygwin C++ Compiler
#MinGW tool names
ToolName.linker.mingw.gnu.c=MinGW C Linker
ToolName.linker.mingw.gnu.cpp=MinGW C++ Linker
# Mach-O tool names # Mach-O tool names
ToolName.linker.macosx.c = MacOS X C Linker ToolName.linker.macosx.c = MacOS X C Linker
ToolName.linker.macosx.cpp = MacOS X C++ Linker ToolName.linker.macosx.cpp = MacOS X C++ Linker
#Solaris tool names
ToolName.compiler.solaris.c = Solaris C Compiler
ToolName.compiler.solaris.cpp = Solaris C++ Compiler
# Generic Category Names # Generic Category Names
OptionCategory.Symbols = Symbols OptionCategory.Symbols = Symbols
OptionCategory.Preproc = Preprocessor OptionCategory.Preproc = Preprocessor

33
build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
View file

@ -1496,6 +1496,7 @@
<tool <tool
id="cdt.managedbuild.tool.gnu.c.linker.cygwin" id="cdt.managedbuild.tool.gnu.c.linker.cygwin"
name="%ToolName.linker.cygwin.gnu.c"
superClass="cdt.managedbuild.tool.gnu.c.linker"> superClass="cdt.managedbuild.tool.gnu.c.linker">
<envVarBuildPath <envVarBuildPath
pathType="buildpathLibrary" pathType="buildpathLibrary"
@ -1510,11 +1511,13 @@
<outputType <outputType
outputs="dll,a.dll" outputs="dll,a.dll"
buildVariable="LIBRARIES" buildVariable="LIBRARIES"
id="cdt.managedbuild.tool.gnu.c.linker.cygwin.output.so"> id="cdt.managedbuild.tool.gnu.c.linker.cygwin.output.so"
superClass="cdt.managedbuild.tool.gnu.c.linker.output.so">
</outputType> </outputType>
</tool> </tool>
<tool <tool
id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin" id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin"
name="%ToolName.linker.cygwin.gnu.cpp"
superClass="cdt.managedbuild.tool.gnu.cpp.linker"> superClass="cdt.managedbuild.tool.gnu.cpp.linker">
<envVarBuildPath <envVarBuildPath
pathType="buildpathLibrary" pathType="buildpathLibrary"
@ -1529,12 +1532,14 @@
<outputType <outputType
outputs="dll,a.dll" outputs="dll,a.dll"
buildVariable="LIBRARIES" buildVariable="LIBRARIES"
id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output.so"> id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output.so"
superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so">
</outputType> </outputType>
</tool> </tool>
<tool <tool
id="cdt.managedbuild.tool.gnu.c.compiler.cygwin" id="cdt.managedbuild.tool.gnu.c.compiler.cygwin"
name="%ToolName.compiler.cygwin.gnu.c"
superClass="cdt.managedbuild.tool.gnu.c.compiler"> superClass="cdt.managedbuild.tool.gnu.c.compiler">
<envVarBuildPath <envVarBuildPath
pathType="buildpathInclude" pathType="buildpathInclude"
@ -1548,6 +1553,7 @@
</tool> </tool>
<tool <tool
id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin" id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin"
name="%ToolName.compiler.cygwin.gnu.cpp"
superClass="cdt.managedbuild.tool.gnu.cpp.compiler"> superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
<envVarBuildPath <envVarBuildPath
pathType="buildpathInclude" pathType="buildpathInclude"
@ -1765,6 +1771,7 @@
</tool> </tool>
<tool <tool
id="cdt.managedbuild.tool.gnu.c.linker.mingw.base" id="cdt.managedbuild.tool.gnu.c.linker.mingw.base"
name="%ToolName.linker.mingw.gnu.c"
superClass="cdt.managedbuild.tool.gnu.c.linker"> superClass="cdt.managedbuild.tool.gnu.c.linker">
<enablement <enablement
type="ALL"> type="ALL">
@ -1774,9 +1781,16 @@
value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/> value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
</not> </not>
</enablement> </enablement>
<outputType
id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.output.base"
superClass="cdt.managedbuild.tool.gnu.c.linker.output.so"
outputs="dll">
</outputType>
</tool> </tool>
<tool <tool
id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base" id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base"
name="%ToolName.linker.mingw.gnu.cpp"
superClass="cdt.managedbuild.tool.gnu.cpp.linker"> superClass="cdt.managedbuild.tool.gnu.cpp.linker">
<enablement <enablement
type="ALL"> type="ALL">
@ -1786,6 +1800,11 @@
value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/> value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
</not> </not>
</enablement> </enablement>
<outputType
id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.output.base"
superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so"
outputs="dll">
</outputType>
</tool> </tool>
</toolChain> </toolChain>
@ -1940,11 +1959,13 @@
<tool <tool
id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base" id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base"
name="%ToolName.compiler.solaris.cpp"
superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"
commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"> commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">
</tool> </tool>
<tool <tool
id="cdt.managedbuild.tool.gnu.solaris.c.compiler.base" id="cdt.managedbuild.tool.gnu.solaris.c.compiler.base"
name="%ToolName.compiler.solaris.c"
superClass="cdt.managedbuild.tool.gnu.c.compiler.base" superClass="cdt.managedbuild.tool.gnu.c.compiler.base"
commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"> commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">
</tool> </tool>
@ -2930,7 +2951,7 @@
</option> </option>
<outputType <outputType
id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug.output" id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug.output"
outputs="dll"> superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.output.base">
</outputType> </outputType>
</tool> </tool>
<tool <tool
@ -2942,7 +2963,7 @@
</option> </option>
<outputType <outputType
id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.debug.output" id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.debug.output"
outputs="dll"> superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.output.base">
</outputType> </outputType>
</tool> </tool>
<tool <tool
@ -2997,7 +3018,7 @@
</option> </option>
<outputType <outputType
id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release.output" id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release.output"
outputs="dll"> superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.output.base">
</outputType> </outputType>
</tool> </tool>
<tool <tool
@ -3009,7 +3030,7 @@
</option> </option>
<outputType <outputType
id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.release.output" id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.release.output"
outputs="dll"> superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.output.base">
</outputType> </outputType>
</tool> </tool>
<tool <tool