Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rehaul the bootcd tree.

Browse source 
All dlls and drivers are in their normal directories instead of having all in reactos\.
Original implementation by zefklop in cmake branch.

svn path=/trunk/; revision=51830
This commit is contained in:
Sylvain Petreolle 2011-05-20 22:29:54 +00:00
parent 2416d7a569
commit 3d1a962bcb
43 changed files with 107 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
reactos/base/setup/usetup/interface/usetup.c
View file

@ -1404,7 +1404,7 @@ IsDiskSizeValid(PPARTENTRY PartEntry)
ULONGLONG m1, m2;
/* check for unpartitioned space */
m1 = PartEntry->UnpartitionedLength;
m1 = PartEntry->UnpartitionedLength;
m1 = (m1 + (1 << 19)) >> 20; /* in MBytes (rounded) */
if( m1 > RequiredPartitionDiskSpace)
@ -2843,6 +2843,7 @@ AddSectionToCopyQueue(HINF InfFile,
PWCHAR FileKeyValue;
PWCHAR DirKeyValue;
PWCHAR TargetFileName;
WCHAR CompleteOrigFileName[512];
if (SourceCabinet)
return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir);
@ -2901,10 +2902,14 @@ AddSectionToCopyQueue(HINF InfFile,
break;
}
wcscpy(CompleteOrigFileName, SourceRootDir.Buffer);
wcscat(CompleteOrigFileName, L"\\");
wcscat(CompleteOrigFileName, DirKeyValue);
if (!SetupQueueCopy(SetupFileQueue,
SourceCabinet,
SourceRootPath.Buffer,
SourceRootDir.Buffer,
CompleteOrigFileName,
FileKeyName,
DirKeyValue,
TargetFileName))
@ -3601,10 +3606,10 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir)
{
UCHAR PartitionType;
NTSTATUS Status;
PartitionType = PartitionList->ActiveBootPartition->
PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType;
Status = InstallVBRToPartition(&SystemRootPath,
&SourceRootPath,
&DestinationArcPath,
@ -3614,7 +3619,7 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir)
MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
}
return SUCCESS_PAGE;
}
@ -3644,10 +3649,10 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir)
swprintf(DestinationDevicePathBuffer,
L"\\Device\\Harddisk%d\\Partition0",
PartitionList->ActiveBootDisk->DiskNumber);
wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer);
wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin");
DPRINT("Install MBR bootcode: %S ==> %S\n",
SourceMbrPathBuffer, DestinationDevicePathBuffer);
@ -3931,7 +3936,7 @@ RunUSetup(VOID)
case BOOT_LOADER_HARDDISK_MBR_PAGE:
Page = BootLoaderHarddiskMbrPage(&Ir);
break;
case BOOT_LOADER_HARDDISK_VBR_PAGE:
Page = BootLoaderHarddiskVbrPage(&Ir);
break;

7
reactos/boot/bootdata/txtsetup.sif
View file

@ -39,7 +39,12 @@ pci.sys=,,,,,,,,,,,,4
scsiport.sys=,,,,,,x,,,,,,4
fastfat.sys=,,,,,,x,,,,,,4
ramdisk.sys=,,,,,,x,,,,,,4
ext2.sys=,,,,,,x,,,,,,4
ext2fs.sys=,,,,,,x,,,,,,4
classpnp.sys=,,,,,,,,,,,,4
pcix.sys=,,,,,,,,,,,,4
pcmcia.sys=,,,,,,,,,,,,4
swenum.sys=,,,,,,,,,,,,4
ntdll.dll=,,,,,,,,,,,,2
[HardwareIdsDatabase]
;*PNP0A00 = isapnp

70
reactos/boot/freeldr/freeldr/windows/setupldr2.c
View file

