Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- include unattend.inf from boot/bootdata/bootcdregtest

Browse source 
svn path=/trunk/; revision=28623
This commit is contained in:
Johannes Anderwald 2007-08-28 17:32:30 +00:00
parent edc4c2dc67
commit df0b2c80d4
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3306,6 +3306,10 @@ void
MingwIsoModuleHandler::GenerateIsoModuleTarget () MingwIsoModuleHandler::GenerateIsoModuleTarget ()
{ {
string bootcdDirectory = "cd"; string bootcdDirectory = "cd";
string srcunattend = NormalizeFilename("boot/bootdata/bootcdregtest/unattend.inf");
string tarunattend = NormalizeFilename("$(OUTPUT)/cd/reactos/unattend.inf");
vector<string> vCdFiles;
string bootcd = PassThruCacheDirectory ( string bootcd = PassThruCacheDirectory (
NormalizeFilename ( bootcdDirectory + sSep ), NormalizeFilename ( bootcdDirectory + sSep ),
backend->outputDirectory ); backend->outputDirectory );
@ -3313,8 +3317,9 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ()
string bootloader; string bootloader;
string IsoName; string IsoName;
if (module.name == "bootcdregtest") if (module.type == IsoRegTest)
{ {
vCdFiles.push_back (srcunattend.c_str ());
bootloader = "isobtrt.o"; bootloader = "isobtrt.o";
IsoName = "ReactOS-RegTest.iso"; IsoName = "ReactOS-RegTest.iso";
} }
@ -3338,7 +3343,6 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ()
backend->outputDirectory ); backend->outputDirectory );
string reactosDff = NormalizeFilename ( "boot" + sSep + "bootdata" + sSep + "packages" + sSep + "reactos.dff" ); string reactosDff = NormalizeFilename ( "boot" + sSep + "bootdata" + sSep + "packages" + sSep + "reactos.dff" );
string cdDirectories = GetCdDirectories ( bootcdDirectory ); string cdDirectories = GetCdDirectories ( bootcdDirectory );
vector<string> vCdFiles;
GetCdFiles ( vCdFiles ); GetCdFiles ( vCdFiles );
string cdFiles = v2s ( vCdFiles, 5 ); string cdFiles = v2s ( vCdFiles, 5 );
@ -3366,6 +3370,16 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ()
reactosInf.c_str () ); reactosInf.c_str () );
OutputBootstrapfileCopyCommands ( bootcdDirectory ); OutputBootstrapfileCopyCommands ( bootcdDirectory );
OutputCdfileCopyCommands ( bootcdDirectory ); OutputCdfileCopyCommands ( bootcdDirectory );
if (module.type == IsoRegTest)
{
fprintf ( fMakefile,
"\t$(ECHO_CP)\n" );
fprintf ( fMakefile,
"\t${cp} %s %s 1>$(NUL)\n",
srcunattend.c_str (),
tarunattend.c_str () );
}
fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t$(Q)$(CDMAKE_TARGET) -v -j -m -b %s %s REACTOS %s\n", "\t$(Q)$(CDMAKE_TARGET) -v -j -m -b %s %s REACTOS %s\n",