github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-21 06:05:34 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: LocalHost/Host, urepo refactored

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15586 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-12-12 19:27:04 +00:00
parent e274a4611a
commit 46cfc0fad8
47 changed files with 392 additions and 676 deletions
Download patch file Download diff file Expand all files Collapse all files

14
uppsrc/ide/Builders/JavaBuilder.cpp
View file

@ -104,8 +104,8 @@ bool JavaBuilder::BuildPackage(const String& package, Vector<String>& linkfile,
ismf = true;
if(manifest >= 0)
{
PutConsole(Format("%s(1): duplicate manifest file", GetHostPath(fn)));
PutConsole(Format("%s(1): (previous manifest file)", GetHostPath(sfile[manifest])));
PutConsole(Format("%s(1): duplicate manifest file", fn));
PutConsole(Format("%s(1): (previous manifest file)", sfile[manifest]));
}
manifest = sfile.GetCount();
}
@ -199,12 +199,12 @@ bool JavaBuilder::PreprocessJava(String file, String target, String options,
{
prepfile = ForceExt(file, ".i");
host->ChDir(GetFileFolder(prepfile));
execpath << GetHostPath(file);
execpath << file;
}
else
{
PutConsole(file);
execpath << GetHostPath(file) << " " << GetHostPath(target);
execpath << file << " " << target;
prepfile = target;
}
if(Execute(execpath) != 0)
@ -268,9 +268,9 @@ bool JavaBuilder::Link(const Vector<String>& linkfile, const String& linkoptions
cmdline << "cf";
if(!manifest.IsEmpty())
cmdline << 'm';
cmdline << ' ' << GetHostPath(target);
cmdline << ' ' << target;
if(!manifest.IsEmpty())
cmdline << ' ' << GetHostPath(manifest);
cmdline << ' ' << manifest;
Time tm = Time::Low();
for(int i = ITEMCOUNT; i < linkfile.GetCount(); i++)
tm = max(tm, AddClassDeep(cmdline, linkfile[i], Null));
@ -301,7 +301,7 @@ bool JavaBuilder::Link(const Vector<String>& linkfile, const String& linkoptions
<< " B) archived in " << GetPrintTime(time));
}
else
PutConsole(String().Cat() << GetHostPath(target) << " (" << GetFileInfo(target).length
PutConsole(String().Cat() << target << " (" << GetFileInfo(target).length
<< " B) is up to date.");
return true;
}