[spetreolle] 51830: Rehaul the bootcd tree. All dlls and drivers are in their normal directories instead of having all in reactos\. Original implementation by zefklop in cmake branch.
20 May
2011
20 May
'11
10:29 p.m.
Author: spetreolle
Date: Fri May 20 22:29:54 2011
New Revision: 51830
URL: http://svn.reactos.org/svn/reactos?rev=51830&view=rev
Log:
Rehaul the bootcd tree.
All dlls and drivers are in their normal directories instead of having all in reactos\.
Original implementation by zefklop in cmake branch.
Modified:
trunk/reactos/base/setup/usetup/interface/usetup.c
trunk/reactos/boot/bootdata/txtsetup.sif
trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c
trunk/reactos/dll/win32/syssetup/wizard.c
trunk/reactos/drivers/base/bootvid/bootvid.rbuild
trunk/reactos/drivers/base/kdcom/kdcom.rbuild
trunk/reactos/drivers/base/kddll/kddll.rbuild
trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild
trunk/reactos/drivers/bus/acpi/acpi.rbuild
trunk/reactos/drivers/bus/isapnp/isapnp.rbuild
trunk/reactos/drivers/bus/pci/pci.rbuild
trunk/reactos/drivers/bus/pcix/pcix.rbuild
trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild
trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild
trunk/reactos/drivers/filesystems/ext2/ext2.rbuild
trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild
trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild
trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild
trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild
trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild
trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild
trunk/reactos/drivers/setup/blue/blue.rbuild
trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild
trunk/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild
trunk/reactos/drivers/storage/class/class2/class2.rbuild
trunk/reactos/drivers/storage/class/disk/disk.rbuild
trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild
trunk/reactos/drivers/storage/classpnp/classpnp.rbuild
trunk/reactos/drivers/storage/floppy/floppy.rbuild
trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild
trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild
trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild
trunk/reactos/drivers/storage/scsiport/scsiport.rbuild
trunk/reactos/hal/halarm/hal.rbuild
trunk/reactos/hal/halarm/omap3/halup.rbuild
trunk/reactos/hal/halarm/versa/halup.rbuild
trunk/reactos/hal/halppc/up/halup.rbuild
trunk/reactos/hal/halx86/hal.rbuild
trunk/reactos/hal/halx86/halacpi.rbuild
trunk/reactos/hal/halx86/halamd64.rbuild
trunk/reactos/hal/halx86/halmps.rbuild
trunk/reactos/media/nls/nls.rbuild
trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri May 20 22:29:54
2011
@@ -1404,7 +1404,7 @@
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 @@
PWCHAR FileKeyValue;
PWCHAR DirKeyValue;
PWCHAR TargetFileName;
+ WCHAR CompleteOrigFileName[512];
if (SourceCabinet)
return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet,
DestinationPath, Ir);
@@ -2901,10 +2902,14 @@
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 @@
{
UCHAR PartitionType;
NTSTATUS Status;
-
+
PartitionType = PartitionList->ActiveBootPartition->
PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType;
-
+
Status = InstallVBRToPartition(&SystemRootPath,
&SourceRootPath,
&DestinationArcPath,
@@ -3614,7 +3619,7 @@
MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
}
-
+
return SUCCESS_PAGE;
}
@@ -3644,10 +3649,10 @@
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 @@
case BOOT_LOADER_HARDDISK_MBR_PAGE:
Page = BootLoaderHarddiskMbrPage(&Ir);
break;
-
+
case BOOT_LOADER_HARDDISK_VBR_PAGE:
Page = BootLoaderHarddiskVbrPage(&Ir);
break;
Modified: trunk/reactos/boot/bootdata/txtsetup.sif
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif…
==============================================================================
--- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri May 20 22:29:54 2011
@@ -39,7 +39,12 @@
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
Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Fri May 20
22:29:54 2011
@@ -109,11 +109,11 @@
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 @@
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,31 +279,34 @@
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);
@@ -306,9 +314,15 @@
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
if (KdComDTE)
WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE);
-
- /* Load NLS data */
- SetupLdrLoadNlsData(LoaderBlock, InfHandle, BootPath);
+ /* 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, they are in system32 */
+ SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath);
/* Get a list of boot drivers */
SetupLdrScanBootDrivers(LoaderBlock, InfHandle, BootPath);
Modified: trunk/reactos/dll/win32/syssetup/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Fri May 20 22:29:54 2011
@@ -1921,7 +1921,7 @@
HKEY hKey = 0;
DWORD InProgress = 0;
DWORD InstallDate;
-
+
if (RegOpenKeyExW( HKEY_LOCAL_MACHINE,
L"SYSTEM\\Setup",
0,
@@ -1931,7 +1931,7 @@
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 @@
{
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 @@
hWnd = (HWND)PropertySheet(&psh);
ShowWindow(hWnd, SW_SHOW);
- while (GetMessage(&msg, NULL, 0, 0))
+ while (GetMessage(&msg, NULL, 0, 0))
{
if(!IsDialogMessage(hWnd, &msg))
{
Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv…
==============================================================================
--- trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r…
==============================================================================
--- trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/base/kddll/kddll.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.r…
==============================================================================
--- trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid…
==============================================================================
--- trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rbui…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/bus/isapnp/isapnp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.…
==============================================================================
--- trunk/reactos/drivers/bus/isapnp/isapnp.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/isapnp/isapnp.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/bus/pci/pci.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.rbuild…
==============================================================================
--- trunk/reactos/drivers/bus/pci/pci.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pci/pci.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/bus/pcix/pcix.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcix.rbui…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/pcix.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/pcix.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pcmcia.…
==============================================================================
--- trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c…
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n…
==============================================================================
--- trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80…
==============================================================================
--- trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd…
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/sw…
==============================================================================
--- trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/swenum/swenum.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/setup/blue/blue.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.rb…
==============================================================================
--- trunk/reactos/drivers/setup/blue/blue.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/setup/blue/blue.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild [iso-8859-1]
(original)
+++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas…
==============================================================================
--- trunk/reactos/drivers/storage/class/class2/class2.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/class2/class2.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/storage/class/disk/disk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk…
==============================================================================
--- trunk/reactos/drivers/storage/class/disk/disk.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/disk/disk.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd…
==============================================================================
--- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/storage/classpnp/classpnp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/storage/floppy/floppy.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo…
==============================================================================
--- trunk/reactos/drivers/storage/floppy/floppy.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/floppy/floppy.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/…
==============================================================================
--- trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] Fri May 20 22:29:54
2011
@@ -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>
Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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">
Modified: trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo…
==============================================================================
--- trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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>
Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] Fri May 20
22:29:54 2011
@@ -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>
Modified: trunk/reactos/hal/halarm/hal.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/hal.rbuild?rev=…
==============================================================================
--- trunk/reactos/hal/halarm/hal.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halarm/hal.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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_" />
Modified: trunk/reactos/hal/halarm/omap3/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/omap3/halup.rbu…
==============================================================================
--- trunk/reactos/hal/halarm/omap3/halup.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halarm/omap3/halup.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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_" />
Modified: trunk/reactos/hal/halarm/versa/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/versa/halup.rbu…
==============================================================================
--- trunk/reactos/hal/halarm/versa/halup.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halarm/versa/halup.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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_" />
Modified: trunk/reactos/hal/halppc/up/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild…
==============================================================================
--- trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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_" />
Modified: trunk/reactos/hal/halx86/hal.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?rev=…
==============================================================================
--- trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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_" />
Modified: trunk/reactos/hal/halx86/halacpi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halacpi.rbuild?…
==============================================================================
--- trunk/reactos/hal/halx86/halacpi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/halacpi.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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_" />
Modified: trunk/reactos/hal/halx86/halamd64.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild…
==============================================================================
--- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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 -->
Modified: trunk/reactos/hal/halx86/halmps.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?r…
==============================================================================
--- trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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" />
Modified: trunk/reactos/media/nls/nls.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/nls.rbuild?rev=5…
==============================================================================
--- trunk/reactos/media/nls/nls.rbuild [iso-8859-1] (original)
+++ trunk/reactos/media/nls/nls.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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>
Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.…
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Fri May 20 22:29:54 2011
@@ -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_" />
4928
days inactive
4928
days old
0 comments
1 participants
participants (1)
-
spetreolle＠svn.reactos.org