Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-30 16:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

added LiveCDRegTest and BootCDRegTest targets

Browse source 
svn path=/trunk/; revision=23743
This commit is contained in:
Christoph von Wittich 2006-08-27 13:28:23 +00:00
parent 454bef01db
commit 5a6172f875
5 changed files with 72 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -438,6 +438,10 @@ MingwBackend::IncludeInAllTarget ( const Module& module ) const
return false;
if ( module.type == LiveIso )
return false;
if ( module.type == IsoRegTest )
return false;
if ( module.type == LiveIsoRegTest )
return false;
if ( module.type == Test )
return false;
if ( module.type == Alias )

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

@ -241,6 +241,12 @@ MingwModuleHandler::InstanciateHandler (
case LiveIso:
handler = new MingwLiveIsoModuleHandler ( module );
break;
case IsoRegTest:
handler = new MingwIsoModuleHandler ( module );
break;
case LiveIsoRegTest:
handler = new MingwLiveIsoModuleHandler ( module );
break;
case Test:
handler = new MingwTestModuleHandler ( module );
break;
@ -3006,9 +3012,25 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ()
string bootcd = PassThruCacheDirectory (
NormalizeFilename ( bootcdDirectory + sSep ),
backend->outputDirectory );
string bootloader;
string IsoName;
if (module.name == "bootcdregtest")
{
bootloader = "isobtrt.o";
IsoName = "ReactOS-RegTest.iso";
}
else
{
bootloader = "isoboot.o";
IsoName = "ReactOS.iso";
}
string isoboot = PassThruCacheDirectory (
NormalizeFilename ( "boot" + sSep + "freeldr" + sSep + "bootsect" + sSep + "isoboot.o" ),
NormalizeFilename ( "boot" + sSep + "freeldr" + sSep + "bootsect" + sSep + bootloader.c_str() ),
backend->outputDirectory );
string bootcdReactosNoFixup = bootcdDirectory + sSep + "reactos";
string bootcdReactos = PassThruCacheDirectory (
NormalizeFilename ( bootcdReactosNoFixup + sSep ),
@ -3049,9 +3071,10 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ()
OutputCdfileCopyCommands ( bootcdDirectory );
fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
fprintf ( fMakefile,
"\t$(Q)$(CDMAKE_TARGET) -v -m -b %s %s REACTOS ReactOS.iso\n",
"\t$(Q)$(CDMAKE_TARGET) -v -m -b %s %s REACTOS %s\n",
isoboot.c_str (),
bootcd.c_str () );
bootcd.c_str (),
IsoName.c_str() );
fprintf ( fMakefile,
"\n" );
}
@ -3175,13 +3198,29 @@ MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory )
void
MingwLiveIsoModuleHandler::GenerateLiveIsoModuleTarget ()
{
string livecdDirectory = "livecd";
string livecdDirectory = module.name;
string livecd = PassThruCacheDirectory (
NormalizeFilename ( livecdDirectory + sSep ),
backend->outputDirectory );
string bootloader;
string IsoName;
if (module.name == "livecdregtest")
{
bootloader = "isobtrt.o";
IsoName = "ReactOS-LiveCD-RegTest.iso";
}
else
{
bootloader = "isoboot.o";
IsoName = "ReactOS-LiveCD.iso";
}
string isoboot = PassThruCacheDirectory (
NormalizeFilename ( "boot" + sSep + "freeldr" + sSep + "bootsect" + sSep + "isoboot.o" ),
NormalizeFilename ( "boot" + sSep + "freeldr" + sSep + "bootsect" + sSep + bootloader.c_str() ),
backend->outputDirectory );
string reactosDirectory = "reactos";
string livecdReactosNoFixup = livecdDirectory + sSep + reactosDirectory;
string livecdReactos = NormalizeFilename ( PassThruCacheDirectory (
@ -3205,9 +3244,10 @@ MingwLiveIsoModuleHandler::GenerateLiveIsoModuleTarget ()
OutputRegistryCommands ( livecdDirectory );
fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
fprintf ( fMakefile,
"\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS ReactOS-LiveCD.iso\n",
"\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS %s\n",
isoboot.c_str (),
livecd.c_str () );
livecd.c_str (),
IsoName.c_str() );
fprintf ( fMakefile,
"\n" );
}

2
reactos/tools/rbuild/bootstrap.cpp
View file

@ -60,6 +60,8 @@ Bootstrap::IsSupportedModuleType ( ModuleType type )
case ObjectLibrary:
case Iso:
case LiveIso:
case IsoRegTest:
case LiveIsoRegTest:
case Test:
case RpcServer:
case RpcClient:

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

@ -757,6 +757,10 @@ Module::GetModuleType ( const string& location, const XMLAttribute& attribute )
return Iso;
if ( attribute.value == "liveiso" )
return LiveIso;
if ( attribute.value == "isoregtest" )
return IsoRegTest;
if ( attribute.value == "liveisoregtest" )
return LiveIsoRegTest;
if ( attribute.value == "test" )
return Test;
if ( attribute.value == "rpcserver" )
@ -803,6 +807,8 @@ Module::GetDefaultModuleExtension () const
return ".o";
case Iso:
case LiveIso:
case IsoRegTest:
case LiveIsoRegTest:
return ".iso";
case Test:
return ".exe";
@ -855,6 +861,8 @@ Module::GetDefaultModuleEntrypoint () const
case BootSector:
case Iso:
case LiveIso:
case IsoRegTest:
case LiveIsoRegTest:
case RpcServer:
case RpcClient:
case Alias:
@ -894,6 +902,8 @@ Module::GetDefaultModuleBaseaddress () const
case BootSector:
case Iso:
case LiveIso:
case IsoRegTest:
case LiveIsoRegTest:
case RpcServer:
case RpcClient:
case Alias:
@ -936,6 +946,8 @@ Module::IsDLL () const
case BootProgram:
case Iso:
case LiveIso:
case IsoRegTest:
case LiveIsoRegTest:
case RpcServer:
case RpcClient:
case Alias:
@ -968,6 +980,8 @@ Module::GenerateInOutputTree () const
case BootProgram:
case Iso:
case LiveIso:
case IsoRegTest:
case LiveIsoRegTest:
return true;
case StaticLibrary:
case ObjectLibrary:
@ -1435,6 +1449,8 @@ AutoRegister::IsSupportedModuleType ( ModuleType type )
case ObjectLibrary:
case Iso:
case LiveIso:
case IsoRegTest:
case LiveIsoRegTest:
case Test:
case RpcServer:
case RpcClient:

4
reactos/tools/rbuild/rbuild.h
View file

@ -268,7 +268,9 @@ enum ModuleType
BootProgram = 19,
Win32SCR = 20,
ExportDriver = 21,
IdlHeader = 22
IdlHeader = 22,
IsoRegTest = 23,
LiveIsoRegTest = 24
};
enum HostType