return result;
}
- ProjectNode FindNodeByObjectFileName(const char * fileName, IntermediateFileType type, bool dotMain, ProjectConfig config)
+ ProjectNode FindNodeByObjectFileName(const char * fileName, IntermediateFileType type, bool dotMain, ProjectConfig config, const char * objectFileExt)
{
ProjectNode result;
const char * cfgName;
cfgName = config ? config.name : "";
if(!configsNameCollisions[cfgName])
ProjectLoadLastBuildNamesInfo(this, config);
- result = topNode.FindByObjectFileName(fileName, type, dotMain, configsNameCollisions[cfgName]);
+ result = topNode.FindByObjectFileName(fileName, type, dotMain, configsNameCollisions[cfgName], objectFileExt);
return result;
}
}
#ifndef MAKEFILE_GENERATOR
+ ProjectNode GetObjectFileNode(const char * filePath, const char * objectFileExt)
+ {
+ ProjectNode node = null;
+ char ext[MAX_EXTENSION];
+ GetExtension(filePath, ext);
+ if(ext[0])
+ {
+ IntermediateFileType type = IntermediateFileType::FromExtension(ext);
+ if(type)
+ {
+ char fileName[MAX_FILENAME];
+ GetLastDirectory(filePath, fileName);
+ if(fileName[0])
+ {
+ DotMain dotMain = DotMain::FromFileName(fileName);
+ node = FindNodeByObjectFileName(fileName, type, dotMain, null, objectFileExt);
+ }
+ }
+ }
+ return node;
+ }
+
+ bool GetAbsoluteFromRelativePath(const char * relativePath, char * absolutePath, const char * objectFileExt)
+ {
+ ProjectNode node = topNode.FindWithPath(relativePath, false);
+ if(!node)
+ node = GetObjectFileNode(relativePath, objectFileExt);
+ if(node)
+ {
+ strcpy(absolutePath, node.project.topNode.path);
+ PathCat(absolutePath, relativePath);
+ MakeSlashPath(absolutePath);
+ }
+ return node != null;
+ }
+
void MarkChanges(ProjectNode node)
{
for(cfg : topNode.configurations)
{
int nChars;
bool lineDone = f.GetLinePeek(line + linePos, sizeof(line)-linePos-1, &nChars);
- if(!lineDone) linePos += nChars;
+ if(!lineDone)
+ {
+ linePos += nChars;
+ Sleep(0.5 / PEEK_RESOLUTION);
+ }
else
{
linePos = 0;
; // ignore this new gnu make error but what is it about?
else if(strstr(line, compiler.makeCommand) == line && line[lenMakeCommand] == ':')
{
- const char * module = strstr(line, "No rule to make target `");
+ const char * moduleBackTick = strstr(line, "No rule to make target `");
+ const char * module = moduleBackTick ? moduleBackTick : strstr(line, "No rule to make target '");
if(module)
{
char * end;
- module = strchr(module, '`') + 1;
+ module = strchr(module, moduleBackTick ? '`' : '\'') + 1;
end = strchr(module, '\'');
if(end)
{
else if(strstr(test, strip) == test);
else if(strstr(test, cc) == test || strstr(test, cxx) == test || strstr(test, ecp) == test || strstr(test, ecc) == test)
{
- char * module;
+ char * module = null;
bool isPrecomp = false;
bool gotCC = false;
message = $"Linker Message: ";
colon = line;
}
+ else if(SearchString(colon, 0, "warning:", false, false))
+ {
+ message = $"Linker Warning: ";
+ colon = line;
+ }
else
{
numErrors++;
message = $"Linker ";
numWarnings++;
}
- else if(!strstr(line, "error:"))
+ else if(strstr(line, "error:"))
{
message = $"Linker Error: ";
numErrors++;
else
{
// Silence warnings for compiled eC
- char * objDir = strstr(moduleName, objDirExp.dir);
+ //char * objDir = strstr(moduleName, objDirExp.dir);
if(linking)
{
colon = pointer;
numErrors++;
}
- else if(compilingEC == 1 || (objDir && objDir == moduleName))
+ else //if(compilingEC == 1 || (objDir && objDir == moduleName))
{
bool skip = false;
// Filter out these warnings caused by eC generated C code:
// Declaration ordering bugs -- Awaiting topo sort implementation
+ /*
if(strstr(line, "declared inside parameter list")) skip = true;
else if(strstr(line, "its scope is only this definition")) skip = true;
else if(strstr(line, "from incompatible pointer type")) skip = true;
else if(strstr(line, "In function '") || strstr(line, "In function ‘") ) skip = true;
else if(strstr(line, "At top level")) skip = true;
else if(strstr(line, "(near initialization for '") || strstr(line, "(near initialization for ‘")) skip = true;
-
+ */
if(skip) continue;
numWarnings++;
}
- else if(strstr(line, "warning:"))
+ /*else if(strstr(line, "warning:"))
{
numWarnings++;
- }
+ }*/
}
if(message)
ide.outputView.buildBox.Logf(" %s%s\n", message, colon);
char command[MAX_F_STRING*4];
char * compilerName = CopyString(compiler.name);
Map<String, NameCollisionInfo> cfgNameCollisions;
+ const char * objFileExt = strcmp(compiler.objectFileExt, objectDefaultFileExt) != 0 ? compiler.objectFileExt : null;
delete lastBuildConfigName;
lastBuildConfigName = CopyString(config ? config.name : "Common");
// Create object dir if it does not exist already
if(!FileExists(objDirExp.dir).isDirectory)
{
- sprintf(command, "%s CF_DIR=\"%s\"%s%s%s%s%s COMPILER=%s objdir -C \"%s\"%s -f \"%s\"",
+ sprintf(command, "%s CF_DIR=\"%s\"%s%s%s%s%s COMPILER=%s%s%s objdir -C \"%s\"%s -f \"%s\"",
compiler.makeCommand, cfDir,
crossCompiling ? " TARGET_PLATFORM=" : "",
targetPlatform,
bitDepth ? " ARCH=" : "", bitDepth == 32 ? "32" : bitDepth == 64 ? "64" : "",
/*(bitDepth == 64 && compiler.targetPlatform == win32) ? " GCC_PREFIX=x86_64-w64-mingw32-" : (bitDepth == 32 && compiler.targetPlatform == win32) ? " GCC_PREFIX=i686-w64-mingw32-" : */"",
-
- compilerName, topNode.path, justPrint ? " -n" : "", makeFilePath);
+ compilerName,
+ objFileExt ? " O=." : "", objFileExt ? objFileExt : "",
+ topNode.path, justPrint ? " -n" : "", makeFilePath);
if(justPrint)
ide.outputView.buildBox.Logf("%s\n", command);
Execute(command);
for(node : onlyNodes)
{
- if(node.GetIsExcluded(config))
+ if(node.GetIsExcludedForCompiler(config, compiler))
ide.outputView.buildBox.Logf($"File %s is excluded from current build configuration.\n", node.name);
else
{
if(!eC_Debug)
node.DeleteIntermediateFiles(compiler, config, bitDepth, cfgNameCollisions, mode == cObject ? true : false);
- node.GetTargets(config, cfgNameCollisions, objDirExp.dir, makeTargets);
+ node.GetTargets(config, cfgNameCollisions, objDirExp.dir, compiler.objectFileExt, makeTargets);
}
}
}
GccVersionInfo cxxVersion = GetGccVersionInfo(compiler, compiler.cxxCommand);
char cfDir[MAX_LOCATION];
GetIDECompilerConfigsDir(cfDir, true, true);
- sprintf(command, "%s%s %sCF_DIR=\"%s\"%s%s%s%s%s%s COMPILER=%s %s%s%s-j%d %s%s%s -C \"%s\"%s -f \"%s\"",
+ sprintf(command, "%s%s %sCF_DIR=\"%s\"%s%s%s%s%s%s COMPILER=%s%s%s %s%s%s-j%d %s%s%s -C \"%s\"%s -f \"%s\"",
#if defined(__WIN32__)
"",
#else
bitDepth == 32 ? "32" : bitDepth == 64 ? "64" : "",
ide.workspace.useValgrind ? " DISABLED_POOLING=1" : "",
/*(bitDepth == 64 && compiler.targetPlatform == win32) ? " GCC_PREFIX=x86_64-w64-mingw32-" : (bitDepth == 32 && compiler.targetPlatform == win32) ? " GCC_PREFIX=i686-w64-mingw32-" :*/ "",
- compilerName, eC_Debug ? "--always-make " : "",
+ compilerName,
+ objFileExt ? " O=." : "", objFileExt ? objFileExt : "",
+ eC_Debug ? "--always-make " : "",
ccVersion == post4_8 ? "GCC_CC_FLAGS=-fno-diagnostics-show-caret " : "",
cxxVersion == post4_8 ? "GCC_CXX_FLAGS=-fno-diagnostics-show-caret " : "",
numJobs,
PathBackup pathBackup { };
bool crossCompiling = (compiler.targetPlatform != __runtimePlatform);
const char * targetPlatform = crossCompiling ? (char *)compiler.targetPlatform : "";
+ const char * objFileExt = strcmp(compiler.objectFileExt, objectDefaultFileExt) ? compiler.objectFileExt : null;
compilerName = CopyString(compiler.name);
CamelCase(compilerName);
{
char cfDir[MAX_LOCATION];
GetIDECompilerConfigsDir(cfDir, true, true);
- sprintf(command, "%s CF_DIR=\"%s\"%s%s%s%s COMPILER=%s %sclean%s -C \"%s\"%s -f \"%s\"",
+ sprintf(command, "%s CF_DIR=\"%s\"%s%s%s%s COMPILER=%s%s%s %sclean%s -C \"%s\"%s -f \"%s\"",
compiler.makeCommand, cfDir,
crossCompiling ? " TARGET_PLATFORM=" : "", targetPlatform,
bitDepth ? " ARCH=" : "", bitDepth == 32 ? "32" : bitDepth == 64 ? "64" : "",
compilerName,
+ objFileExt ? " O=." : "", objFileExt ? objFileExt : "",
cleanType == realClean ? "real" : "", cleanType == cleanTarget ? "target" : "",
topNode.path, justPrint ? " -n": "", makeFilePath);
if(justPrint)
if(targetType == staticLibrary || targetType == sharedLibrary)
strcat(fileName, "$(LP)");
strcat(fileName, GetTargetFileName(config));
- switch(targetType)
- {
- case executable:
- strcat(fileName, "$(E)");
- break;
- case sharedLibrary:
- strcat(fileName, "$(SO)$(VER)");
- break;
- case staticLibrary:
- strcat(fileName, "$(A)");
- break;
- }
+ strcat(fileName, "$(OUT)");
}
bool GenerateCrossPlatformMk(File altCrossPlatformMk)
f.Puts("\n");
for(e : compiler.environmentVars)
{
+ ChangeCh(e.string, '\\', '/');
f.Printf("export %s := %s\n", e.name, e.string);
+ ChangeCh(e.string, '/', '\\');
}
f.Puts("\n");
}
f.Puts("# TOOLCHAIN\n");
f.Puts("\n");
+ f.Puts("# EXTENSIONS\n");
+ if(compiler.outputFileExt)
+ f.Printf("OUT := %s\n", compiler.outputFileExt);
+ else
+ f.Puts("OUT := $(if $(STATIC_LIBRARY_TARGET),$(A),$(if $(SHARED_LIBRARY_TARGET),$(SO)$(VER),$(if $(EXECUTABLE_TARGET),$(E),.x)))\n");
+
if(gnuToolchainPrefix && gnuToolchainPrefix[0])
{
f.Printf("GCC_PREFIX := %s\n", gnuToolchainPrefix);
f.Printf("EAR := %s\n", compiler.earCommand);
f.Puts("AS := $(GCC_PREFIX)as\n");
- f.Puts("LD := $(GCC_PREFIX)ld\n");
- f.Puts("AR := $(GCC_PREFIX)ar\n");
+ f.Printf("LD := $(GCC_PREFIX)%s$(_SYSROOT)$(if $(GCC_LD_FLAGS),$(space)$(GCC_LD_FLAGS),)\n", compiler.ldCommand);
+ f.Printf("AR := $(GCC_PREFIX)%s\n", compiler.arCommand);
f.Puts("STRIP := $(GCC_PREFIX)strip\n");
f.Puts("ifdef WINDOWS_TARGET\n");
f.Puts("WINDRES := $(GCC_PREFIX)windres\n");
return result;
}
- bool GenerateMakefile(const char * altMakefilePath, bool noResources, const char * includemkPath, ProjectConfig config)
+ bool GenerateMakefile(const char * altMakefilePath, bool noResources, const char * includemkPath, ProjectConfig config, const char * ldCommand)
{
bool result = false;
char filePath[MAX_LOCATION];
f.Puts("ifndef STATIC_LIBRARY_TARGET\n");
- f.Printf("\t$(%s) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(INSTALLNAME)\n", containsCXX ? "CXX" : "CC");
+ f.Printf("\t$(%s) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(INSTALLNAME)\n", ldCommand && ldCommand[0] ? "LD" : containsCXX ? "CXX" : "CC");
if(!GetDebug(config))
{
f.Puts("ifndef NOSTRIP\n");
if(resNode.files && resNode.files.count && !noResources)
resNode.GenMakefileAddResources(f, resNode.path, config);
f.Puts("else\n");
+ f.Puts("ifdef WINDOWS_HOST\n");
f.Puts("\t$(AR) rcs $(TARGET) @$(OBJ)objects.lst $(LIBS)\n");
+ f.Puts("else\n");
+ f.Puts("\t$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)\n");
+ f.Puts("endif\n");
f.Puts("endif\n");
f.Puts("ifdef SHARED_LIBRARY_TARGET\n");
f.Puts("ifdef LINUX_TARGET\n");
f.Printf("cleantarget: objdir%s\n", sameOrRelObjTargetDirs ? "" : " targetdir");
if(numCObjects)
{
- f.Printf("\t$(call rmq,%s)\n", "$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S)");
+ f.Printf("\t$(call rmq,%s)\n", "$(OBJ)$(MODULE).main$(O) $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S)");
f.Printf("\t$(call rmq,$(OBJ)symbols.lst)\n");
}
f.Printf("\t$(call rmq,$(OBJ)objects.lst)\n");
Project LegacyAsciiLoadProject(File f, const char * filePath)
{
Project project = null;
- //ProjectNode node = null;
int pos;
char parentPath[MAX_LOCATION];
char section[128] = "";
char subSection[128] = "";
- ProjectNode parent;
+ ProjectNode parent = null;
bool configurationsPresent = false;
f.Seek(0, start);
Ecere Software / sdk / blobdiff