XML Compliance Patch for the RBUILD Files. By Samuel Serapion

svn path=/trunk/; revision=45631

diff --git a/reactos/base/applications/cmdutils/hostname/hostname.rbuild b/reactos/base/applications/cmdutils/hostname/hostname.rbuild
index ed747aa..76a3f40 100644 (file)
--- a/reactos/base/applications/cmdutils/hostname/hostname.rbuild
+++ b/reactos/base/applications/cmdutils/hostname/hostname.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe">
        <file>hostname.c</file>
        <file>hostname.rc</file>

diff --git a/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild b/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
index 2e3e1a9..437fa46 100644 (file)
--- a/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
+++ b/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="xcopy" type="win32cui" installbase="system32" installname="xcopy.exe" unicode="true">
        <include base="xcopy">.</include>
        <library>wine</library>

diff --git a/reactos/base/applications/magnify/magnify.rbuild b/reactos/base/applications/magnify/magnify.rbuild
index c891a1e..995437d 100644 (file)
--- a/reactos/base/applications/magnify/magnify.rbuild
+++ b/reactos/base/applications/magnify/magnify.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<!DOCTYPE project SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe">
        <include base="magnify">.</include>
        <library>user32</library>

diff --git a/reactos/base/applications/mstsc/mstsc.rbuild b/reactos/base/applications/mstsc/mstsc.rbuild
index e2000ef..c8ed8e3 100644 (file)
--- a/reactos/base/applications/mstsc/mstsc.rbuild
+++ b/reactos/base/applications/mstsc/mstsc.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="yes">
        <include base="mstsc">.</include>
        <library>user32</library>

diff --git a/reactos/base/services/rpcss/rpcss.rbuild b/reactos/base/services/rpcss/rpcss.rbuild
index 5d89e48..04e42f8 100644 (file)
--- a/reactos/base/services/rpcss/rpcss.rbuild
+++ b/reactos/base/services/rpcss/rpcss.rbuild
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe" unicode="yes">
        <include base="rpcss">.</include>
        <include base="rpcss" root="intermediate">.</include>
@@ -23,3 +24,4 @@
 <module name="rpcss_irot_server" type="rpcserver">
        <file>irot.idl</file>
 </module>
+</group>

