Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix msvc_clean target

Browse source 
- implement cleaning up def files which are generated by fixdef

svn path=/trunk/; revision=24991
This commit is contained in:
Johannes Anderwald 2006-11-30 12:20:40 +00:00
parent 5d44e0c10f
commit 55e6bb5471
2 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

40
reactos/tools/rbuild/backend/msvc/msvc.cpp
View file

@ -344,26 +344,43 @@ MSVCBackend::_get_object_files ( const Module& module, vector<string>& out) cons
else else
file = ReplaceExtension ( file, ".obj" ); file = ReplaceExtension ( file, ".obj" );
for ( size_t j = 0; j < cfgs.size () / 2; j++ ) for ( size_t j = 0; j < cfgs.size () / 2; j++ )
out.push_back ( cfgs[j] + "\\" + file ); out.push_back ( cfgs[j] + file );
} }
} }
//common files in intermediate dir //common files in intermediate dir
for ( i = 0; i < cfgs.size () / 2; i++) for ( i = 0; i < cfgs.size () / 2; i++)
{ {
out.push_back ( cfgs[i] + "\\" + "BuildLog.htm" ); out.push_back ( cfgs[i] + "BuildLog.htm" );
out.push_back ( cfgs[i] + "\\" + dbg + "0.pdb" ); out.push_back ( cfgs[i] + dbg + "0.pdb" );
out.push_back ( cfgs[i] + "\\" + dbg + "0.idb" ); out.push_back ( cfgs[i] + dbg + "0.idb" );
out.push_back ( cfgs[i] + "\\" + module.name + ".pch" ); out.push_back ( cfgs[i] + module.name + ".pch" );
} }
//files in the output dir //files in the output dir
for ( i = cfgs.size () / 2; i < cfgs.size (); i++ ) for ( i = cfgs.size () / 2; i < cfgs.size (); i++ )
{ {
out.push_back ( cfgs[i] + "\\" + module.GetTargetName () ); out.push_back ( cfgs[i] + module.GetTargetName () );
out.push_back ( cfgs[i] + "\\" + module.name + ".pdb" ); out.push_back ( cfgs[i] + module.name + ".pdb" );
out.push_back ( cfgs[i] + "\\" + module.name + ".lib" ); out.push_back ( cfgs[i] + module.name + ".lib" );
out.push_back ( cfgs[i] + "\\" + module.name + ".exp" ); out.push_back ( cfgs[i] + module.name + ".exp" );
out.push_back ( cfgs[i] + "\\" + module.name + ".ilk" ); out.push_back ( cfgs[i] + module.name + ".ilk" );
}
}
void
MSVCBackend::_get_def_files ( const Module& module, vector<string>& out) const
{
if (module.HasImportLibrary ())
{
string modulename = module.GetBasePath ();
string file = module.importLibrary->definition;
size_t pos = file.find (".def");
if (pos != string::npos)
{
file.insert (pos, "_msvc");
}
modulename += "\\" + file;
out.push_back (modulename);
} }
} }
@ -395,9 +412,10 @@ MSVCBackend::_clean_project_files ( void )
remove ( vcproj_file_user.c_str () ); remove ( vcproj_file_user.c_str () );
_get_object_files ( module, out ); _get_object_files ( module, out );
_get_def_files ( module, out );
for ( size_t j = 0; j < out.size (); j++) for ( size_t j = 0; j < out.size (); j++)
{ {
//printf("Cleaning file %s\n", out[j].c_str () ); printf("Cleaning file %s\n", out[j].c_str () );
remove ( out[j].c_str () ); remove ( out[j].c_str () );
} }
} }

1
reactos/tools/rbuild/backend/msvc/msvc.h
View file

@ -139,6 +139,7 @@ class MSVCBackend : public Backend
std::string vcproj_guid ); std::string vcproj_guid );
void _clean_project_files ( void ); void _clean_project_files ( void );
void _get_object_files ( const Module& module, std::vector<std::string>& out ) const; void _get_object_files ( const Module& module, std::vector<std::string>& out ) const;
void _get_def_files ( const Module& module, std::vector<std::string>& out ) const;
void _install_files ( const std::string& vcdir, const std::string& config ); void _install_files ( const std::string& vcdir, const std::string& config );
bool _copy_file ( const std::string& inputname, const std::string& targetname ) const; bool _copy_file ( const std::string& inputname, const std::string& targetname ) const;
const Property* _lookup_property ( const Module& module, const std::string& name ) const; const Property* _lookup_property ( const Module& module, const std::string& name ) const;