Build stubs generated by winebuild Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-01 18:17:47 UTC (rev 14418) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-01 18:18:18 UTC (rev 14419) @@ -104,8 +104,13 @@
MingwModuleHandler::PassThruCacheDirectory ( const string &file, bool out ) { - string dir ( GetDirectory ( file ) ); - return backend->AddDirectoryTarget ( dir, out ) + SSEP + file; + string directory ( GetDirectory ( file ) ); + string generatedFilesDirectory = backend->AddDirectoryTarget ( directory, out ); + if ( directory.find ( generatedFilesDirectory ) != string::npos ) + /* This path already includes the generated files directory variable */ + return file; + else + return generatedFilesDirectory + SSEP + file; }
/*static*/ string @@ -222,10 +227,11 @@ const string& filename ) const { string extension = GetExtension ( filename ); - if ( extension == ".spec" || extension == "SPEC" ) + if ( extension == ".spec" || extension == ".SPEC" ) { string basename = GetBasename ( filename ); - return basename + ".stubs.c"; + return PassThruCacheDirectory ( FixupTargetFilename ( basename + ".stubs.c" ), + false ); } else return filename; @@ -235,7 +241,7 @@ MingwModuleHandler::GetModuleArchiveFilename () const { if ( module.type == StaticLibrary ) - return GetTargetFilename(module,NULL); + return GetTargetFilename ( module, NULL ); return PassThruCacheDirectory ( ReplaceExtension ( FixupTargetFilename ( module.GetPath () ), ".temp.a" ), false ); @@ -245,7 +251,7 @@ MingwModuleHandler::IsGeneratedFile ( const File& file ) const { string extension = GetExtension ( file.name ); - return ( extension == ".spec" || extension == "SPEC" ); + return ( extension == ".spec" || extension == ".SPEC" ); }
string @@ -343,7 +349,7 @@ string obj_file = PassThruCacheDirectory ( FixupTargetFilename ( ReplaceExtension ( - sourceFilename, //PrefixFilename(sourceFilename,module.prefix), + sourceFilename, newExtension ) ), false ); if ( pclean_files )