diff --git a/reactos/boot/armllb/armllb.rbuild b/reactos/boot/armllb/armllb.rbuild
index 5e254c4..2566c78 100644 (file)
--- a/reactos/boot/armllb/armllb.rbuild
+++ b/reactos/boot/armllb/armllb.rbuild
@@ -1,65 +1,66 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-               <module name="armllb" type="bootloader" installbase=".." installname="armllb.bin">
-                       <bootstrap installbase="loader" />
-                       <library>libcntpr</library>
-                       <library>rtl</library>
-                       <include base="armllb">./inc</include>
-                       <if property="SARCH" value="omap3">
-                <define name="_OMAP3_" />
-                <group linkerset="ld">
-                    <linkerflag>-Wl,--image-base=0x401FEFF8</linkerflag>
-                       </group>
-            </if>
-            <if property="SARCH" value="versatile">
-                <define name="_VERSATILE_" />
-                <group linkerset="ld">
-                    <linkerflag>-Wl,--image-base=0xF000</linkerflag>
-                       </group>
-            </if>
-            <file first="true">boot.s</file>
-            <file>main.c</file>
-            <file>crtsupp.c</file>
-           <file>envir.c</file>
-           <file>fw.c</file>
-            <directory name="hw">
-                <file>keyboard.c</file>
-                <file>serial.c</file>
-                <file>time.c</file>
-                <file>video.c</file>
-                <if property="SARCH" value="omap3">
-                    <directory name="omap3">
-                        <file>hwdata.c</file>
-                        <file>hwdss.c</file>
-                        <file>hwuart.c</file>
-                        <file>hwinfo.c</file>
-                        <file<hwinit.c</file>
-                    </directory>
-                </if>
-                <if property="SARCH" value="versatile">
-                    <directory name="versatile">
-                        <file>hwclcd.c</file>
-                        <file>hwkmi.c</file>
-                        <file>hwuart.c</file>
-                        <file>hwinfo.c</file>
-                        <file>hwinit.c</file>
-                    </directory>
-                </if>
-            </directory>
-            <directory name="os">
-                <file>loader.c</file>
-            </directory>
-            <group compilerset="gcc">
-                <compilerflag>-fms-extensions</compilerflag>
-                <compilerflag>-ffreestanding</compilerflag>
-                       <compilerflag>-fno-builtin</compilerflag>
-                       <compilerflag>-fno-inline</compilerflag>
-                       <compilerflag>-fno-zero-initialized-in-bss</compilerflag>
-                <compilerflag>-Os</compilerflag>
-            </group>
-            <group linkerset="ld">
-                <linkerflag>-lgcc</linkerflag>
-            </group>
-               </module>
+<module name="armllb" type="bootloader" installbase=".." installname="armllb.bin">
+       <bootstrap installbase="loader" />
+       <library>libcntpr</library>
+       <library>rtl</library>
+       <include base="armllb">./inc</include>
+       <if property="SARCH" value="omap3">
+               <define name="_OMAP3_" />
+               <group linkerset="ld">
+                       <linkerflag>-Wl,--image-base=0x401FEFF8</linkerflag>
+               </group>
+       </if>
+       <if property="SARCH" value="versatile">
+               <define name="_VERSATILE_" />
+               <group linkerset="ld">
+                       <linkerflag>-Wl,--image-base=0xF000</linkerflag>
+               </group>
+       </if>
+       <file first="true">boot.s</file>
+       <file>main.c</file>
+       <file>crtsupp.c</file>
+       <file>envir.c</file>
+       <file>fw.c</file>
+       <directory name="hw">
+               <file>keyboard.c</file>
+               <file>serial.c</file>
+               <file>time.c</file>
+               <file>video.c</file>
+               <if property="SARCH" value="omap3">
+                       <directory name="omap3">
+                               <file>hwdata.c</file>
+                               <file>hwdss.c</file>
+                               <file>hwuart.c</file>
+                               <file>hwinfo.c</file>
+                               <file>hwinit.c</file>
+                               </directory>
+               </if>
+               <if property="SARCH" value="versatile">
+                       <directory name="versatile">
+                               <file>hwclcd.c</file>
+                               <file>hwkmi.c</file>
+                               <file>hwuart.c</file>
+                               <file>hwinfo.c</file>
+                               <file>hwinit.c</file>
+                       </directory>
+               </if>
+       </directory>
+       <directory name="os">
+               <file>loader.c</file>
+       </directory>
+       <group compilerset="gcc">
+               <compilerflag>-fms-extensions</compilerflag>
+               <compilerflag>-ffreestanding</compilerflag>
+               <compilerflag>-fno-builtin</compilerflag>
+               <compilerflag>-fno-inline</compilerflag>
+               <compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+               <compilerflag>-Os</compilerflag>
+               
+       </group>
+       <group linkerset="ld">
+               <linkerflag>-lgcc</linkerflag>
+       </group>
+</module>
 </group>

diff --git a/reactos/dll/directx/quartz/quartz.rbuild b/reactos/dll/directx/quartz/quartz.rbuild
index 982a73d..b7097f6 100644 (file)
--- a/reactos/dll/directx/quartz/quartz.rbuild
+++ b/reactos/dll/directx/quartz/quartz.rbuild
@@ -60,4 +60,5 @@
        <define name="REGISTER_PROXY_DLL"/>
        <define name="PROXY_DELEGATION"/>
        <file>quartz_strmif.idl</file>
-</module>
\ No newline at end of file
+</module>
+</group>
\ No newline at end of file

diff --git a/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild b/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
index 988e654..47d3958 100644 (file)
--- a/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
+++ b/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="normaliz_redist_data" type="staticlibrary">
        <include base="icu4ros">icu/source/common</include>
        <directory name="data"><file>icudt38.c</file></directory>
@@ -16,3 +17,4 @@
        <importlibrary definition="normaliz.def" />
        <file>normaliz.cpp</file>
 </module>
+</group>

