Author: cwittich Date: Sun Aug 27 17:28:23 2006 New Revision: 23743
URL: http://svn.reactos.org/svn/reactos?rev=23743&view=rev Log: added LiveCDRegTest and BootCDRegTest targets
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/... ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sun Aug 27 17:28:23 2006 @@ -437,6 +437,10 @@ if ( module.type == Iso ) 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;
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/... ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Aug 27 17:28:23 2006 @@ -241,6 +241,12 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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" ); }
Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp?... ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Sun Aug 27 17:28:23 2006 @@ -60,6 +60,8 @@ case ObjectLibrary: case Iso: case LiveIso: + case IsoRegTest: + case LiveIsoRegTest: case Test: case RpcServer: case RpcClient:
Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev... ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Sun Aug 27 17:28:23 2006 @@ -757,6 +757,10 @@ 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 @@ return ".o"; case Iso: case LiveIso: + case IsoRegTest: + case LiveIsoRegTest: return ".iso"; case Test: return ".exe"; @@ -855,6 +861,8 @@ case BootSector: case Iso: case LiveIso: + case IsoRegTest: + case LiveIsoRegTest: case RpcServer: case RpcClient: case Alias: @@ -894,6 +902,8 @@ case BootSector: case Iso: case LiveIso: + case IsoRegTest: + case LiveIsoRegTest: case RpcServer: case RpcClient: case Alias: @@ -936,6 +946,8 @@ case BootProgram: case Iso: case LiveIso: + case IsoRegTest: + case LiveIsoRegTest: case RpcServer: case RpcClient: case Alias: @@ -968,6 +980,8 @@ case BootProgram: case Iso: case LiveIso: + case IsoRegTest: + case LiveIsoRegTest: return true; case StaticLibrary: case ObjectLibrary: @@ -1435,6 +1449,8 @@ case ObjectLibrary: case Iso: case LiveIso: + case IsoRegTest: + case LiveIsoRegTest: case Test: case RpcServer: case RpcClient:
Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=2... ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sun Aug 27 17:28:23 2006 @@ -268,7 +268,9 @@ BootProgram = 19, Win32SCR = 20, ExportDriver = 21, - IdlHeader = 22 + IdlHeader = 22, + IsoRegTest = 23, + LiveIsoRegTest = 24 };
enum HostType
-
cwittich＠svn.reactos.org