github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fix of main.conf.h build process

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6368 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-09-18 19:14:14 +00:00
parent 011586933b
commit 0b44fc28e1
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/ide/Builders/Build.cpp
View file

@ -393,9 +393,10 @@ bool MakeBuild::Build(const Workspace& wspc, String mainparam, String outfile, b
One<Builder> b = CreateBuilder(~host);
if(b) {
Index<String> mcfg = PackageConfig(wspc, 0, bm, mainparam, *host, *b, NULL);
String outdir = OutDir(mcfg, wspc[0], bm, use_target);
SaveFile(AppendFileName(outdir, "main.conf.h"),
main_conf);
String outdir = OutDir(mcfg, wspc[0], bm, false);
String path = AppendFileName(outdir, "main.conf.h");
RealizePath(path);
SaveChangedFile(path, main_conf);
add_includes << outdir << ';';
}
}

2
uppsrc/ide/Core/Core.cpp
View file

@ -271,7 +271,7 @@ String IdeGetLine(int i)
bool SaveChangedFile(const char *path, String data, bool delete_empty)
{
if(LoadFile(path) == data)
if(LoadFile(path) == data && (FileExists(path) || delete_empty))
return true;
if(delete_empty && IsNull(data))
return FileDelete(path);