diff --git a/reactos/dll/shellext/shellext.rbuild b/reactos/dll/shellext/shellext.rbuild
index fc06870..95598f5 100644 (file)
--- a/reactos/dll/shellext/shellext.rbuild
+++ b/reactos/dll/shellext/shellext.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <directory name="deskadp">
                <xi:include href="deskadp/deskadp.rbuild" />

diff --git a/reactos/dll/win32/iccvid/iccvid.rbuild b/reactos/dll/win32/iccvid/iccvid.rbuild
index f780f88..f27d0b0 100644 (file)
--- a/reactos/dll/win32/iccvid/iccvid.rbuild
+++ b/reactos/dll/win32/iccvid/iccvid.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="iccvid" type="win32dll" baseaddress="${BASEADDRESS_ICCVID}" installbase="system32" installname="iccvid.dll" allowwarnings="true">
        <importlibrary definition="iccvid.spec" />
        <include base="iccvid">.</include>
@@ -8,3 +10,4 @@
        <library>wine</library>
        <library>user32</library>
        <library>ntdll</library>
+</module>

diff --git a/reactos/dll/win32/jscript/jscript.rbuild b/reactos/dll/win32/jscript/jscript.rbuild
index 13c5754..f61a869 100644 (file)
--- a/reactos/dll/win32/jscript/jscript.rbuild
+++ b/reactos/dll/win32/jscript/jscript.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="jscript" type="win32dll" baseaddress="${BASEADDRESS_JSCRIPT}" installbase="system32" installname="jscript.dll" allowwarnings="true" crt="msvcrt">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
@@ -38,3 +40,4 @@
        <dependency>stdole2</dependency>
        <file>jsglobal.idl</file>
 </module>
+</group>

diff --git a/reactos/dll/win32/msacm32/msacm32.rbuild b/reactos/dll/win32/msacm32/msacm32.rbuild
index 656fc34..df9cb03 100644 (file)
--- a/reactos/dll/win32/msacm32/msacm32.rbuild
+++ b/reactos/dll/win32/msacm32/msacm32.rbuild
@@ -1,3 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes">
        <importlibrary definition="msacm32.spec" />
        <include base="msacm32">.</include>
@@ -18,3 +21,4 @@
 <directory name="msacm32.drv">
        <xi:include href="msacm32.drv/msacm32.drv.rbuild" />
 </directory>
+</group>

diff --git a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
index baa0154..f456723 100644 (file)
--- a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
+++ b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mshtml_tlb" type="embeddedtypelib">
        <dependency>stdole2</dependency>
@@ -10,3 +12,4 @@
        <define name="__WINESRC__" />
        <file>rsrc.rc</file>
 </module>
+</group>

diff --git a/reactos/dll/win32/msxml3/msxml3.rbuild b/reactos/dll/win32/msxml3/msxml3.rbuild
index a62b849..165815e 100644 (file)
--- a/reactos/dll/win32/msxml3/msxml3.rbuild
+++ b/reactos/dll/win32/msxml3/msxml3.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msxml3" type="win32dll" baseaddress="${BASEADDRESS_MSXML3}" installbase="system32" installname="msxml3.dll" allowwarnings="true" crt="msvcrt">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
@@ -62,3 +64,4 @@
        <dependency>stdole2</dependency>
        <file>msxml3_v1.idl</file>
 </module>
+</group>

diff --git a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
index ad1008b..10d83df 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
+++ b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
@@ -1,3 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" allowwarnings="true" crt="msvcrt">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
        <importlibrary definition="rpcrt4.spec" />
@@ -43,3 +46,4 @@
 <module name="rpcrt4_epm_client" type="rpcclient">
        <file>epm.idl</file>
 </module>
+</group>

diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild
index 1649a5d..47c57a9 100644 (file)
--- a/reactos/dll/win32/shdocvw/shdocvw.rbuild
+++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild
@@ -45,3 +45,4 @@
        <dependency>stdole2</dependency>
        <file>shdocvw_v1.idl</file>
 </module>
+</group>