@ -109,11 +109,11 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR
VOID
SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath)
{
INFCONTEXT InfContext;
INFCONTEXT InfContext, dirContext;
BOOLEAN Status;
LPCSTR Media, DriverName;
LPCSTR Media, DriverName, dirIndex, ImagePath;
WCHAR ServiceName[256];
WCHAR ImagePath[256];
WCHAR ImagePathW[256];
/* Open inf section */
if (!InfFindFirstLine(InfHandle, "SourceDisksFiles", NULL, &InfContext))
@ -123,23 +123,28 @@ SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPC
do
{
if (InfGetDataField(&InfContext, 7, &Media) &&
InfGetDataField(&InfContext, 0, &DriverName))
InfGetDataField(&InfContext, 0, &DriverName) &&
InfGetDataField(&InfContext, 13, &dirIndex))
{
if (strcmp(Media, "x") == 0)
if ((strcmp(Media, "x") == 0) &&
InfFindFirstLine(InfHandle, "Directories", dirIndex, &dirContext) &&
InfGetDataField(&dirContext, 1, &ImagePath))
{
/* Convert name to widechar */
swprintf(ServiceName, L"%S", DriverName);
/* Prepare image path */
swprintf(ImagePathW, L"%S", ImagePath);
wcscat(ImagePathW, L"\\");
wcscat(ImagePathW, ServiceName);
/* Remove .sys extension */
ServiceName[wcslen(ServiceName) - 4] = 0;
/* Prepare image path */
swprintf(ImagePath, L"%S", DriverName);
/* Add it to the list */
Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead,
L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
ImagePath,
ImagePathW,
ServiceName);
if (!Status)
@ -274,41 +279,50 @@ VOID LoadReactOSSetup2(VOID)
UseRealHeap = TRUE;
LoaderBlock->ConfigurationRoot = MachHwDetect();
strcpy(FileName, "\\ArcName\\");
/* Load kernel */
strcpy(FileName, BootPath);
strcat(FileName, "NTOSKRNL.EXE");
Status = WinLdrLoadImage(FileName, LoaderSystemCode, &NtosBase);
strcpy(FileName+strlen("\\ArcName\\"), BootPath);
strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE");
Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderSystemCode, &NtosBase);
DPRINTM(DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase);
Status = WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe",
FileName, NtosBase, &KernelDTE);
DPRINTM(DPRINT_WINDOWS, "Ntos Data Table Entry allocated with status %d at %p\n", Status, KernelDTE);
/* Load HAL */
strcpy(FileName, BootPath);
strcat(FileName, "HAL.DLL");
Status = WinLdrLoadImage(FileName, LoaderHalCode, &HalBase);
strcpy(FileName+strlen("\\ArcName\\"), BootPath);
strcat(FileName, "SYSTEM32\\HAL.DLL");
Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderHalCode, &HalBase);
DPRINTM(DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase);
Status = WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll",
FileName, HalBase, &HalDTE);
DPRINTM(DPRINT_WINDOWS, "HAL Data Table Entry allocated with status %d at %p\n", Status, HalDTE);
/* Load kernel-debugger support dll */
strcpy(FileName, BootPath);
strcat(FileName, "KDCOM.DLL");
Status = WinLdrLoadImage(FileName, LoaderBootDriver, &KdComBase);
strcpy(FileName+strlen("\\ArcName\\"), BootPath);
strcat(FileName, "SYSTEM32\\KDCOM.DLL");
Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderBootDriver, &KdComBase);
DPRINTM(DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase);
/* Allocate data table entries for above-loaded modules */
WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe",
"NTOSKRNL.EXE", NtosBase, &KernelDTE);
WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll",
"HAL.DLL", HalBase, &HalDTE);
WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll",
"KDCOM.DLL", KdComBase, &KdComDTE);
Status = WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll",
FileName, KdComBase, &KdComDTE);
DPRINTM(DPRINT_WINDOWS, "KdCom Data Table Entry allocated with status %d at %p\n", Status, HalDTE);
/* Load all referenced DLLs for kernel, HAL and kdcom.dll */
strcpy(SearchPath, BootPath);
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE);
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
if (KdComDTE)
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE);
/* In system32 too */
strcpy(SearchPath + strlen(BootPath), "system32\\");
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE);
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
if (KdComDTE)
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE);
/* Load NLS data */
SetupLdrLoadNlsData(LoaderBlock, InfHandle, BootPath);
/* Load NLS data, they are in system32 */
SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath);
/* Get a list of boot drivers */
SetupLdrScanBootDrivers(LoaderBlock, InfHandle, BootPath);

8
reactos/dll/win32/syssetup/wizard.c
View file

