mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

idlc: make dependencies: handle removed include files:

Browse Source 
Write dummy targets for included files, so the incremental build does not
break with "No rule to make target" if the included file is removed.
This commit is contained in:
Michael Stahl
2012-04-13 18:55:37 +02:00
parent d3b74479a7
commit 8c0a9bca42
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
idlc/source/idlc.cxx
View File

@@ -313,6 +313,21 @@ struct WriteDep
} }
}; };
// write a dummy target for one included file, so the incremental build does
// not break with "No rule to make target" if the included file is removed
struct WriteDummy
{
::osl::File& m_rFile;
::osl::FileBase::RC & m_rRC;
explicit WriteDummy(::osl::File & rFile, ::osl::FileBase::RC & rRC)
: m_rFile(rFile), m_rRC(rRC) { }
void operator() (::rtl::OString const& rEntry)
{
lcl_writeString(m_rFile, m_rRC, rEntry);
lcl_writeString(m_rFile, m_rRC, ":\n\n");
}
};
bool bool
Idlc::dumpDeps(::rtl::OString const& rDepFile, ::rtl::OString const& rTarget) Idlc::dumpDeps(::rtl::OString const& rDepFile, ::rtl::OString const& rTarget)
{ {
@@ -334,6 +349,9 @@ Idlc::dumpDeps(::rtl::OString const& rDepFile, ::rtl::OString const& rTarget)
m_includes.erase(getRealFileName()); // eeek, that is a temp file... m_includes.erase(getRealFileName()); // eeek, that is a temp file...
::std::for_each(m_includes.begin(), m_includes.end(), ::std::for_each(m_includes.begin(), m_includes.end(),
WriteDep(depFile, rc)); WriteDep(depFile, rc));
lcl_writeString(depFile, rc, "\n\n");
::std::for_each(m_includes.begin(), m_includes.end(),
WriteDummy(depFile, rc));
if (::osl::FileBase::E_None != rc) { if (::osl::FileBase::E_None != rc) {
return false; return false;
} }