ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add files to project only if the "If" condition is true.

Browse Source 
svn path=/trunk/; revision=22342
This commit is contained in:
Hervé Poussineau
2006-06-13 17:39:17 +00:00
parent d1346a4edc
commit 8add7c477f
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/tools/rbuild/backend/msvc/msvc.h
+1
View File
@@ -116,6 +116,7 @@ class MSVCBackend : public Backend
void _get_object_files ( const Module& module, std::vector<std::string>& out ) const;
void _install_files ( const std::string& vcdir, const std::string& config );
bool _copy_file ( const std::string& inputname, const std::string& targetname ) const;
const Property* _lookup_property ( const Module& module, const std::string& name ) const;
};
#endif // __MSVC_H__
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+28 -2
View File
@@ -113,9 +113,15 @@ MSVCBackend::_generate_vcproj ( const Module& module )
{
const IfableData& data = *ifs_list.back();
ifs_list.pop_back();
// TODO FIXME - refactor needed - we're discarding if conditions
for ( i = 0; i < data.ifs.size(); i++ )
ifs_list.push_back ( &data.ifs[i]->data );
{
const Property* property = _lookup_property( module, data.ifs[i]->property );
if ( property != NULL )
{
if ( data.ifs[i]->value == property->value || data.ifs[i]->negated )
ifs_list.push_back ( &data.ifs[i]->data );
}
}
const vector<File*>& files = data.files;
for ( i = 0; i < files.size(); i++ )
{
@@ -732,3 +738,23 @@ MSVCBackend::_generate_sln ( FILE* OUT )
_generate_sln_footer ( OUT );
}
const Property*
MSVCBackend::_lookup_property ( const Module& module, const std::string& name ) const
{
/* Check local values */
for ( size_t i = 0; i < module.non_if_data.properties.size(); i++ )
{
const Property& property = *module.non_if_data.properties[i];
if ( property.name == name )
return &property;
}
// TODO FIXME - should we check local if-ed properties?
for ( size_t i = 0; i < module.project.non_if_data.properties.size(); i++ )
{
const Property& property = *module.project.non_if_data.properties[i];
if ( property.name == name )
return &property;
}
// TODO FIXME - should we check global if-ed properties?
return NULL;
}