Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 00:13:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add bootstrap tag to specify that files are to be copied to the CD

Browse source 
svn path=/branches/xmlbuildsystem/; revision=13797
This commit is contained in:
Casper Hornstrup 2005-03-02 21:24:02 +00:00
parent 633526eb0b
commit 7f24916383
8 changed files with 174 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1873,7 +1873,7 @@ MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ( const Module& mod
{
static string ros_junk ( "$(ROS_TEMPORARY)" );
string targetName ( module.GetTargetName () );
string target ( FixupTargetFilename (module.GetPath ()) );
string target ( FixupTargetFilename ( module.GetPath () ) );
string workingDirectory = GetWorkingDirectory ();
string junk_tmp = ros_junk + module.name + ".junk.tmp";
string objectsMacro = GetObjectsMacro ( module );
@ -1951,6 +1951,44 @@ MingwIsoModuleHandler::Process ( const Module& module )
GenerateInvocations ( module );
}
void
MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( const string bootcdDirectory,
const Module& module ) const
{
for ( size_t i = 0; i < module.project.modules.size (); i++ )
{
const Module& m = *module.project.modules[i];
if ( m.bootstrap != NULL )
{
string targetFilenameNoFixup = bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd;
string targetFilename = PassThruCacheDirectory ( FixupTargetFilename ( targetFilenameNoFixup ) );
fprintf ( fMakefile,
"\t${cp} %s %s\n",
m.GetPath ().c_str (),
targetFilename.c_str () );
}
}
}
string
MingwIsoModuleHandler::GetCdDirectories ( const string bootcdDirectory,
const Module& module ) const
{
string directories;
for ( size_t i = 0; i < module.project.modules.size (); i++ )
{
const Module& m = *module.project.modules[i];
if ( m.bootstrap != NULL )
{
string targetDirecctory = bootcdDirectory + SSEP + m.bootstrap->base;
if ( directories.size () > 0 )
directories += " ";
directories += FixupTargetFilename ( targetDirecctory );
}
}
return directories;
}
void
MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module )
{
@ -1961,6 +1999,8 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module )
PassThruCacheDirectory ( bootcdReactos + SSEP );
string reactosInf = FixupTargetFilename ( bootcdReactosNoFixup + "/reactos.inf" );
string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" );
string cdDirectories = bootcdReactos + " " + GetCdDirectories ( bootcdDirectory,
module );
fprintf ( fMakefile, ".PHONY: %s\n\n",
module.name.c_str ());
@ -1968,7 +2008,7 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module )
"%s: all %s %s\n",
module.name.c_str (),
isoboot.c_str (),
bootcdReactos.c_str () );
cdDirectories.c_str () );
fprintf ( fMakefile,
"\t${cabman} /C %s /L %s /I\n",
reactosDff.c_str (),
@ -1981,6 +2021,8 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module )
fprintf ( fMakefile,
"\t- ${rm} %s\n",
reactosInf.c_str () );
OutputBootstrapfileCopyCommands ( bootcdDirectory,
module );
fprintf ( fMakefile,
"\t${cdmake} -v -m -b %s %s REACTOS ReactOS.iso\n",
isoboot.c_str (),