diff --git a/reactos/dll/win32/sndblst/sndblst.rbuild b/reactos/dll/win32/sndblst/sndblst.rbuild
index 877b956..b613c17 100644 (file)
--- a/reactos/dll/win32/sndblst/sndblst.rbuild
+++ b/reactos/dll/win32/sndblst/sndblst.rbuild
@@ -1,5 +1,7 @@
-<!-- Temporarily compiling as a CUI app for testing purposes */
-<!--module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"-->
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!-- Temporarily compiling as a CUI app for testing purposes */ -->
+<!-- module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"-->
 <module name="sndblst" type="win32dll" installbase="system32" installname="sndblst.dll" unicode="yes">
        <importlibrary definition="sndblst.spec" />
     <include base="ReactOS">include/reactos/libs/sound</include>

diff --git a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
index 8dab92c..5d4c001 100644 (file)
--- a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
+++ b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="std_ole_v1" type="embeddedtypelib">
        <include base="std_ole_v1">.</include>
@@ -14,3 +16,4 @@
        <define name="__WINESRC__" />
        <file>rsrc.rc</file>
 </module>
+</group>

diff --git a/reactos/dll/win32/sti/sti.rbuild b/reactos/dll/win32/sti/sti.rbuild
index d38e7b2..592c5f1 100644 (file)
--- a/reactos/dll/win32/sti/sti.rbuild
+++ b/reactos/dll/win32/sti/sti.rbuild
@@ -15,3 +15,4 @@
        <library>ole32</library>
        <library>ntdll</library>
 </module>
+</group>

diff --git a/reactos/dll/win32/t2embed/t2embed.rbuild b/reactos/dll/win32/t2embed/t2embed.rbuild
index 76d9480..86709f6 100644 (file)
--- a/reactos/dll/win32/t2embed/t2embed.rbuild
+++ b/reactos/dll/win32/t2embed/t2embed.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="t2embed" type="win32dll" baseaddress="${BASEADDRESS_T2EMBED}" installbase="system32" installname="t2embed.dll" unicode="yes">
        <importlibrary definition="t2embed.spec" />
        <include base="t2embed">.</include>
@@ -9,3 +11,4 @@
        <library>wine</library>
        <file>t2embed.c</file>
        <file>t2embed.rc</file>
+</module>

diff --git a/reactos/drivers/base/kddll/kddll.rbuild b/reactos/drivers/base/kddll/kddll.rbuild
index 3fca485..6e01f2f 100644 (file)
--- a/reactos/drivers/base/kddll/kddll.rbuild
+++ b/reactos/drivers/base/kddll/kddll.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-
+<group>
 <module name="kdlib" type="staticlibrary">
        <include base="kdlib">.</include>
        <library>ntoskrnl</library>
@@ -22,3 +22,4 @@
        <library>kdserial</library>
        <file>kdcom.c</file>
 </module>
+</group>

diff --git a/reactos/drivers/directx/directory.rbuild b/reactos/drivers/directx/directory.rbuild
index 850deb3..04d6ae9 100644 (file)
--- a/reactos/drivers/directx/directory.rbuild
+++ b/reactos/drivers/directx/directory.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <directory name="dxapi">
        <xi:include href="dxapi/dxapi.rbuild" />

diff --git a/reactos/drivers/directx/dxapi/dxapi.rbuild b/reactos/drivers/directx/dxapi/dxapi.rbuild
index b7bd1d0..010702c 100644 (file)
--- a/reactos/drivers/directx/dxapi/dxapi.rbuild
+++ b/reactos/drivers/directx/dxapi/dxapi.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxapi" type="kernelmodedriver"
 installbase="system32/drivers" installname="dxapi.sys">
        <importlibrary definition="dxapi.spec" />

diff --git a/reactos/drivers/directx/dxg/dxg.rbuild b/reactos/drivers/directx/dxg/dxg.rbuild
index 9f0cd81..3303dc5 100644 (file)
--- a/reactos/drivers/directx/dxg/dxg.rbuild
+++ b/reactos/drivers/directx/dxg/dxg.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxg" type="kernelmodedriver" installbase="system32/drivers" installname="dxg.sys">
        <importlibrary definition="dxg.spec" />
        <include base="dxg">.</include>

diff --git a/reactos/drivers/directx/dxgthk/dxgthk.rbuild b/reactos/drivers/directx/dxgthk/dxgthk.rbuild
index 4bf33cb..924c3c9 100644 (file)
--- a/reactos/drivers/directx/dxgthk/dxgthk.rbuild
+++ b/reactos/drivers/directx/dxgthk/dxgthk.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxgthk" type="kernelmodedriver"
 installbase="system32/drivers" installname="dxgthk.sys">
        <importlibrary definition="dxgthk.spec" />

