Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

invoke _generate_dsp() have it open the output file, and fix some path parsing and const issues.

Browse source 
svn path=/trunk/; revision=17517
This commit is contained in:
Royce Mitchell III 2005-08-24 19:58:07 +00:00
parent 9195c7dd4f
commit 86018cbc02
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,12 +119,14 @@ void MSVCBackend::ProcessModules()
{ {
Module &module = *ProjectNode.modules[i]; Module &module = *ProjectNode.modules[i];
for(size_t k = 0; k < module.non_if_data.files.size(); k++) this->_generate_dsp ( module );
/*for(size_t k = 0; k < module.non_if_data.files.size(); k++)
{ {
File &file = *module.non_if_data.files[k]; File &file = *module.non_if_data.files[k];
ProcessFile(file.name); ProcessFile(file.name);
} }*/
} }
} }

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

@ -64,7 +64,7 @@ class MSVCBackend : public Backend
// functions in msvcmaker.cpp: // functions in msvcmaker.cpp:
void _generate_dsp ( FILE* OUT, const std::string& moduleName ); void _generate_dsp ( const Module& module );
void _generate_dsw_header ( FILE* OUT ); void _generate_dsw_header ( FILE* OUT );

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

@ -13,15 +13,15 @@ using std::string;
using std::vector; using std::vector;
void void
MSVCBackend::_generate_dsp ( FILE* OUT, const std::string& moduleName ) MSVCBackend::_generate_dsp ( const Module& module )
{ {
size_t i; size_t i;
// TODO FIXME wine hack? // TODO FIXME wine hack?
const bool wine = false; const bool wine = false;
Module& module = *ProjectNode.LocateModule ( moduleName );
string dsp_file = DspFileName(module); string dsp_file = DspFileName(module);
FILE* OUT = fopen ( dsp_file.c_str(), "w" );
vector<string> imports; vector<string> imports;
for ( i = 0; i < module.non_if_data.libraries.size(); i++ ) for ( i = 0; i < module.non_if_data.libraries.size(); i++ )
{ {
@ -32,19 +32,20 @@ MSVCBackend::_generate_dsp ( FILE* OUT, const std::string& moduleName )
bool lib = (module_type == "lib"); bool lib = (module_type == "lib");
bool dll = (module_type == "dll"); bool dll = (module_type == "dll");
bool exe = (module_type == "exe"); bool exe = (module_type == "exe");
// TODO FIXME - need more checks here for 'sys' and possibly 'drv'?
bool console = exe; // FIXME: Not always correct bool console = exe; // FIXME: Not always correct
// TODO FIXME - not sure if the count here is right... // TODO FIXME - not sure if the count here is right...
int parts = 1; int parts = 0;
const char* p = strchr ( dsp_file.c_str(), '/' ); const char* p = strpbrk ( dsp_file.c_str(), "/\\" );
while ( p ) while ( p )
{ {
++parts; ++parts;
p = strchr ( p+1, '/' ); p = strpbrk ( p+1, "/\\" );
} }
string msvc_wine_dir = ".."; string msvc_wine_dir = "..";
while ( parts-- ) while ( --parts )
msvc_wine_dir += "\\.."; msvc_wine_dir += "\\..";
string wine_include_dir = msvc_wine_dir + "\\include"; string wine_include_dir = msvc_wine_dir + "\\include";
@ -54,16 +55,16 @@ MSVCBackend::_generate_dsp ( FILE* OUT, const std::string& moduleName )
// TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?
vector<string> c_srcs, source_files, resource_files; vector<string> c_srcs, source_files, resource_files;
vector<IfableData*> ifs_list; vector<const IfableData*> ifs_list;
ifs_list.push_back ( &module.non_if_data ); ifs_list.push_back ( &module.non_if_data );
while ( ifs_list.size() ) while ( ifs_list.size() )
{ {
IfableData& data = *ifs_list.back(); const IfableData& data = *ifs_list.back();
ifs_list.pop_back(); ifs_list.pop_back();
// TODO FIXME - refactor needed - we're discarding if conditions // TODO FIXME - refactor needed - we're discarding if conditions
for ( i = 0; i < data.ifs.size(); i++ ) for ( i = 0; i < data.ifs.size(); i++ )
ifs_list.push_back ( &data.ifs[i]->data ); ifs_list.push_back ( &data.ifs[i]->data );
vector<File*>& files = data.files; const vector<File*>& files = data.files;
for ( i = 0; i < files.size(); i++ ) for ( i = 0; i < files.size(); i++ )
{ {
// TODO FIXME - do we want the full path of the file here? // TODO FIXME - do we want the full path of the file here?