define ProjectExtension = "epj";
define stringInFileIncludedFrom = "In file included from ";
+define stringFrom = " from ";
void ReplaceSpaces(char * output, char * source)
{
if(c && ((c.options && cfg.options && cfg.options.console != c.options.console) ||
(!c.options || !cfg.options)))
cfg.symbolGenModified = true;
+ if(c && ((c.options && cfg.options &&
+ ( (cfg.options.libraries && c.options.libraries && cfg.options.libraries.OnCompare(c.options.libraries)) || (!cfg.options.libraries || !c.options.libraries)) )
+ || (!c.options || !cfg.options)))
+ cfg.linkingModified = true;
cfg.makingModified = true;
}
{
char * message = null;
char * inFileIncludedFrom = strstr(line, stringInFileIncludedFrom);
+ char * from = strstr(line, stringFrom);
test.copyLenSingleBlankReplTrim(line, ' ', true, testLen);
if(strstr(line, compiler.makeCommand) == line && line[lenMakeCommand] == ':')
{
ide.outputView.buildBox.Logf("%s\n", line);
if(strstr(line, "warning:") || strstr(line, "note:"))
numWarnings++;
- else if(!gotCC && !strstr(line, "At top level") && !strstr(line, "In file included from"))
+ else if(!gotCC && !strstr(line, "At top level") && !strstr(line, "In file included from") && !strstr(line, stringFrom))
numErrors++;
}
colon = strstr(colon + 1, ":");
if(colon)
{
+ char * sayError = "";
char moduleName[MAX_LOCATION], temp[MAX_LOCATION];
char * pointer;
char * error;
- char * start = inFileIncludedFrom ? line + strlen(stringInFileIncludedFrom) : line;
+ char * start = inFileIncludedFrom ? inFileIncludedFrom + strlen(stringInFileIncludedFrom) : from ? from + strlen(stringFrom) : line;
int len = (int)(colon - start);
+ char ext[MAX_EXTENSION];
len = Min(len, MAX_LOCATION-1);
// Don't be mistaken by the drive letter colon
// Cut module name
//if(bracket) *bracket = '\0';
GetLastDirectory(moduleName, temp);
+ GetExtension(temp, ext);
+
+ if(linking && (!strcmp(ext, "o") || !strcmp(ext, "a") || !strcmp(ext, "lib")))
+ {
+ char * cColon = strstr(colon+1, ":");
+ if(cColon && (cColon[1] == '/' || cColon[1] == '\\'))
+ cColon = strstr(cColon + 1, ":");
+ if(cColon)
+ {
+ int len = (int)(cColon - (colon+1));
+ char mName[MAX_LOCATION];
+ len = Min(len, MAX_LOCATION-1);
+ strncpy(mName, colon+1, len);
+ mName[len] = '\0';
+ GetLastDirectory(mName, temp);
+ GetExtension(temp, ext);
+ if(!strcmp(ext, "c") || !strcmp(ext, "cpp") || !strcmp(ext, "cxx") || !strcmp(ext, "ec"))
+ {
+ colon = cColon;
+ strcpy(moduleName, mName);
+ }
+ }
+ }
if(linking && (!strcmp(temp, "ld") || !strcmp(temp, "ld.exe")))
{
+ moduleName[0] = 0;
if(strstr(colon, "skipping incompatible") || strstr(colon, "Recognised but unhandled"))
- message = $"Linker Message";
+ {
+ message = $"Linker Message: ";
+ colon = line;
+ }
else
{
numErrors++;
message = $"Linker Error";
}
}
+ else if(linking && (!strcmp(ext, "") || !strcmp(ext, "exe")))
+ {
+ moduleName[0] = 0;
+ colon = line;
+ if(!strstr(line, "error:"))
+ {
+ message = $"Linker Error: ";
+ numErrors++;
+ }
+ }
else
{
strcpy(temp, topNode.path);
MakePathRelative(temp, topNode.path, moduleName);
}
error = strstr(line, "error:");
- if(error && error > colon)
+ if(!message && error && error > colon)
numErrors++;
else
{
- // Silence warnings for compiled EC
+ // Silence warnings for compiled eC
char * objDir = strstr(moduleName, objDirExp.dir);
if(linking)
{
if((pointer = strstr(line, "undefined")) ||
+ (pointer = strstr(line, "multiple definition")) ||
(pointer = strstr(line, "No such file")) ||
(pointer = strstr(line, "token")))
{
strncat(moduleName, colon, pointer - colon);
- strcat(moduleName, "error: ");
+ sayError = "error: ";
colon = pointer;
numErrors++;
}
else if((pointer = strstr(line, "No such file")))
{
strncat(moduleName, colon, pointer - colon);
- strcat(moduleName, "error: ");
+ sayError = "error: ";
colon = pointer;
numErrors++;
}
}
}
if(message)
- ide.outputView.buildBox.Logf(" %s: %s\n", message, line);
- else if(this == ide.workspace.projects.firstIterator.data)
- ide.outputView.buildBox.Logf(" %s%s\n", moduleName, colon);
+ ide.outputView.buildBox.Logf(" %s%s\n", message, colon);
+ /*else if(this == ide.workspace.projects.firstIterator.data)
+ ide.outputView.buildBox.Logf(" %s%s%s\n", moduleName, sayError, colon);*/
else
{
char fullModuleName[MAX_LOCATION];
- strcpy(fullModuleName, topNode.path);
- PathCat(fullModuleName, moduleName);
- MakePathRelative(fullModuleName, ide.workspace.projects.firstIterator.data.topNode.path, fullModuleName);
- MakeSystemPath(fullModuleName);
- ide.outputView.buildBox.Logf(" %s%s%s\n", inFileIncludedFrom ? stringInFileIncludedFrom : "", fullModuleName, colon);
+ FileAttribs found = 0;
+ Project foundProject = this;
+ if(moduleName[0])
+ {
+ char * loc = strstr(moduleName, ":");
+ if(loc) *loc = 0;
+ strcpy(fullModuleName, topNode.path);
+ PathCat(fullModuleName, moduleName);
+ found = FileExists(fullModuleName);
+ if(!found && !strcmp(ext, "c"))
+ {
+ char ecName[MAX_LOCATION];
+ ChangeExtension(fullModuleName, "ec", ecName);
+ found = FileExists(ecName);
+ }
+ if(!found)
+ {
+ char path[MAX_LOCATION];
+ if(ide && ide.workspace)
+ {
+ for(prj : ide.workspace.projects)
+ {
+ ProjectNode node;
+ MakePathRelative(fullModuleName, prj.topNode.path, path);
+
+ if((node = prj.topNode.FindWithPath(path, false)))
+ {
+ strcpy(fullModuleName, prj.topNode.path);
+ PathCatSlash(fullModuleName, node.path);
+ PathCatSlash(fullModuleName, node.name);
+ found = FileExists(fullModuleName);
+ if(found)
+ {
+ foundProject = prj;
+ break;
+ }
+ }
+ }
+ if(!found && !strchr(moduleName, '/') && !strchr(moduleName, '\\'))
+ {
+ for(prj : ide.workspace.projects)
+ {
+ ProjectNode node;
+ if((node = prj.topNode.Find(moduleName, false)))
+ {
+ strcpy(fullModuleName, prj.topNode.path);
+ PathCatSlash(fullModuleName, node.path);
+ PathCatSlash(fullModuleName, node.name);
+ found = FileExists(fullModuleName);
+ if(found)
+ {
+ foundProject = prj;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ if(found)
+ {
+ MakePathRelative(fullModuleName, ide.workspace.projects.firstIterator.data.topNode.path, fullModuleName);
+ MakeSystemPath(fullModuleName);
+ }
+ else
+ strcpy(fullModuleName, moduleName);
+ if(loc)
+ {
+ strcat(fullModuleName, ":");
+ strcat(fullModuleName, loc + 1);
+ }
+ }
+ else
+ fullModuleName[0] = 0;
+ ide.outputView.buildBox.Logf(" %s%s%s%s\n", inFileIncludedFrom ? stringInFileIncludedFrom : from ? stringFrom : "", fullModuleName, sayError, colon);
}
}
else
(String)makeTargets, topNode.path, (justPrint || (mode != normal && mode != cObject)) ? " -n" : "", makeFilePath);
if(justPrint)
ide.outputView.buildBox.Logf("%s\n", command);
+
if((f = DualPipeOpen(PipeOpenMode { output = true, error = true, input = true }, command)))
{
bool found = false;
Compile(node.project, nodes, mods.ctrl && mods.shift, debugPrecompile);
delete nodes;
}
+ return true;
}
bool FileDebugCompile(MenuItem selection, Modifiers mods)
Compile(node.project, nodes, mods.ctrl && mods.shift, debugCompile);
delete nodes;
}
+ return true;
}
bool FileDebugGenerateSymbols(MenuItem selection, Modifiers mods)
Compile(node.project, nodes, mods.ctrl && mods.shift, debugGenerateSymbols);
delete nodes;
}
+ return true;
}
Project GetSelectedProject(bool useSelection)
{
char moduleName[MAX_LOCATION], filePath[MAX_LOCATION];
+ char ext[MAX_EXTENSION];
char * bracket;
if(colon)
{
char * inFileIncludedFrom = strstr(line, stringInFileIncludedFrom);
- char * start = inFileIncludedFrom ? line + strlen(stringInFileIncludedFrom) : line;
+ char * from = strstr(line, "from ");
+ char * start = inFileIncludedFrom ? inFileIncludedFrom + strlen(stringInFileIncludedFrom) : from ? from + strlen("from ") : line;
int len = (int)(colon - start);
len = Min(len, MAX_LOCATION-1);
// Cut module name
else
moduleName[0] = '\0';
}
+ GetExtension(moduleName, ext);
+ if(!strcmp(ext, "a") || !strcmp(ext, "o") || !strcmp(ext, "lib") || !strcmp(ext, "dll"))
+ moduleName[0] = 0; // Avoid opening binary files
if(moduleName[0])
{
CodeEditor codeEditor;
PathCatSlash(filePath, moduleName);
codeEditor = (CodeEditor)ide.OpenFile(filePath, normal, true, null, no, normal);
+ if(!codeEditor && !strcmp(ext, "c"))
+ {
+ char ecName[MAX_LOCATION];
+ ChangeExtension(filePath, "ec", ecName);
+ codeEditor = (CodeEditor)ide.OpenFile(ecName, normal, true, null, no, normal);
+ }
if(!codeEditor)
{
- char name[MAX_LOCATION];
+ char path[MAX_LOCATION];
// TOFIX: Improve on this, don't use only filename, make a function
if(ide && ide.workspace)
{
for(prj : ide.workspace.projects)
{
- if(prj.topNode.FindWithPath(moduleName, false))
+ ProjectNode node;
+ MakePathRelative(filePath, prj.topNode.path, path);
+
+ if((node = prj.topNode.FindWithPath(path, false)))
{
strcpy(filePath, prj.topNode.path);
- PathCatSlash(filePath, moduleName);
+ PathCatSlash(filePath, node.path);
+ PathCatSlash(filePath, node.name);
codeEditor = (CodeEditor)ide.OpenFile(filePath, normal, true, null, no, normal);
if(codeEditor)
break;
}
}
+ if(!codeEditor && !strchr(moduleName, '/') && !strchr(moduleName, '\\'))
+ {
+ for(prj : ide.workspace.projects)
+ {
+ ProjectNode node;
+ if((node = prj.topNode.Find(moduleName, false)))
+ {
+ strcpy(filePath, prj.topNode.path);
+ PathCatSlash(filePath, node.path);
+ PathCatSlash(filePath, node.name);
+ codeEditor = (CodeEditor)ide.OpenFile(filePath, normal, true, null, no, normal);
+ if(codeEditor)
+ break;
+ }
+ }
+ }
}
}
if(codeEditor && lineNumber)
Ecere Software / sdk / commitdiff