Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 03:52:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support modules with no base install directory

Browse source 
svn path=/branches/xmlbuildsystem/; revision=15308
This commit is contained in:
Casper Hornstrup 2005-05-15 13:20:45 +00:00
parent 93b4d98160
commit dff44c9f17
3 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
reactos/tools/rbuild/backend/mingw/mingw.cpp
View file

@ -241,9 +241,10 @@ MingwBackend::~MingwBackend()
string string
MingwBackend::AddDirectoryTarget ( const string& directory, MingwBackend::AddDirectoryTarget ( const string& directory,
Directory* directoryTree ) Directory* directoryTree )
{ {
directoryTree->Add ( directory.c_str() ); if ( directory.length () > 0)
directoryTree->Add ( directory.c_str() );
return directoryTree->name; return directoryTree->name;
} }
@ -775,7 +776,11 @@ MingwBackend::GetModuleInstallTargetFiles (
const Module& module = *ProjectNode.modules[i]; const Module& module = *ProjectNode.modules[i];
if ( module.installName.length () > 0 ) if ( module.installName.length () > 0 )
{ {
string targetFilenameNoFixup = module.installBase + SSEP + module.installName; string targetFilenameNoFixup;
if ( module.installBase.length () > 0 )
targetFilenameNoFixup = module.installBase + SSEP + module.installName;
else
targetFilenameNoFixup = module.installName;
string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
NormalizeFilename ( targetFilenameNoFixup ), NormalizeFilename ( targetFilenameNoFixup ),
installDirectory ); installDirectory );
@ -794,11 +799,16 @@ MingwBackend::GetInstallTargetFiles (
void void
MingwBackend::OutputInstallTarget ( const string& sourceFilename, MingwBackend::OutputInstallTarget ( const string& sourceFilename,
const string& targetFilename, const string& targetFilename,
const string& targetDirectory ) const string& targetDirectory )
{ {
string fullTargetFilename;
if ( targetDirectory.length () > 0)
fullTargetFilename = targetDirectory + SSEP + targetFilename;
else
fullTargetFilename = targetFilename;
string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory (
NormalizeFilename ( targetDirectory + SSEP + targetFilename ), NormalizeFilename ( fullTargetFilename ),
installDirectory ); installDirectory );
string normalizedTargetDirectory = MingwModuleHandler::PassThruCacheDirectory ( string normalizedTargetDirectory = MingwModuleHandler::PassThruCacheDirectory (
NormalizeFilename ( targetDirectory ), NormalizeFilename ( targetDirectory ),
@ -823,8 +833,8 @@ MingwBackend::OutputNonModuleInstallTargets ()
{ {
const InstallFile& installfile = *ProjectNode.installfiles[i]; const InstallFile& installfile = *ProjectNode.installfiles[i];
OutputInstallTarget ( installfile.GetPath (), OutputInstallTarget ( installfile.GetPath (),
installfile.newname, installfile.newname,
installfile.base ); installfile.base );
} }
} }

12
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -110,7 +110,11 @@ MingwModuleHandler::PassThruCacheDirectory (
/* This path already includes the generated files directory variable */ /* This path already includes the generated files directory variable */
return file; return file;
else else
{
if ( file == "" )
return generatedFilesDirectory;
return generatedFilesDirectory + SSEP + file; return generatedFilesDirectory + SSEP + file;
}
} }
/*static*/ Directory* /*static*/ Directory*
@ -2682,8 +2686,8 @@ MingwLiveIsoModuleHandler::CreateDirectory ( const string& directory )
void void
MingwLiveIsoModuleHandler::OutputCopyCommand ( const string& sourceFilename, MingwLiveIsoModuleHandler::OutputCopyCommand ( const string& sourceFilename,
const string& targetFilename, const string& targetFilename,
const string& targetDirectory ) const string& targetDirectory )
{ {
string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory (
NormalizeFilename ( targetDirectory + SSEP + targetFilename ), NormalizeFilename ( targetDirectory + SSEP + targetFilename ),
@ -2698,7 +2702,7 @@ MingwLiveIsoModuleHandler::OutputCopyCommand ( const string& sourceFilename,
void void
MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdDirectory, MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdDirectory,
string& reactosDirectory ) string& reactosDirectory )
{ {
for ( size_t i = 0; i < module.project.modules.size (); i++ ) for ( size_t i = 0; i < module.project.modules.size (); i++ )
{ {
@ -2717,7 +2721,7 @@ MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdDirectory,
void void
MingwLiveIsoModuleHandler::OutputNonModuleCopyCommands ( string& livecdDirectory, MingwLiveIsoModuleHandler::OutputNonModuleCopyCommands ( string& livecdDirectory,
string& reactosDirectory ) string& reactosDirectory )
{ {
for ( size_t i = 0; i < module.project.installfiles.size (); i++ ) for ( size_t i = 0; i < module.project.installfiles.size (); i++ )
{ {

4
reactos/tools/rbuild/module.cpp
View file

@ -73,7 +73,7 @@ GetDirectory ( const string& filename )
{ {
size_t index = filename.find_last_of ( CSEP ); size_t index = filename.find_last_of ( CSEP );
if ( index == string::npos ) if ( index == string::npos )
return filename; return "";
else else
return filename.substr ( 0, index ); return filename.substr ( 0, index );
} }
@ -81,6 +81,8 @@ GetDirectory ( const string& filename )
string string
NormalizeFilename ( const string& filename ) NormalizeFilename ( const string& filename )
{ {
if ( filename == "" )
return "";
Path path; Path path;
string normalizedPath = path.Fixup ( filename, true ); string normalizedPath = path.Fixup ( filename, true );
string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath ); string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath );