Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-22 04:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gregor Brunmar <gregor.brunmar@home.se>:

Browse source 
- Don't include files that aren't in the source directory to the project generation.
- Fix tab indentation in generated files.

svn path=/trunk/; revision=29065
This commit is contained in:
Aleksey Bragin 2007-09-16 12:54:52 +00:00
parent d18fdef61f
commit f87c698cd3
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
View file

@ -101,6 +101,9 @@ MSVCBackend::_generate_dsp ( const Module& module )
const vector<File*>& files = data.files;
for ( i = 0; i < files.size(); i++ )
{
if (files[i]->file.directory != SourceDirectory)
continue;
// We want the full path here for directory support later on
string path = Path::RelativeFromDirectory (
files[i]->file.relative_path,

21
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
View file

@ -156,6 +156,9 @@ MSVCBackend::_generate_vcproj ( const Module& module )
const vector<File*>& files = data.files;
for ( i = 0; i < files.size(); i++ )
{
if (files[i]->file.directory != SourceDirectory)
continue;
// We want the full path here for directory support later on
string path = Path::RelativeFromDirectory (
files[i]->file.relative_path,
@ -622,27 +625,31 @@ MSVCBackend::_generate_vcproj ( const Module& module )
break;
}
if ( same_folder_index < split_path.size() )
if ( same_folder_index < split_path.size() || last_folder.size() > split_path.size() )
{
int tabStart = 1;
if ( split_path.size() > last_folder.size() )
{
for ( size_t ifolder = last_folder.size(); ifolder < split_path.size(); ifolder++ )
indent_tab.push_back('\t');
tabStart = split_path.size() - last_folder.size() + 1;
}
else if ( split_path.size() < last_folder.size() )
{
indent_tab.resize( split_path.size() + 3 );
tabStart = split_path.size() - last_folder.size() + 1;
}
for ( size_t ifolder = last_folder.size(); ifolder > same_folder_index; ifolder-- )
for ( size_t ifolder = last_folder.size(), itab = tabStart; ifolder > same_folder_index; ifolder--, itab++ )
{
fprintf ( OUT, "%s</Filter>\r\n", indent_tab.substr(0, indent_tab.size() - 1).c_str() );
fprintf ( OUT, "%s</Filter>\r\n", indent_tab.substr(0, indent_tab.size() - itab).c_str() );
}
for ( size_t ifolder = same_folder_index; ifolder < split_path.size(); ifolder++ )
for ( size_t ifolder = same_folder_index, itab = split_path.size() - same_folder_index; ifolder < split_path.size(); ifolder++, itab-- )
{
fprintf ( OUT, "%s<Filter\r\n", indent_tab.substr(0, indent_tab.size() - 1).c_str() );
fprintf ( OUT, "%sName=\"%s\">\r\n", indent_tab.c_str(), split_path[ifolder].c_str() );
const string tab = indent_tab.substr(0, indent_tab.size() - itab);
fprintf ( OUT, "%s<Filter\r\n", tab.c_str() );
fprintf ( OUT, "%s\tName=\"%s\">\r\n", tab.c_str(), split_path[ifolder].c_str() );
}
last_folder = split_path;
@ -723,7 +730,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
for ( size_t ifolder = last_folder.size(); ifolder > 0; ifolder-- )
{
indent_tab.resize( ifolder + 3 );
indent_tab.resize( ifolder + 2 );
fprintf ( OUT, "%s</Filter>\r\n", indent_tab.c_str() );
}