diff --git a/reactos/drivers/video/font/bmfd/bmfd.rbuild b/reactos/drivers/video/font/bmfd/bmfd.rbuild
index 964548b..2f424df 100644 (file)
--- a/reactos/drivers/video/font/bmfd/bmfd.rbuild
+++ b/reactos/drivers/video/font/bmfd/bmfd.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="bmfd" type="kernelmodedriver" entrypoint="BmfdEnableDriver@12" installbase="system32" installname="bmfd.dll" crt="static">
        <library>win32k</library>
        <library>libcntpr</library>

diff --git a/reactos/drivers/video/font/directory.rbuild b/reactos/drivers/video/font/directory.rbuild
index f7e7f3c..2ed97e3 100644 (file)
--- a/reactos/drivers/video/font/directory.rbuild
+++ b/reactos/drivers/video/font/directory.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <directory name="bmfd">
                <xi:include href="bmfd/bmfd.rbuild" />

diff --git a/reactos/drivers/video/font/ftfd/ftfd.rbuild b/reactos/drivers/video/font/ftfd/ftfd.rbuild
index 869964c..34d822a 100644 (file)
--- a/reactos/drivers/video/font/ftfd/ftfd.rbuild
+++ b/reactos/drivers/video/font/ftfd/ftfd.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="ftfd" type="kernelmodedll" entrypoint="FtfdEnableDriver@12" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="ftfd.dll" crt="libcntpr">
        <importlibrary definition="freetype.def" />
        <include base="freetype">include</include>

diff --git a/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild b/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild
index 635ff00..299df5e 100644 (file)
--- a/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild
+++ b/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd">
 <module name="splitter" type="kernelmodedriver" installbase="system32/drivers" installname="splitter.sys">
        <library>ntoskrnl</library>
        <library>ks</library>

diff --git a/reactos/hal/halarm/directory.rbuild b/reactos/hal/halarm/directory.rbuild
index 72cfe7e..62b91a3 100644 (file)
--- a/reactos/hal/halarm/directory.rbuild
+++ b/reactos/hal/halarm/directory.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 
        <xi:include href="hal_generic.rbuild" />

diff --git a/reactos/hal/halarm/hal_generic.rbuild b/reactos/hal/halarm/hal_generic.rbuild
index b46c036..b861907 100644 (file)
--- a/reactos/hal/halarm/hal_generic.rbuild
+++ b/reactos/hal/halarm/hal_generic.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
        <module name="hal_generic" type="objectlibrary">
                <include>include</include>

diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
index e10afdc..81a989f 100644 (file)
--- a/reactos/hal/halx86/directory.rbuild
+++ b/reactos/hal/halx86/directory.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 
        <xi:include href="hal_generic.rbuild" />

diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
index a8c64ac..484f1ea 100644 (file)
--- a/reactos/hal/halx86/hal_generic.rbuild
+++ b/reactos/hal/halx86/hal_generic.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
        <module name="hal_generic" type="objectlibrary">
                <include>include</include>

diff --git a/reactos/hal/halx86/hal_generic_mp.rbuild b/reactos/hal/halx86/hal_generic_mp.rbuild
index 7867574..63c3912 100644 (file)
--- a/reactos/hal/halx86/hal_generic_mp.rbuild
+++ b/reactos/hal/halx86/hal_generic_mp.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
        <module name="hal_generic_mp" type="objectlibrary">
                <include>include</include>

diff --git a/reactos/hal/halx86/hal_generic_up.rbuild b/reactos/hal/halx86/hal_generic_up.rbuild
index eb48c9e..b2f605a 100644 (file)
--- a/reactos/hal/halx86/hal_generic_up.rbuild
+++ b/reactos/hal/halx86/hal_generic_up.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
        <module name="hal_generic_up" type="objectlibrary">
                <include>include</include>

