github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-08 02:54:56 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: icpp now part of blitz, Core: Fixed issue in LocalProcess in Win32

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8079 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-01-21 10:12:03 +00:00
parent 05d4d7362f
commit 0bd3e2f216
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
uppsrc/Core/LocalProcess.cpp
View file

@ -449,13 +449,13 @@ bool LocalProcess::Read2(String& reso, String& rese)
bool was_running = IsRunning();
char buffer[1024];
dword n;
if(hOutputRead && PeekNamedPipe(hOutputRead, NULL, 0, NULL, &n, NULL) && n)
while(ReadFile(hOutputRead, buffer, sizeof(buffer), &n, NULL) && n)
wreso.Cat(buffer, n);
if(hOutputRead && PeekNamedPipe(hOutputRead, NULL, 0, NULL, &n, NULL) && n &&
ReadFile(hOutputRead, buffer, sizeof(buffer), &n, NULL) && n)
reso.Cat(buffer, n);
if(hErrorRead && PeekNamedPipe(hErrorRead, NULL, 0, NULL, &n, NULL) && n)
while(ReadFile(hErrorRead, buffer, sizeof(buffer), &n, NULL) && n)
wrese.Cat(buffer, n);
if(hErrorRead && PeekNamedPipe(hErrorRead, NULL, 0, NULL, &n, NULL) && n &&
ReadFile(hErrorRead, buffer, sizeof(buffer), &n, NULL) && n)
rese.Cat(buffer, n);
if(convertcharset) {
reso = FromOEMCharset(reso);
@ -463,7 +463,6 @@ bool LocalProcess::Read2(String& reso, String& rese)
}
return reso.GetCount() || rese.GetCount() || was_running;
#endif
#ifdef PLATFORM_POSIX
String res[2];

2
uppsrc/ide/Builders/CppBuilder.cpp
View file

@ -410,7 +410,7 @@ Blitz CppBuilder::BlitzStep(Vector<String>& sfile, Vector<String>& soptions,
String ext = ToLower(GetFileExt(fn));
String objfile = CatAnyPath(outdir, GetFileTitle(fn) + objext);
Time fntime = GetFileTime(fn);
if((ext == ".cpp" || ext == ".cc" || ext == ".cxx")
if((ext == ".cpp" || ext == ".cc" || ext == ".cxx" || ext == ".icpp")
&& HdependBlitzApproved(fn) && IsNull(soptions[i]) && !optimize[i]
&& fntime < BlitzBaseTime()
&& noblitz.Find(fn) < 0) {

3
uppsrc/ide/Builders/MscBuilder.icpp
View file

@ -253,7 +253,8 @@ bool MscBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
for(int j = 0; j < srcfile.GetCount(); j++) {
String fn = srcfile[j];
String ext = ToLower(GetFileExt(fn));
if(ext == ".c" || ext == ".cpp" || ext == ".cc" || ext == ".cxx" || ext == ".rc" || ext == ".brc") {
if(findarg(ext, ".c", ".cpp", ".cc", ".cxx", ".rc", ".brc") >= 0 ||
(!release && blitz && ext == ".icpp")) {
sfile.Add(fn);
soptions.Add(gop);
optimize.Add(speed);