@ -1921,7 +1921,7 @@ SetInstallationCompleted(VOID)
HKEY hKey = 0;
DWORD InProgress = 0;
DWORD InstallDate;
if (RegOpenKeyExW( HKEY_LOCAL_MACHINE,
L"SYSTEM\\Setup",
0,
@ -1931,7 +1931,7 @@ SetInstallationCompleted(VOID)
RegSetValueExW( hKey, L"SystemSetupInProgress", 0, REG_DWORD, (LPBYTE)&InProgress, sizeof(InProgress) );
RegCloseKey( hKey );
}
if (RegOpenKeyExW( HKEY_LOCAL_MACHINE,
L"Software\\Microsoft\\Windows NT\\CurrentVersion",
0,
@ -2233,7 +2233,7 @@ GetRosInstallCD(WCHAR * szPath, DWORD dwPathLength)
{
WCHAR szBuffer[MAX_PATH];
wcscpy(szBuffer, szDrive);
wcscat(szBuffer, L"reactos\\ntoskrnl.exe");
wcscat(szBuffer, L"reactos\\system32\\ntoskrnl.exe");
LogItem(SYSSETUP_SEVERITY_INFORMATION, szBuffer);
if (FileExists(szBuffer, NULL))
{
@ -2383,7 +2383,7 @@ InstallWizard(VOID)
hWnd = (HWND)PropertySheet(&psh);
ShowWindow(hWnd, SW_SHOW);
while (GetMessage(&msg, NULL, 0, 0))
while (GetMessage(&msg, NULL, 0, 0))
{
if(!IsDialogMessage(hWnd, &msg))
{

2
reactos/drivers/base/bootvid/bootvid.rbuild
View file

@ -2,7 +2,7 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="bootvid" type="kernelmodedll" entrypoint="0" installbase="system32" installname="bootvid.dll">
<importlibrary definition="bootvid.spec"></importlibrary>
<bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" />
<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="bootvid.dll" />
<include base="bootvid">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/base/kdcom/kdcom.rbuild
View file

@ -2,7 +2,7 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="kdcom" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kdcom.dll">
<importlibrary definition="kdcom.spec"></importlibrary>
<bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="kdcom.dll" />
<include base="kdcom">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/base/kddll/kddll.rbuild
View file

@ -16,7 +16,7 @@
<module name="kdcom" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kdcom.dll">
<importlibrary definition="kddll.spec"></importlibrary>
<bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="kdcom.dll" />
<include base="kdcom">.</include>
<library>kdlib</library>
<library>kdserial</library>

2
reactos/drivers/base/nmidebug/nmidebug.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="nmidebug" type="kernelmodedriver" installbase="system32/drivers" installname="nmidebug.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="null">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/bus/acpi/acpi.rbuild
View file

@ -18,7 +18,7 @@
</if>
<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" allowwarnings="true">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="acpi">include</include>
<include base="acpica">include</include>
<library>ntoskrnl</library>

2
reactos/drivers/bus/isapnp/isapnp.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="isapnp" type="kernelmodedriver" installbase="system32/drivers" installname="isapnp.sys">
<bootstrap installbase="$(CDOUTPUT)"/>
<bootstrap installbase="$(CDOUTPUT)/system32/drivers"/>
<include base="isapnp">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/bus/pci/pci.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="pci" type="kernelmodedriver" installbase="system32/drivers" installname="pci.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="pci">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/bus/pcix/pcix.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="pcix" type="kernelmodedriver" installbase="system32/drivers" installname="pcix.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="pcix">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/bus/pcmcia/pcmcia.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="pcmcia" type="kernelmodedriver" installbase="system32/drivers" installname="pcmcia.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="pcmcia">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/filesystems/cdfs/cdfs.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="cdfs">.</include>
<library>ntoskrnl</library>
<library>hal</library>

4
reactos/drivers/filesystems/ext2/ext2.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2fs.sys">
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="ext2fs">inc</include>
<compilerflag compilerset="msc">/wd4003</compilerflag>
<library>ntoskrnl</library>

2
reactos/drivers/filesystems/fastfat/vfatfs.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="fastfat" type="kernelmodedriver" installbase="system32/drivers" installname="fastfat.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="fastfat">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/filesystems/fastfat_new/fastfat.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="fastfatn" type="kernelmodedriver" installbase="system32/drivers" installname="fastfatn.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="fastfatn">.</include>
<include base="ReactOS">include/reactos/libs/fullfat</include>
<library>fullfat</library>

2
reactos/drivers/filesystems/ntfs/ntfs.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="ntfs">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/input/i8042prt/i8042prt.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<library>ntoskrnl</library>
<library>hal</library>
<file>createclose.c</file>

2
reactos/drivers/input/kbdclass/kbdclass.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<library>pseh</library>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/ksfilter/swenum/swenum.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="swenum" type="kernelmodedriver" installbase="system32/drivers" installname="swenum.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<library>ntoskrnl</library>
<library>ks</library>
<file>swenum.c</file>

2
reactos/drivers/setup/blue/blue.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="ReactOS">include/reactos/drivers</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/storage/class/cdrom/cdrom.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<library>ntoskrnl</library>
<library>hal</library>
<library>class2</library>

2
reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="cdrom_new" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom_new.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<library>ntoskrnl</library>
<library>hal</library>
<library>classpnp</library>

2
reactos/drivers/storage/class/class2/class2.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<importlibrary definition="class2.spec" />
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/storage/class/disk/disk.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<library>ntoskrnl</library>
<library>hal</library>
<library>class2</library>

2
reactos/drivers/storage/class/ramdisk/ramdisk.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="ramdisk" type="kernelmodedriver" installbase="system32/drivers" installname="ramdisk.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<library>ntoskrnl</library>
<library>hal</library>
<file>ramdisk.c</file>

2
reactos/drivers/storage/classpnp/classpnp.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="classpnp" type="kernelmodedriver" installbase="system32/drivers" installname="classpnp.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<importlibrary definition="class.spec" />
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/storage/floppy/floppy.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="floppy">.</include>
<library>ntoskrnl</library>
<library>hal</library>

2
reactos/drivers/storage/ide/atapi/atapi.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="atapi">.</include>
<library>scsiport</library>
<library>libcntpr</library>

2
reactos/drivers/storage/ide/uniata/uniata.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" installname="uniata.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="uniata">.</include>
<include base="uniata">inc</include>
<group compilerset="gcc">

2
reactos/drivers/storage/port/buslogic/buslogic.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys" crt="libcntpr">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<include base="buslogic">.</include>
<library>scsiport</library>
<file>BusLogic958.c</file>

2
reactos/drivers/storage/scsiport/scsiport.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
<define name="_SCSIPORT_" />
<importlibrary definition="scsiport.pspec" />
<include base="scsiport">.</include>

2
reactos/hal/halarm/hal.rbuild
View file

@ -3,7 +3,7 @@
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll">
<importlibrary base="hal" definition="../hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32" />
<include>include</include>
<include base="ntoskrnl">include</include>
<define name="_NTHAL_" />

2
reactos/hal/halarm/omap3/halup.rbuild
View file

@ -2,7 +2,7 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll">
<importlibrary base="hal" definition="../hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" />
<include base="hal">include</include>
<include base="ntoskrnl">include</include>
<define name="_NTHAL_" />

2
reactos/hal/halarm/versa/halup.rbuild
View file

@ -2,7 +2,7 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll">
<importlibrary base="hal" definition="../hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" />
<include base="hal">include</include>
<include base="ntoskrnl">include</include>
<define name="_NTHAL_" />

2
reactos/hal/halppc/up/halup.rbuild
View file

@ -2,7 +2,7 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem">
<importlibrary definition="../../hal/hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" />
<include base="halppc_generic">../include</include>
<include base="ntoskrnl">include</include>
<define name="_NTHAL_" />

2
reactos/hal/halx86/hal.rbuild
View file

@ -3,7 +3,7 @@
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll">
<importlibrary base="hal" definition="../hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32" />
<include>include</include>
<include base="ntoskrnl">include</include>
<define name="_NTHALDLL_" />

2
reactos/hal/halx86/halacpi.rbuild
View file

@ -3,7 +3,7 @@
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="halacpi" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="halacpi.dll">
<importlibrary base="hal" definition="../hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32" />
<include>include</include>
<include base="ntoskrnl">include</include>
<define name="_NTHALDLL_" />

2
reactos/hal/halx86/halamd64.rbuild
View file

@ -3,7 +3,7 @@
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll">
<importlibrary base="hal" definition="../hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" />
<include base="hal">include</include>
<include base="ntoskrnl">include</include>
<!-- include base="x86emu">.</include -->

2
reactos/hal/halx86/halmps.rbuild
View file

@ -3,7 +3,7 @@
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="halmps" type="kernelmodedll" entrypoint="HalInitSystem@8">
<importlibrary base="hal" definition="../hal.pspec" />
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32" />
<include>include</include>
<include base="ntoskrnl">include</include>
<define name="CONFIG_SMP" />

6
reactos/media/nls/nls.rbuild
View file

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group>
<cdfile installbase="$(CDOUTPUT)">c_437.nls</cdfile>
<cdfile installbase="$(CDOUTPUT)">c_1252.nls</cdfile>
<cdfile installbase="$(CDOUTPUT)">l_intl.nls</cdfile>
<cdfile installbase="$(CDOUTPUT)/system32">c_437.nls</cdfile>
<cdfile installbase="$(CDOUTPUT)/system32">c_1252.nls</cdfile>
<cdfile installbase="$(CDOUTPUT)/system32">l_intl.nls</cdfile>
<installfile installbase="system32">c_037.nls</installfile>
<installfile installbase="system32">c_424.nls</installfile>

2
reactos/ntoskrnl/ntoskrnl-generic.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<bootstrap installbase="$(CDOUTPUT)" />
<bootstrap installbase="$(CDOUTPUT)/system32" />
<importlibrary definition="ntoskrnl.pspec" />
<define name="__NTOSKRNL__" />
<define name="_NTOSKRNL_" />