diff --git a/reactos/include/psdk/psdk.rbuild b/reactos/include/psdk/psdk.rbuild
index 3be7924..5f83162 100644 (file)
--- a/reactos/include/psdk/psdk.rbuild
+++ b/reactos/include/psdk/psdk.rbuild
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<group>
 <module name="psdk" type="idlheader">
        <file>activaut.idl</file>
        <file>activdbg.idl</file>
@@ -66,4 +67,5 @@
 </module>
 <module name="stdole2" type="embeddedtypelib">
        <file>stdole2.idl</file>
-</module>
\ No newline at end of file
+</module>
+</group>
\ No newline at end of file

diff --git a/reactos/include/reactos/mc/mc.rbuild b/reactos/include/reactos/mc/mc.rbuild
index 406e9e6..eb06ec4 100644 (file)
--- a/reactos/include/reactos/mc/mc.rbuild
+++ b/reactos/include/reactos/mc/mc.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
        <module name="ntstatus" type="messageheader">
                <file>ntstatus.mc</file>

diff --git a/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild b/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild
index 93e7cd8..4a2cc23 100644 (file)
--- a/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild
+++ b/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="icu4ros" type="staticlibrary">
        <define name="U_STATIC_IMPLEMENTATION" />
        <define name="U_HAVE_INTTYPES_H" />

diff --git a/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild b/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
index 1e71ddc..ce52f58 100644 (file)
--- a/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
+++ b/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="libsamplerate" type="staticlibrary" allowwarnings="true">
        <define name="HAVE_LRINT" />
        <define name="HAVE_LRINTF" />

diff --git a/reactos/lib/atl/atl.rbuild b/reactos/lib/atl/atl.rbuild
index 33eb6a5..7193d4c 100644 (file)
--- a/reactos/lib/atl/atl.rbuild
+++ b/reactos/lib/atl/atl.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="atlnew" type="staticlibrary">
        <include base="atlnew">.</include>
        <define name="UNICODE" />

diff --git a/reactos/lib/dnslib/dnslib.rbuild b/reactos/lib/dnslib/dnslib.rbuild
index 7780623..6186055 100644 (file)
--- a/reactos/lib/dnslib/dnslib.rbuild
+++ b/reactos/lib/dnslib/dnslib.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="dnslib" type="staticlibrary" unicode="yes">
        <include base="dnslib">inc</include>
        <file>addr.c</file>

diff --git a/reactos/lib/sdk/crt/crt.rbuild b/reactos/lib/sdk/crt/crt.rbuild
index 73a88a0..7a6026c 100644 (file)
--- a/reactos/lib/sdk/crt/crt.rbuild
+++ b/reactos/lib/sdk/crt/crt.rbuild
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="chkstk" type="staticlibrary">
        <directory name="except">
                <if property="ARCH" value="i386">
@@ -490,3 +491,4 @@
                <file>undname.c</file>
        </directory>
 </module>
+</group>

diff --git a/reactos/lib/tdilib/tdilib.rbuild b/reactos/lib/tdilib/tdilib.rbuild
index 6c8cc60..ec06f02 100644 (file)
--- a/reactos/lib/tdilib/tdilib.rbuild
+++ b/reactos/lib/tdilib/tdilib.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="tdilib" type="staticlibrary">
        <include base="iphlpapi">.</include>
        <include base="tdilib">.</include>

diff --git a/reactos/media/vgafonts/vgafonts.rbuild b/reactos/media/vgafonts/vgafonts.rbuild
index 983ea86..cae138a 100644 (file)
--- a/reactos/media/vgafonts/vgafonts.rbuild
+++ b/reactos/media/vgafonts/vgafonts.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="vgafonts" type="cabinet">
        <bootstrap installbase="$(CDOUTPUT)" />
        <file>437-8x8.bin</file>

diff --git a/reactos/tools/geninc/geninc.rbuild b/reactos/tools/geninc/geninc.rbuild
index f152a7b..9d2be75 100644 (file)
--- a/reactos/tools/geninc/geninc.rbuild
+++ b/reactos/tools/geninc/geninc.rbuild
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<group>
 <module name="geninc" type="buildtool">
        <file>geninc.c</file>
 </module>
 <module name="geninc_data" type="bootloader" installname="geninc_data.bin">
        <file>data.c</file>
 </module>
+</group>