"<:ecere>status/folderOpen.png", /*openFolder*/
"<:ecere>mimeTypes/textEcereSource.png", /*ecFile*/
"<:ecere>mimeTypes/textEcereHeader.png", /*ehFile*/
+ "<:ecere>mimeTypes/textCSource.png", /*sFile*/ // TODO: change sFile icon to differentiate from cFile icon
"<:ecere>mimeTypes/textCSource.png", /*cFile*/
"<:ecere>mimeTypes/textCHeader.png", /*hFile*/
"<:ecere>mimeTypes/textC++Source.png", /*cppFile*/
MenuItem { popupContent, $"Regenerate Makefile", m, NotifySelect = ProjectRegenerate }.disabled = buildMenuUnavailable;
MenuDivider { popupContent };
}
+ MenuItem { popupContent, $"Debug Generate Symbols", l, NotifySelect = FileDebugGenerateSymbols }.disabled = buildMenuUnavailable;
+ MenuDivider { popupContent };
MenuItem { popupContent, $"New File...", l, Key { l, ctrl = true }, NotifySelect = ProjectNewFile };
MenuItem { popupContent, $"New Folder...", n, Key { f, ctrl = true }, NotifySelect = ProjectNewFolder };
MenuItem { popupContent, $"Import Folder...", i, NotifySelect = ProjectImportFolder };
MenuItem { popupContent, $"Remove project from workspace", r, NotifySelect = ProjectRemove }.disabled = buildMenuUnavailable;
MenuDivider { popupContent };
}
- MenuItem { popupContent, $"Active Configuration...", s, Key { f5, alt = true } , NotifySelect = MenuConfig };
MenuItem { popupContent, $"Settings...", s, Key { f7, alt = true } , NotifySelect = MenuSettings };
MenuDivider { popupContent };
MenuItem { popupContent, $"Browse Folder", w, NotifySelect = MenuBrowseFolder };
MenuItem { popupContent, $"Clean", l, NotifySelect = FileClean }.disabled = buildMenuUnavailable;
MenuItem { popupContent, $"Compile", c, Key { f7, ctrl = true}, NotifySelect = FileCompile }.disabled = buildMenuUnavailable;
MenuDivider { popupContent };
+ MenuItem { popupContent, $"Debug Precompile", l, NotifySelect = FileDebugPrecompile }.disabled = buildMenuUnavailable;
+ MenuItem { popupContent, $"Debug Compile", l, NotifySelect = FileDebugCompile }.disabled = buildMenuUnavailable;
+ MenuDivider { popupContent };
MenuItem { popupContent, $"Remove", r, NotifySelect = FileRemoveFile };
MenuDivider { popupContent };
MenuItem { popupContent, $"Browse Folder", w, NotifySelect = MenuBrowseFolder };
return project.GetRelativePath(filePath, relativePath);
}
- ProjectNode GetNodeFromWindow(Window document, Project project)
+ ProjectNode GetNodeFromWindow(Window document, Project project, bool isCObject)
{
if(document.fileName)
{
char winFileName[MAX_LOCATION];
char * documentFileName = GetSlashPathBuffer(winFileName, document.fileName);
- for(p : ide.workspace.projects)
+ ProjectNode node;
+ Project prj;
+ if(isCObject)
{
- Project prj = project ? project : p;
- ProjectNode node;
- if((node = prj.topNode.FindByFullPath(documentFileName, false)))
- return node;
- if(project) break;
+ char name[MAX_FILENAME];
+ GetLastDirectory(documentFileName, name);
+ ChangeExtension(name, "ec", name);
+ for(p : ide.workspace.projects)
+ {
+ prj = project ? project : p;
+ if((node = prj.topNode.Find(name, false)))
+ return node;
+ if(project) break;
+ }
+ }
+ else
+ {
+ for(p : ide.workspace.projects)
+ {
+ prj = project ? project : p;
+ if((node = prj.topNode.FindByFullPath(documentFileName, false)))
+ return node;
+ if(project) break;
+ }
}
}
return null;
bool ProjectPrepareCompiler(Project project, CompilerConfig compiler)
{
- if(!project.GenerateCrossPlatformMk() || !project.GenerateCompilerCf(compiler))
+ if(!project.GenerateCrossPlatformMk(app.includeFile) || !project.GenerateCompilerCf(compiler))
ide.outputView.buildBox.Logf($"Error generating compiler configuration (Is the project/config directory writable?)\n");
return true;
}
{
if(document.modifiedDocument)
{
- ProjectNode node = GetNodeFromWindow(document, prj);
+ ProjectNode node = GetNodeFromWindow(document, prj, false);
if(node && !document.MenuFileSave(null, 0))
{
result = false;
ide.AdjustBuildMenus();
ide.AdjustDebugMenus();
- result = prj.Build(buildType == run, null, compiler, config, justPrint);
+ result = prj.Build(buildType == run, null, compiler, config, justPrint, normal);
if(config)
{
}
else
{
- ProjectNode node = GetNodeFromWindow(ide.activeClient, null);
+ ProjectNode node = GetNodeFromWindow(ide.activeClient, null, false);
if(node)
prj = node.project;
}
}
else
{
- ProjectNode node = GetNodeFromWindow(ide.activeClient, null);
+ ProjectNode node = GetNodeFromWindow(ide.activeClient, null, false);
if(node)
prj = node.project;
}
}
else
{
- ProjectNode node = GetNodeFromWindow(ide.activeClient, null);
+ ProjectNode node = GetNodeFromWindow(ide.activeClient, null, false);
if(node)
prj = node.project;
}
}
else
{
- ProjectNode node = GetNodeFromWindow(ide.activeClient, null);
+ ProjectNode node = GetNodeFromWindow(ide.activeClient, null, false);
if(node)
prj = node.project;
}
}
else
{
- ProjectNode node = GetNodeFromWindow(ide.activeClient, null);
+ ProjectNode node = GetNodeFromWindow(ide.activeClient, null, false);
if(node)
prj = node.project;
}
}
else
{
- ProjectNode node = GetNodeFromWindow(ide.activeClient, null);
+ ProjectNode node = GetNodeFromWindow(ide.activeClient, null, false);
if(node)
prj = node.project;
}
return true;
}
- bool Compile(Project project, List<ProjectNode> nodes, bool justPrint)
+ bool Compile(Project project, List<ProjectNode> nodes, bool justPrint, SingleFileCompileMode mode)
{
bool result = true;
char fileName[MAX_LOCATION];
{
if(document.modifiedDocument)
{
- ProjectNode n = GetNodeFromWindow(document, project);
+ ProjectNode n = GetNodeFromWindow(document, project, mode == cObject ? true : false);
for(node : nodes)
{
if(n && n.IsInNode(node) && !document.MenuFileSave(null, 0))
if(ProjectPrepareForToolchain(project, normal, true, true, compiler, config))
{
if(config)
- ide.outputView.buildBox.Logf($"Compiling specific file(s) in project %s using the %s configuration...\n",
- project.name, config.name);
+ ide.outputView.buildBox.Logf($"%s specific file(s) in project %s using the %s configuration...\n",
+ mode == normal ? $"Compiling" : $"Debug compiling", project.name, config.name);
else
- ide.outputView.buildBox.Logf($"Compiling specific file(s) in project %s...\n",
- project.name);
+ ide.outputView.buildBox.Logf($"%s specific file(s) in project %s...\n",
+ mode == normal ? $"Compiling" : $"Debug compiling", project.name);
buildInProgress = compilingFile;
ide.AdjustBuildMenus();
- project.Compile(nodes, compiler, config, justPrint);
+ project.Compile(nodes, compiler, config, justPrint, mode);
buildInProgress = none;
ide.AdjustBuildMenus();
{
if(document.modifiedDocument)
{
- ProjectNode n = GetNodeFromWindow(document, project);
+ ProjectNode n = GetNodeFromWindow(document, project, false);
for(node : nodes)
{
if(n && n.IsInNode(node) && !document.MenuFileSave(null, 0))
result = false;
if(ProjectPrepareForToolchain(project, normal, true, true, compiler, config))
{
+ Map<String, NameCollisionInfo> namesInfo { };
+ project.topNode.GenMakefileGetNameCollisionInfo(namesInfo, config);
for(node : nodes)
{
if(node.GetIsExcluded(config))
ide.outputView.buildBox.Logf($"Deleteing intermediate objects for %s %s in project %s...\n",
node.type == file ? $"single file" : $"folder", node.name, project.name);
- node.DeleteIntermediateFiles(compiler, config);
+ node.DeleteIntermediateFiles(compiler, config, namesInfo, false);
result = true;
}
}
+ namesInfo.Free();
+ delete namesInfo;
}
delete compiler;
}
{
CompilerConfig compiler = ideSettings.GetCompilerConfig(ide.workspace.compiler);
+ // This call really does not belong here:
+ ide.UpdateToolBarActiveConfigs(false);
for(config : project.configurations)
ProjectPrepareMakefile(project, forceExists, compiler, config);
return true;
}
- bool MenuConfig(MenuItem selection, Modifiers mods)
- {
- if(ProjectActiveConfig { master = parent, project = project }.Modal() == ok)
- ide.AdjustMenus();
- return true;
- }
-
- bool MenuCompiler(MenuItem selection, Modifiers mods)
- {
- ActiveCompilerDialog compilerDialog
- {
- master = parent;
- ideSettings = ideSettings, workspaceActiveCompiler = ide.workspace.compiler;
- };
- incref compilerDialog;
- if(compilerDialog.Modal() == ok && strcmp(compilerDialog.workspaceActiveCompiler, ide.workspace.compiler))
- {
- CompilerConfig compiler = ideSettings.GetCompilerConfig(compilerDialog.workspaceActiveCompiler);
- ide.workspace.compiler = compilerDialog.workspaceActiveCompiler;
- ide.projectView.ShowOutputBuildLog(true);
- ide.projectView.DisplayCompiler(compiler, false);
-
- for(prj : ide.workspace.projects)
- ide.projectView.ProjectPrepareCompiler(prj, compiler);
- delete compiler;
- }
- delete compilerDialog;
- return true;
- }
-
bool MenuSettings(MenuItem selection, Modifiers mods)
{
ProjectNode node = GetSelectedNode(true);
}
selectedRows.Free(null);
if(project)
- Compile(project, nodes, mods.ctrl && mods.shift);
+ Compile(project, nodes, mods.ctrl && mods.shift, normal);
else
ide.outputView.buildBox.Logf($"Please select files from a single project.\n");
delete nodes;
return true;
}
+ bool FileDebugPrecompile(MenuItem selection, Modifiers mods)
+ {
+ DataRow row = fileList.currentRow;
+ ProjectNode node = row ? (ProjectNode)row.tag : null;
+ if(node)
+ {
+ List<ProjectNode> nodes { };
+ nodes.Add(node);
+ Compile(node.project, nodes, mods.ctrl && mods.shift, debugPrecompile);
+ delete nodes;
+ }
+ }
+
+ bool FileDebugCompile(MenuItem selection, Modifiers mods)
+ {
+ DataRow row = fileList.currentRow;
+ ProjectNode node = row ? (ProjectNode)row.tag : null;
+ if(node)
+ {
+ List<ProjectNode> nodes { };
+ nodes.Add(node);
+ Compile(node.project, nodes, mods.ctrl && mods.shift, debugCompile);
+ delete nodes;
+ }
+ }
+
+ bool FileDebugGenerateSymbols(MenuItem selection, Modifiers mods)
+ {
+ DataRow row = fileList.currentRow;
+ ProjectNode node = row ? (ProjectNode)row.tag : null;
+ if(node)
+ {
+ List<ProjectNode> nodes { };
+ nodes.Add(node);
+ Compile(node.project, nodes, mods.ctrl && mods.shift, debugGenerateSymbols);
+ delete nodes;
+ }
+ }
+
Project GetSelectedProject(bool useSelection)
{
Project prj = project;
{
DataRow row = addTo ? addTo.AddRow() : fileList.AddRow();
- row.tag = (int)node;
+ row.tag = (int64)node;
node.row = row;
if(node.type == resources)
}
Update(null);
folderNode.row = parentNode.row.AddRowAfter(after ? after.row : null);
- folderNode.row.tag = (int)folderNode;
+ folderNode.row.tag = (int64)folderNode;
folderNode.row.SetData(null, folderNode);
fileList.currentRow = folderNode.row;
}
Update(null);
result.row = parentNode.row.AddRowAfter(after ? after.row : null);
- result.row.tag = (int)result;
+ result.row.tag = (int64)result;
result.row.SetData(null, result);
}
return result;
Update(null);
project.ModifiedAllConfigs(true, false, false, true);
projectNode.row = parentNode.row.AddRowAfter(after ? after.row : null);
- projectNode.row.tag =(int)projectNode;
+ projectNode.row.tag =(int64)projectNode;
projectNode.row.SetData(null, projectNode);
fileList.currentRow = projectNode.row;
Ecere Software / sdk / blobdiff