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

Fix bootcd / livecd

Browse source 
svn path=/trunk/; revision=28925
This commit is contained in:
Hervé Poussineau 2007-09-07 15:44:44 +00:00
parent b1a07a3e6b
commit c4be097a4e
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -389,7 +389,7 @@ MingwModuleHandler::OutputCopyCommand ( const FileLocation& source,
fprintf ( fMakefile, fprintf ( fMakefile,
"\t${cp} %s %s 1>$(NUL)\n", "\t${cp} %s %s 1>$(NUL)\n",
strFile ( &source ).c_str (), strFile ( &source ).c_str (),
strFile ( &destination ).c_str () ); strFile ( PassThruCacheDirectory ( &destination ) ).c_str () );
} }
string string
@ -3353,8 +3353,8 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ()
FileLocation reactosDff ( SourceDirectory, FileLocation reactosDff ( SourceDirectory,
"boot" + sSep + "bootdata" + sSep + "packages", "boot" + sSep + "bootdata" + sSep + "packages",
"reactos.dff" ); "reactos.dff" );
FileLocation reactosInf ( TemporaryDirectory, FileLocation reactosInf ( bootcdReactos.directory,
"", bootcdReactos.relative_path,
"reactos.inf" ); "reactos.inf" );
vSourceFiles.push_back ( reactosDff ); vSourceFiles.push_back ( reactosDff );
@ -3371,13 +3371,13 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ()
// fill cdrom // fill cdrom
GetCdDirectories ( vCdDirectories, bootcdDirectory ); GetCdDirectories ( vCdDirectories, bootcdDirectory );
GetCdFiles ( vCdFiles ); GetCdFiles ( vCdFiles );
string cdDirectories = v2s ( vCdDirectories, 5 ); string cdDirectories = "";//v2s ( vCdDirectories, 5 );
string cdFiles = v2s ( vCdFiles, 5 ); string cdFiles = v2s ( vCdFiles, 5 );
fprintf ( fMakefile, ".PHONY: %s\n\n", fprintf ( fMakefile, ".PHONY: %s\n\n",
module.name.c_str ()); module.name.c_str ());
fprintf ( fMakefile, fprintf ( fMakefile,
"%s: all %s %s %s $(CABMAN_TARGET) $(CDMAKE_TARGET) | %s\n", "%s: all %s %s %s $(CABMAN_TARGET) $(CDMAKE_TARGET) %s\n",
module.name.c_str (), module.name.c_str (),
strFile ( &isoboot ).c_str (), strFile ( &isoboot ).c_str (),
sourceFiles.c_str (), sourceFiles.c_str (),