[ros-diffs] [hpoussin] 29330: Rename 'base' to 'installbase' for CdFile, InstallFile and Bootstrap Patch by Marc Piulachs, marc dot piulachs at codexchange dot net See issue #2706 for more details.
hpoussin at svn.reactos.org
hpoussin at svn.reactos.org
Mon Oct 1 16:19:28 CEST 2007
Author: hpoussin
Date: Mon Oct 1 18:19:27 2007
New Revision: 29330
URL: http://svn.reactos.org/svn/reactos?rev=29330&view=rev
Log:
Rename 'base' to 'installbase' for CdFile, InstallFile and Bootstrap
Patch by Marc Piulachs, marc dot piulachs at codexchange dot net
See issue #2706 for more details.
Modified:
trunk/reactos/base/services/services.rbuild
trunk/reactos/base/setup/reactos/reactos.rbuild
trunk/reactos/base/setup/usetup/usetup.rbuild
trunk/reactos/base/setup/welcome/welcome.rbuild
trunk/reactos/base/shell/explorer/explorer.rbuild
trunk/reactos/boot/bootdata/bootdata.rbuild
trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild
trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild
trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild
trunk/reactos/dll/ntdll/ntdll.rbuild
trunk/reactos/drivers/base/bootvid/bootvid.rbuild
trunk/reactos/drivers/base/kdcom/kdcom.rbuild
trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild
trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild
trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild
trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild
trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild
trunk/reactos/drivers/setup/blue/blue.rbuild
trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild
trunk/reactos/drivers/storage/class/class2/class2.rbuild
trunk/reactos/drivers/storage/class/disk/disk.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/port/diskdump/diskdump.rbuild
trunk/reactos/drivers/storage/scsiport/scsiport.rbuild
trunk/reactos/hal/halppc/up/halup.rbuild
trunk/reactos/hal/halx86/mp/halmp.rbuild
trunk/reactos/hal/halx86/up/halup.rbuild
trunk/reactos/media/drivers/etc/etc.rbuild
trunk/reactos/media/fonts/fonts.rbuild
trunk/reactos/media/inf/inf.rbuild
trunk/reactos/media/nls/nls.rbuild
trunk/reactos/ntoskrnl/ntoskrnl.rbuild
trunk/reactos/tools/rbuild/bootstrap.cpp
trunk/reactos/tools/rbuild/cdfile.cpp
trunk/reactos/tools/rbuild/doc/rbuild.txt
trunk/reactos/tools/rbuild/installfile.cpp
trunk/reactos/tools/rbuild/project.dtd
Modified: trunk/reactos/base/services/services.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/base/services/services.rbuild (original)
+++ trunk/reactos/base/services/services.rbuild Mon Oct 1 18:19:27 2007
@@ -1,22 +1,22 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
-<directory name="audiosrv">
- <xi:include href="audiosrv/audiosrv.rbuild" />
-</directory>
-<directory name="dhcp">
- <xi:include href="dhcp/dhcp.rbuild" />
-</directory>
-<directory name="eventlog">
- <xi:include href="eventlog/eventlog.rbuild" />
-</directory>
-<directory name="rpcss">
- <xi:include href="rpcss/rpcss.rbuild" />
-</directory>
-<directory name="tcpsvcs">
- <xi:include href="tcpsvcs/tcpsvcs.rbuild" />
-</directory>
-<directory name="umpnpmgr">
- <xi:include href="umpnpmgr/umpnpmgr.rbuild" />
-</directory>
+ <directory name="audiosrv">
+ <xi:include href="audiosrv/audiosrv.rbuild" />
+ </directory>
+ <directory name="dhcp">
+ <xi:include href="dhcp/dhcp.rbuild" />
+ </directory>
+ <directory name="eventlog">
+ <xi:include href="eventlog/eventlog.rbuild" />
+ </directory>
+ <directory name="rpcss">
+ <xi:include href="rpcss/rpcss.rbuild" />
+ </directory>
+ <directory name="tcpsvcs">
+ <xi:include href="tcpsvcs/tcpsvcs.rbuild" />
+ </directory>
+ <directory name="umpnpmgr">
+ <xi:include href="umpnpmgr/umpnpmgr.rbuild" />
+ </directory>
</group>
Modified: trunk/reactos/base/setup/reactos/reactos.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/base/setup/reactos/reactos.rbuild (original)
+++ trunk/reactos/base/setup/reactos/reactos.rbuild Mon Oct 1 18:19:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="reactos" type="win32gui">
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<include base="reactos">.</include>
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
Modified: trunk/reactos/base/setup/usetup/usetup.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/usetup.rbuild (original)
+++ trunk/reactos/base/setup/usetup/usetup.rbuild Mon Oct 1 18:19:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" allowwarnings="false">
- <bootstrap base="$(CDOUTPUT)/system32" nameoncd="smss.exe" />
+ <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="smss.exe" />
<include base="usetup">.</include>
<include base="zlib">.</include>
<include base="inflib">.</include>
Modified: trunk/reactos/base/setup/welcome/welcome.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/base/setup/welcome/welcome.rbuild (original)
+++ trunk/reactos/base/setup/welcome/welcome.rbuild Mon Oct 1 18:19:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe">
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<include base="welcome">.</include>
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
Modified: trunk/reactos/base/shell/explorer/explorer.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explorer.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer.rbuild (original)
+++ trunk/reactos/base/shell/explorer/explorer.rbuild Mon Oct 1 18:19:27 2007
@@ -70,7 +70,7 @@
<file>i386-stub-win32.c</file>
<file>explorer.rc</file>
</module>
-<installfile base=".">explorer-cfg-template.xml</installfile>
+<installfile installbase=".">explorer-cfg-template.xml</installfile>
<directory name="notifyhook">
<xi:include href="notifyhook/notifyhook.rbuild" />
</directory>
Modified: trunk/reactos/boot/bootdata/bootdata.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/bootdata.rbuild (original)
+++ trunk/reactos/boot/bootdata/bootdata.rbuild Mon Oct 1 18:19:27 2007
@@ -4,12 +4,12 @@
<cdfile>autorun.inf</cdfile>
<cdfile>icon.ico</cdfile>
<cdfile>readme.txt</cdfile>
- <cdfile base="$(CDOUTPUT)">hivecls.inf</cdfile>
- <cdfile base="$(CDOUTPUT)">hivedef.inf</cdfile>
- <cdfile base="$(CDOUTPUT)">hivesft.inf</cdfile>
- <cdfile base="$(CDOUTPUT)">hivesys.inf</cdfile>
- <cdfile base="$(CDOUTPUT)">txtsetup.sif</cdfile>
- <cdfile base="$(CDOUTPUT)">unattend.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>
<directory name="bootcd">
<xi:include href="bootcd/bootcd.rbuild" />
</directory>
Modified: trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild (original)
+++ trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild Mon Oct 1 18:19:27 2007
@@ -2,27 +2,27 @@
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group>
<module name="dosmbr" type="bootsector" >
- <bootstrap base="loader" nameoncd="dosmbr.bin" />
+ <bootstrap installbase="loader" nameoncd="dosmbr.bin" />
<file>dosmbr.asm</file>
</module>
<module name="ext2" type="bootsector">
- <bootstrap base="loader" nameoncd="ext2.bin" />
+ <bootstrap installbase="loader" nameoncd="ext2.bin" />
<file>ext2.asm</file>
</module>
<module name="fat32" type="bootsector">
- <bootstrap base="loader" nameoncd="fat32.bin" />
+ <bootstrap installbase="loader" nameoncd="fat32.bin" />
<file>fat32.asm</file>
</module>
<module name="fat" type="bootsector">
- <bootstrap base="loader" nameoncd="fat.bin" />
+ <bootstrap installbase="loader" nameoncd="fat.bin" />
<file>fat.asm</file>
</module>
<module name="isoboot" type="bootsector">
- <bootstrap base="loader" nameoncd="isoboot.bin" />
+ <bootstrap installbase="loader" nameoncd="isoboot.bin" />
<file>isoboot.asm</file>
</module>
<module name="isobtrt" type="bootsector">
- <bootstrap base="loader" nameoncd="isobtrt.bin" />
+ <bootstrap installbase="loader" nameoncd="isobtrt.bin" />
<file>isobtrt.asm</file>
</module>
</group>
Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Mon Oct 1 18:19:27 2007
@@ -3,7 +3,7 @@
<group>
<if property="ARCH" value="i386">
<module name="freeldr" type="bootloader">
- <bootstrap base="loader" />
+ <bootstrap installbase="loader" />
<library>freeldr_startup</library>
<library>freeldr_base64k</library>
<library>freeldr_base</library>
Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild (original)
+++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild Mon Oct 1 18:19:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="setupldr" type="bootloader">
- <bootstrap base="loader" />
+ <bootstrap installbase="loader" />
<library>freeldr_startup</library>
<library>freeldr_base64k</library>
<library>freeldr_base</library>
Modified: trunk/reactos/dll/ntdll/ntdll.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/dll/ntdll/ntdll.rbuild (original)
+++ trunk/reactos/dll/ntdll/ntdll.rbuild Mon Oct 1 18:19:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
<module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll">
- <bootstrap base="$(CDOUTPUT)/system32" />
+ <bootstrap installbase="$(CDOUTPUT)/system32" />
<importlibrary definition="def/ntdll.def" />
<include base="ntdll">inc</include>
<include base="ReactOS">include/reactos/subsys</include>
Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootvid.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/base/bootvid/bootvid.rbuild (original)
+++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild Mon Oct 1 18:19:27 2007
@@ -2,7 +2,7 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry at 8" installbase="system32/drivers" installname="bootvid.dll">
<importlibrary definition="bootvid.def"></importlibrary>
- <bootstrap base="$(CDOUTPUT)" nameoncd="bootvid.dll" />
+ <bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" />
<include base="bootvid">.</include>
<define name="__USE_W32API" />
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/base/kdcom/kdcom.rbuild (original)
+++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild Mon Oct 1 18:19:27 2007
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry at 8" installbase="system32/drivers" installname="kdcom.dll">
- <importlibrary definition="kdcom.def"></importlibrary>
- <bootstrap base="$(CDOUTPUT)" nameoncd="kdcom.dll" />
- <include base="kdcom">.</include>
- <define name="__USE_W32API" />
- <library>ntoskrnl</library>
- <library>hal</library>
- <file>kdbg.c</file>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry at 8" installbase="system32/drivers" installname="kdcom.dll">
+ <importlibrary definition="kdcom.def"></importlibrary>
+ <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
+ <include base="kdcom">.</include>
+ <define name="__USE_W32API" />
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <file>kdbg.c</file>
+</module>
Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild (original)
+++ trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild Mon Oct 1 18:19:27 2007
@@ -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 base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<include base="cdfs">.</include>
<define name="__USE_W32API" />
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild (original)
+++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild Mon Oct 1 18:19:27 2007
@@ -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 base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<include base="ntfs">.</include>
<define name="__USE_W32API" />
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild (original)
+++ trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild Mon Oct 1 18:19:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys">
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<include base="vfatfs">.</include>
<define name="__USE_W32API" />
<linkerflag>-lgcc</linkerflag>
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild (original)
+++ trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild Mon Oct 1 18:19:27 2007
@@ -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 base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<include base="i8042prt">.</include>
<define name="__USE_W32API" />
<define name="__REACTOS__" />
Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild (original)
+++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild Mon Oct 1 18:19:27 2007
@@ -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 base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<define name="__USE_W32API" />
<define name="NDEBUG" />
<library>pseh</library>
Modified: trunk/reactos/drivers/setup/blue/blue.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/setup/blue/blue.rbuild (original)
+++ trunk/reactos/drivers/setup/blue/blue.rbuild Mon Oct 1 18:19:27 2007
@@ -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 base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<define name="__USE_W32API" />
<include base="ReactOS">include/reactos/drivers</include>
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild (original)
+++ trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild Mon Oct 1 18:19:27 2007
@@ -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" allowwarnings="true">
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<define name="__USE_W32API" />
<library>ntoskrnl</library>
<library>hal</library>
Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/class2/class2.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/class/class2/class2.rbuild (original)
+++ trunk/reactos/drivers/storage/class/class2/class2.rbuild Mon Oct 1 18:19:27 2007
@@ -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 base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<define name="__USE_W32API" />
<importlibrary definition="class2.def" />
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/class/disk/disk.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk/disk.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/class/disk/disk.rbuild (original)
+++ trunk/reactos/drivers/storage/class/disk/disk.rbuild Mon Oct 1 18:19:27 2007
@@ -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 base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<define name="__USE_W32API" />
<linkerflag>-lgcc</linkerflag>
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/floppy/floppy.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/floppy.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/floppy/floppy.rbuild (original)
+++ trunk/reactos/drivers/storage/floppy/floppy.rbuild Mon Oct 1 18:19:27 2007
@@ -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 base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<define name="__USE_W32API" />
<include base="floppy">.</include>
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild (original)
+++ trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild Mon Oct 1 18:19:27 2007
@@ -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" allowwarnings="true">
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<define name="__USE_W32API" />
<include base="atapi">.</include>
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild (original)
+++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Mon Oct 1 18:19:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys">
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<define name="__USE_W32API" />
<define name="_DEBUG" />
<include base="uniata">.</include>
Modified: trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild (original)
+++ trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild Mon Oct 1 18:19:27 2007
@@ -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">
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<define name="__USE_W32API" />
<include base="buslogic">.</include>
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild (original)
+++ trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild Mon Oct 1 18:19:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys">
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<importlibrary definition="diskdump.def" />
<define name="__USE_W32API" />
<include base="ReactOS">include/reactos/drivers</include>
Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/scsiport.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Mon Oct 1 18:19:27 2007
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys">
- <bootstrap base="$(CDOUTPUT)" />
- <define name="__USE_W32API" />
- <define name="_SCSIPORT_" />
- <importlibrary definition="scsiport.def" />
- <include base="scsiport">.</include>
- <library>ntoskrnl</library>
- <library>hal</library>
- <file>scsiport.c</file>
- <file>scsiport.rc</file>
-</module>
+<?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)" />
+ <define name="__USE_W32API" />
+ <define name="_SCSIPORT_" />
+ <importlibrary definition="scsiport.def" />
+ <include base="scsiport">.</include>
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <file>scsiport.c</file>
+ <file>scsiport.rc</file>
+</module>
Modified: trunk/reactos/hal/halppc/up/halup.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/hal/halppc/up/halup.rbuild (original)
+++ trunk/reactos/hal/halppc/up/halup.rbuild Mon Oct 1 18:19:27 2007
@@ -2,7 +2,7 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="halppc_up" type="kernelmodedll">
<importlibrary definition="../../hal/hal.def" />
- <bootstrap base="reactos" nameoncd="hal.dll" />
+ <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<include base="halppc_generic">../include</include>
<include base="ntoskrnl">include</include>
<define name="_DISABLE_TIDENTS" />
Modified: trunk/reactos/hal/halx86/mp/halmp.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/mp/halmp.rbuild (original)
+++ trunk/reactos/hal/halx86/mp/halmp.rbuild Mon Oct 1 18:19:27 2007
@@ -2,7 +2,7 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="halmp" type="kernelmodedll" entrypoint="0">
<importlibrary definition="../../hal/hal.def" />
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<include base="hal_generic">../include</include>
<include base="ntoskrnl">include</include>
<define name="_DISABLE_TIDENTS" />
Modified: trunk/reactos/hal/halx86/up/halup.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halup.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/up/halup.rbuild (original)
+++ trunk/reactos/hal/halx86/up/halup.rbuild Mon Oct 1 18:19:27 2007
@@ -2,7 +2,7 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="halup" type="kernelmodedll" entrypoint="0">
<importlibrary definition="../../hal/hal.def" />
- <bootstrap base="$(CDOUTPUT)" nameoncd="hal.dll" />
+ <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<include base="hal_generic">../include</include>
<include base="ntoskrnl">include</include>
<define name="_DISABLE_TIDENTS" />
Modified: trunk/reactos/media/drivers/etc/etc.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/etc.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/media/drivers/etc/etc.rbuild (original)
+++ trunk/reactos/media/drivers/etc/etc.rbuild Mon Oct 1 18:19:27 2007
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group>
- <cdfile base="$(CDOUTPUT)">services</cdfile>
- <installfile base="system32/drivers/etc">services</installfile>
+ <cdfile installbase="$(CDOUTPUT)">services</cdfile>
+ <installfile installbase="system32/drivers/etc">services</installfile>
<if property="KDBG" value="1">
- <cdfile base="$(CDOUTPUT)">KDBinit</cdfile>
- <installfile base="system32/drivers/etc">KDBinit</installfile>
+ <cdfile installbase="$(CDOUTPUT)">KDBinit</cdfile>
+ <installfile installbase="system32/drivers/etc">KDBinit</installfile>
</if>
</group>
Modified: trunk/reactos/media/fonts/fonts.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/fonts.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/media/fonts/fonts.rbuild (original)
+++ trunk/reactos/media/fonts/fonts.rbuild Mon Oct 1 18:19:27 2007
@@ -1,55 +1,55 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group>
-<installfile base="media/fonts">DejaVuSans-Bold.ttf </installfile>
-<installfile base="media/fonts">DejaVuSans.ttf</installfile>
-<installfile base="media/fonts">DejaVuSans-BoldOblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansCondensed.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSans-ExtraLight.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansMono.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansMono-Bold.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansMono-Oblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSans-Oblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif-Bold.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif-Italic.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile>
-<installfile base="media/fonts">c0419bt_.ttf</installfile>
-<installfile base="media/fonts">c0582bt_.ttf</installfile>
-<installfile base="media/fonts">c0583bt_.ttf</installfile>
-<installfile base="media/fonts">c0611bt_.ttf</installfile>
-<installfile base="media/fonts">c0632bt_.ttf</installfile>
-<installfile base="media/fonts">c0633bt_.ttf</installfile>
-<installfile base="media/fonts">c0648bt_.ttf</installfile>
-<installfile base="media/fonts">c0649bt_.ttf</installfile>
-<installfile base="media/fonts">cour.ttf</installfile>
-<installfile base="media/fonts">courb.ttf</installfile>
-<installfile base="media/fonts">courbi.ttf</installfile>
-<installfile base="media/fonts">helb____.ttf</installfile>
-<installfile base="media/fonts">Marlett.ttf</installfile>
-<installfile base="media/fonts">timr____.ttf</installfile>
-<installfile base="media/fonts">UTB_____.ttf</installfile>
-<installfile base="media/fonts">UTBI____.ttf</installfile>
-<installfile base="media/fonts">UTI_____.ttf</installfile>
-<installfile base="media/fonts">UTRG____.ttf</installfile>
-<installfile base="media/fonts">Vera.ttf</installfile>
-<installfile base="media/fonts">VeraBd.ttf</installfile>
-<installfile base="media/fonts">VeraBI.ttf</installfile>
-<installfile base="media/fonts">VeraIt.ttf</installfile>
-<installfile base="media/fonts">VeraMoBd.ttf</installfile>
-<installfile base="media/fonts">VeraMoBI.ttf</installfile>
-<installfile base="media/fonts">VeraMoIt.ttf</installfile>
-<installfile base="media/fonts">VeraMono.ttf</installfile>
-<installfile base="media/fonts">VeraSe.ttf</installfile>
-<installfile base="media/fonts">VeraSeBd.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSans-Bold.ttf </installfile>
+ <installfile installbase="media/fonts">DejaVuSans.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSans-BoldOblique.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSansCondensed.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSans-ExtraLight.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSansMono.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSansMono-Bold.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSansMono-Oblique.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSans-Oblique.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerif.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile>
+ <installfile installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile>
+ <installfile installbase="media/fonts">c0419bt_.ttf</installfile>
+ <installfile installbase="media/fonts">c0582bt_.ttf</installfile>
+ <installfile installbase="media/fonts">c0583bt_.ttf</installfile>
+ <installfile installbase="media/fonts">c0611bt_.ttf</installfile>
+ <installfile installbase="media/fonts">c0632bt_.ttf</installfile>
+ <installfile installbase="media/fonts">c0633bt_.ttf</installfile>
+ <installfile installbase="media/fonts">c0648bt_.ttf</installfile>
+ <installfile installbase="media/fonts">c0649bt_.ttf</installfile>
+ <installfile installbase="media/fonts">cour.ttf</installfile>
+ <installfile installbase="media/fonts">courb.ttf</installfile>
+ <installfile installbase="media/fonts">courbi.ttf</installfile>
+ <installfile installbase="media/fonts">helb____.ttf</installfile>
+ <installfile installbase="media/fonts">Marlett.ttf</installfile>
+ <installfile installbase="media/fonts">timr____.ttf</installfile>
+ <installfile installbase="media/fonts">UTB_____.ttf</installfile>
+ <installfile installbase="media/fonts">UTBI____.ttf</installfile>
+ <installfile installbase="media/fonts">UTI_____.ttf</installfile>
+ <installfile installbase="media/fonts">UTRG____.ttf</installfile>
+ <installfile installbase="media/fonts">Vera.ttf</installfile>
+ <installfile installbase="media/fonts">VeraBd.ttf</installfile>
+ <installfile installbase="media/fonts">VeraBI.ttf</installfile>
+ <installfile installbase="media/fonts">VeraIt.ttf</installfile>
+ <installfile installbase="media/fonts">VeraMoBd.ttf</installfile>
+ <installfile installbase="media/fonts">VeraMoBI.ttf</installfile>
+ <installfile installbase="media/fonts">VeraMoIt.ttf</installfile>
+ <installfile installbase="media/fonts">VeraMono.ttf</installfile>
+ <installfile installbase="media/fonts">VeraSe.ttf</installfile>
+ <installfile installbase="media/fonts">VeraSeBd.ttf</installfile>
</group>
Modified: trunk/reactos/media/inf/inf.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/media/inf/inf.rbuild (original)
+++ trunk/reactos/media/inf/inf.rbuild Mon Oct 1 18:19:27 2007
@@ -1,23 +1,23 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group>
- <installfile base="inf">acpi.inf</installfile>
- <installfile base="inf">cdrom.inf</installfile>
- <installfile base="inf">display.inf</installfile>
- <installfile base="inf">hdc.inf</installfile>
- <installfile base="inf">keyboard.inf</installfile>
- <installfile base="inf">layout.inf</installfile>
- <installfile base="inf">machine.inf</installfile>
- <installfile base="inf">msmouse.inf</installfile>
- <installfile base="inf">NET_NIC.inf</installfile>
- <installfile base="inf">netamd.inf</installfile>
- <installfile base="inf">netisa.inf</installfile>
- <installfile base="inf">netrtpnt.inf</installfile>
- <installfile base="inf">nettcpip.inf</installfile>
- <installfile base="inf">ports.inf</installfile>
- <installfile base="inf">scsi.inf</installfile>
- <installfile base="inf" root="output">syssetup.inf</installfile>
- <installfile base="inf">usbport.inf</installfile>
- <installfile base="inf">usbstor.inf</installfile>
- <installfile base="inf">xboxdisp.inf</installfile>
+ <installfile installbase="inf">acpi.inf</installfile>
+ <installfile installbase="inf">cdrom.inf</installfile>
+ <installfile installbase="inf">display.inf</installfile>
+ <installfile installbase="inf">hdc.inf</installfile>
+ <installfile installbase="inf">keyboard.inf</installfile>
+ <installfile installbase="inf">layout.inf</installfile>
+ <installfile installbase="inf">machine.inf</installfile>
+ <installfile installbase="inf">msmouse.inf</installfile>
+ <installfile installbase="inf">NET_NIC.inf</installfile>
+ <installfile installbase="inf">netamd.inf</installfile>
+ <installfile installbase="inf">netisa.inf</installfile>
+ <installfile installbase="inf">netrtpnt.inf</installfile>
+ <installfile installbase="inf">nettcpip.inf</installfile>
+ <installfile installbase="inf">ports.inf</installfile>
+ <installfile installbase="inf">scsi.inf</installfile>
+ <installfile installbase="inf" root="output">syssetup.inf</installfile>
+ <installfile installbase="inf">usbport.inf</installfile>
+ <installfile installbase="inf">usbstor.inf</installfile>
+ <installfile installbase="inf">xboxdisp.inf</installfile>
</group>
Modified: trunk/reactos/media/nls/nls.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/nls.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/media/nls/nls.rbuild (original)
+++ trunk/reactos/media/nls/nls.rbuild Mon Oct 1 18:19:27 2007
@@ -1,62 +1,62 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group>
-<cdfile base="$(CDOUTPUT)">c_437.nls</cdfile>
-<cdfile base="$(CDOUTPUT)">c_1252.nls</cdfile>
-<cdfile base="$(CDOUTPUT)">l_intl.nls</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">c_437.nls</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">c_1252.nls</cdfile>
+ <cdfile installbase="$(CDOUTPUT)">l_intl.nls</cdfile>
-<installfile base="system32">c_037.nls</installfile>
-<installfile base="system32">c_424.nls</installfile>
-<installfile base="system32">c_437.nls</installfile>
-<installfile base="system32">c_500.nls</installfile>
-<installfile base="system32">c_737.nls</installfile>
-<installfile base="system32">c_775.nls</installfile>
-<installfile base="system32">c_850.nls</installfile>
-<installfile base="system32">c_852.nls</installfile>
-<installfile base="system32">c_855.nls</installfile>
-<installfile base="system32">c_856.nls</installfile>
-<installfile base="system32">c_857.nls</installfile>
-<installfile base="system32">c_860.nls</installfile>
-<installfile base="system32">c_861.nls</installfile>
-<installfile base="system32">c_862.nls</installfile>
-<installfile base="system32">c_863.nls</installfile>
-<installfile base="system32">c_864.nls</installfile>
-<installfile base="system32">c_865.nls</installfile>
-<installfile base="system32">c_866.nls</installfile>
-<installfile base="system32">c_869.nls</installfile>
-<installfile base="system32">c_874.nls</installfile>
-<installfile base="system32">c_875.nls</installfile>
-<installfile base="system32">c_878.nls</installfile>
-<installfile base="system32">c_932.nls</installfile>
-<installfile base="system32">c_936.nls</installfile>
-<installfile base="system32">c_949.nls</installfile>
-<installfile base="system32">c_950.nls</installfile>
-<installfile base="system32">c_1006.nls</installfile>
-<installfile base="system32">c_1026.nls</installfile>
-<installfile base="system32">c_1250.nls</installfile>
-<installfile base="system32">c_1251.nls</installfile>
-<installfile base="system32">c_1252.nls</installfile>
-<installfile base="system32">c_1253.nls</installfile>
-<installfile base="system32">c_1254.nls</installfile>
-<installfile base="system32">c_1255.nls</installfile>
-<installfile base="system32">c_1256.nls</installfile>
-<installfile base="system32">c_1257.nls</installfile>
-<installfile base="system32">c_1258.nls</installfile>
-<installfile base="system32">c_10000.nls</installfile>
-<installfile base="system32">c_10006.nls</installfile>
-<installfile base="system32">c_10007.nls</installfile>
-<installfile base="system32">c_10029.nls</installfile>
-<installfile base="system32">c_10079.nls</installfile>
-<installfile base="system32">c_10081.nls</installfile>
-<installfile base="system32">c_20866.nls</installfile>
-<installfile base="system32">c_28591.nls</installfile>
-<installfile base="system32">c_28592.nls</installfile>
-<installfile base="system32">c_28593.nls</installfile>
-<installfile base="system32">c_28594.nls</installfile>
-<installfile base="system32">c_28595.nls</installfile>
-<installfile base="system32">c_28596.nls</installfile>
-<installfile base="system32">c_28597.nls</installfile>
-<installfile base="system32">c_28598.nls</installfile>
-<installfile base="system32">c_28599.nls</installfile>
-<installfile base="system32">l_intl.nls</installfile>
+ <installfile installbase="system32">c_037.nls</installfile>
+ <installfile installbase="system32">c_424.nls</installfile>
+ <installfile installbase="system32">c_437.nls</installfile>
+ <installfile installbase="system32">c_500.nls</installfile>
+ <installfile installbase="system32">c_737.nls</installfile>
+ <installfile installbase="system32">c_775.nls</installfile>
+ <installfile installbase="system32">c_850.nls</installfile>
+ <installfile installbase="system32">c_852.nls</installfile>
+ <installfile installbase="system32">c_855.nls</installfile>
+ <installfile installbase="system32">c_856.nls</installfile>
+ <installfile installbase="system32">c_857.nls</installfile>
+ <installfile installbase="system32">c_860.nls</installfile>
+ <installfile installbase="system32">c_861.nls</installfile>
+ <installfile installbase="system32">c_862.nls</installfile>
+ <installfile installbase="system32">c_863.nls</installfile>
+ <installfile installbase="system32">c_864.nls</installfile>
+ <installfile installbase="system32">c_865.nls</installfile>
+ <installfile installbase="system32">c_866.nls</installfile>
+ <installfile installbase="system32">c_869.nls</installfile>
+ <installfile installbase="system32">c_874.nls</installfile>
+ <installfile installbase="system32">c_875.nls</installfile>
+ <installfile installbase="system32">c_878.nls</installfile>
+ <installfile installbase="system32">c_932.nls</installfile>
+ <installfile installbase="system32">c_936.nls</installfile>
+ <installfile installbase="system32">c_949.nls</installfile>
+ <installfile installbase="system32">c_950.nls</installfile>
+ <installfile installbase="system32">c_1006.nls</installfile>
+ <installfile installbase="system32">c_1026.nls</installfile>
+ <installfile installbase="system32">c_1250.nls</installfile>
+ <installfile installbase="system32">c_1251.nls</installfile>
+ <installfile installbase="system32">c_1252.nls</installfile>
+ <installfile installbase="system32">c_1253.nls</installfile>
+ <installfile installbase="system32">c_1254.nls</installfile>
+ <installfile installbase="system32">c_1255.nls</installfile>
+ <installfile installbase="system32">c_1256.nls</installfile>
+ <installfile installbase="system32">c_1257.nls</installfile>
+ <installfile installbase="system32">c_1258.nls</installfile>
+ <installfile installbase="system32">c_10000.nls</installfile>
+ <installfile installbase="system32">c_10006.nls</installfile>
+ <installfile installbase="system32">c_10007.nls</installfile>
+ <installfile installbase="system32">c_10029.nls</installfile>
+ <installfile installbase="system32">c_10079.nls</installfile>
+ <installfile installbase="system32">c_10081.nls</installfile>
+ <installfile installbase="system32">c_20866.nls</installfile>
+ <installfile installbase="system32">c_28591.nls</installfile>
+ <installfile installbase="system32">c_28592.nls</installfile>
+ <installfile installbase="system32">c_28593.nls</installfile>
+ <installfile installbase="system32">c_28594.nls</installfile>
+ <installfile installbase="system32">c_28595.nls</installfile>
+ <installfile installbase="system32">c_28596.nls</installfile>
+ <installfile installbase="system32">c_28597.nls</installfile>
+ <installfile installbase="system32">c_28598.nls</installfile>
+ <installfile installbase="system32">c_28599.nls</installfile>
+ <installfile installbase="system32">l_intl.nls</installfile>
</group>
Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Oct 1 18:19:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe">
- <bootstrap base="$(CDOUTPUT)" />
+ <bootstrap installbase="$(CDOUTPUT)" />
<importlibrary definition="ntoskrnl.def" />
<define name="_DISABLE_TIDENTS" />
<define name="__NTOSKRNL__" />
Modified: trunk/reactos/tools/rbuild/bootstrap.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/bootstrap.cpp (original)
+++ trunk/reactos/tools/rbuild/bootstrap.cpp Mon Oct 1 18:19:27 2007
@@ -97,7 +97,7 @@
"<bootstrap> is not applicable for this module type." );
}
- const XMLAttribute* att = node.GetAttribute ( "base", false );
+ const XMLAttribute* att = node.GetAttribute ( "installbase", false );
if ( att != NULL )
base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value );
else
Modified: trunk/reactos/tools/rbuild/cdfile.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/cdfile.cpp (original)
+++ trunk/reactos/tools/rbuild/cdfile.cpp Mon Oct 1 18:19:27 2007
@@ -39,7 +39,7 @@
const string& path )
: XmlNode ( project, cdfileNode )
{
- const XMLAttribute* att = cdfileNode.GetAttribute ( "base", false );
+ const XMLAttribute* att = cdfileNode.GetAttribute ( "installbase", false );
string target_relative_directory;
if ( att != NULL )
target_relative_directory = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value );
Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/doc/rbuild.txt?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/doc/rbuild.txt (original)
+++ trunk/reactos/tools/rbuild/doc/rbuild.txt Mon Oct 1 18:19:27 2007
@@ -177,10 +177,10 @@
A bootstrap element specifies that the generated file should be put on the bootable CD as a bootstrap file.
Syntax:
- <bootstrap base="reactos" nameoncd="halmp.dll" />
-
-Attributes:
- base - Put file in this directory on the bootable CD. This attribute is optional.
+ <bootstrap installbase="reactos" nameoncd="halmp.dll" />
+
+Attributes:
+ installbase - Put file in this directory on the bootable CD. This attribute is optional.
nameoncd - Name of file on the bootable CD. This attribute is optional.
Value:
@@ -195,10 +195,10 @@
A cdfile element specifies the name of a file that is to be put on the bootable CD.
Syntax:
- <cdfile base="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile>
-
-Attributes:
- base - Put file in this directory on the bootable CD. This attribute is optional.
+ <cdfile installbase="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile>
+
+Attributes:
+ installbase - Put file in this directory on the bootable CD. This attribute is optional.
nameoncd - Name of file on the bootable CD. This attribute is optional.
Value:
@@ -392,10 +392,10 @@
An installfile element specifies the name of a file that is to be installed when using 'make install'.
Syntax:
- <installfile base="reactos" newname="ReadMe.txt">ReadMe.txt</installfile>
-
-Attributes:
- base - Put file in this directory within the install directory. This attribute is optional.
+ <installfile installbase="reactos" newname="ReadMe.txt">ReadMe.txt</installfile>
+
+Attributes:
+ installbase - Put file in this directory within the install directory. This attribute is optional.
newname - Name of file within the install directory. This attribute is optional.
Value:
Modified: trunk/reactos/tools/rbuild/installfile.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.cpp?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/installfile.cpp (original)
+++ trunk/reactos/tools/rbuild/installfile.cpp Mon Oct 1 18:19:27 2007
@@ -27,7 +27,7 @@
const string& path )
: XmlNode(project, installfileNode )
{
- const XMLAttribute* base = node.GetAttribute ( "base", false );
+ const XMLAttribute* base = node.GetAttribute ( "installbase", false );
const XMLAttribute* newname = node.GetAttribute ( "newname", false );
DirectoryLocation source_directory = SourceDirectory;
Modified: trunk/reactos/tools/rbuild/project.dtd
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?rev=29330&r1=29329&r2=29330&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/project.dtd (original)
+++ trunk/reactos/tools/rbuild/project.dtd Mon Oct 1 18:19:27 2007
@@ -22,14 +22,14 @@
<!ELEMENT bootstrap EMPTY>
<!ATTLIST bootstrap
- base %Text; #IMPLIED
- nameoncd %Text; #IMPLIED
+ installbase %Text; #IMPLIED
+ nameoncd %Text; #IMPLIED
>
<!ELEMENT cdfile (#PCDATA)>
<!ATTLIST cdfile
- base %Text; #IMPLIED
- nameoncd %Text; #IMPLIED
+ installbase %Text; #IMPLIED
+ nameoncd %Text; #IMPLIED
>
<!ELEMENT compilerflag (#PCDATA)>
@@ -55,8 +55,8 @@
<!ELEMENT installfile (#PCDATA)>
<!ATTLIST installfile
- base %Text; #IMPLIED
- root (intermediate|output) #IMPLIED
+ installbase %Text; #IMPLIED
+ root (intermediate|output) #IMPLIED
>
<!ELEMENT group (cdfile*|define*|directory*|file*|if*|ifnot*|include*|installfile*|property*|module*|group*|xi:include*)+>
More information about the Ros-diffs
mailing list