Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-03 19:24:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

More XML compliance fixes for the .rbuild files by Marc Piulachs (marc DOT piulachs AT codexchange DOT net)

Browse source 
The added '<include base="ntoskrnl" root="intermediate">include</include>' line in "ntoskrnl.rbuild" was left out, as this include path is already added through the "ntoskrnl.h" precompiled header. (thanks to Hervé for figuring this out)
I applied patches 1904 and 1905 of the Bugzilla bug entry.

See issue #2649 for more details.

svn path=/trunk/; revision=29056
This commit is contained in:
Colin Finck 2007-09-15 14:37:02 +00:00
parent c287f519bf
commit 9960c6fc98
19 changed files with 656 additions and 634 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/ReactOS-generic.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd">
<group> <group xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="baseaddress.rbuild" /> <xi:include href="baseaddress.rbuild" />
<define name="_REACTOS_" /> <define name="_REACTOS_" />

2
reactos/base/applications/regedit/regedit.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group> <group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="regedit" type="win32gui" installname="regedit.exe"> <module name="regedit" type="win32gui" installname="regedit.exe">
<include base="regedit">.</include> <include base="regedit">.</include>
<define name="__USE_W32API" /> <define name="__USE_W32API" />

3
reactos/base/applications/screensavers/logon/logon.rbuild
View file

@ -10,9 +10,6 @@
<library>kernel32</library> <library>kernel32</library>
<library>user32</library> <library>user32</library>
<library>gdi32</library> <library>gdi32</library>
<library>opengl32</library>
<library>glu32</library>
<library>winmm</library>
<metadata description = "Default ReactOS Logo screensaver" /> <metadata description = "Default ReactOS Logo screensaver" />

2
reactos/base/shell/explorer/explorer.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group> <group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" stdlib="host" usewrc="false"> <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" stdlib="host" usewrc="false">
<linkerflag>-fexceptions</linkerflag> <linkerflag>-fexceptions</linkerflag>
<include base="explorer">.</include> <include base="explorer">.</include>

9
reactos/dll/directx/wine/d3d8/d3d8.rbuild
View file

@ -16,10 +16,10 @@
<library>uuid</library> <library>uuid</library>
<library>wine</library> <library>wine</library>
<library>user32 </library> <library>user32</library>
<library>opengl32 </library> <library>opengl32</library>
<library>gdi32 </library> <library>gdi32</library>
<library>advapi32 </library> <library>advapi32</library>
<library>kernel32</library> <library>kernel32</library>
<library>wined3d</library> <library>wined3d</library>
@ -42,5 +42,4 @@
<file>volumetexture.c</file> <file>volumetexture.c</file>
<file>version.rc</file> <file>version.rc</file>
<file>d3d8.spec</file> <file>d3d8.spec</file>
</module> </module>

2
reactos/dll/directx/wine/wined3d/wined3d.rbuild
View file

@ -16,7 +16,7 @@
<library>user32</library> <library>user32</library>
<library>opengl32</library> <library>opengl32</library>
<library>gdi32</library> <library>gdi32</library>
<library>advapi32 </library> <library>advapi32</library>
<library>kernel32</library> <library>kernel32</library>
<library>uuid</library> <library>uuid</library>
<library>msvcrt</library> <library>msvcrt</library>

2
reactos/lib/sdk/sdk.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group> <group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="crt"> <directory name="crt">
<xi:include href="crt/crt.rbuild" /> <xi:include href="crt/crt.rbuild" />
</directory> </directory>

10
reactos/subsystems/win32/csrss/csrss.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group> <group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="csrss" type="nativecui" installbase="system32" installname="csrss.exe"> <module name="csrss" type="nativecui" installbase="system32" installname="csrss.exe">
<include base="csrss">.</include> <include base="csrss">.</include>
<include base="csrss">include</include> <include base="csrss">include</include>
<include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/subsys</include>
@ -24,8 +24,8 @@
<file>print.c</file> <file>print.c</file>
<file>video.c</file> <file>video.c</file>
<file>csrss.rc</file> <file>csrss.rc</file>
</module> </module>
<directory name="win32csr"> <directory name="win32csr">
<xi:include href="win32csr/win32csr.rbuild" /> <xi:include href="win32csr/win32csr.rbuild" />
</directory> </directory>
</group> </group>

27
rosapps/cmdutils/cmdutils.rbuild
View file

@ -1,20 +1,21 @@
<group> <?xml version="1.0"?>
<directory name="comp"> <group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="comp">
<xi:include href="comp/comp.rbuild" /> <xi:include href="comp/comp.rbuild" />
</directory> </directory>
<directory name="mode"> <directory name="mode">
<xi:include href="mode/mode.rbuild" /> <xi:include href="mode/mode.rbuild" />
</directory> </directory>
<directory name="sort"> <directory name="sort">
<xi:include href="sort/sort.rbuild" /> <xi:include href="sort/sort.rbuild" />
</directory> </directory>
<directory name="tee"> <directory name="tee">
<xi:include href="tee/tee.rbuild" /> <xi:include href="tee/tee.rbuild" />
</directory> </directory>
<directory name="touch"> <directory name="touch">
<xi:include href="touch/touch.rbuild" /> <xi:include href="touch/touch.rbuild" />
</directory> </directory>
<directory name="y"> <directory name="y">
<xi:include href="y/y.rbuild" /> <xi:include href="y/y.rbuild" />
</directory> </directory>
</group> </group>

15
rosapps/demos/directory.rbuild
View file

@ -1,11 +1,14 @@
<directory name="maze"> <?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="maze">
<xi:include href="maze/maze.rbuild" /> <xi:include href="maze/maze.rbuild" />
</directory> </directory>
<directory name="mazescr"> <directory name="mazescr">
<xi:include href="mazescr/mazescr.rbuild" /> <xi:include href="mazescr/mazescr.rbuild" />
</directory> </directory>
<directory name="ddraw"> <directory name="ddraw">
<xi:include href="ddraw/ddraw.rbuild" /> <xi:include href="ddraw/ddraw.rbuild" />
</directory> </directory>
</group>

24
rosapps/devutils/directory.rbuild
View file

@ -1,21 +1,23 @@
<directory name="gdb2"> <?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="gdb2">
<xi:include href="gdb2/gdb2.rbuild" /> <xi:include href="gdb2/gdb2.rbuild" />
</directory> </directory>
<directory name="gdihv"> <directory name="gdihv">
<xi:include href="gdihv/gdihv.rbuild" /> <xi:include href="gdihv/gdihv.rbuild" />
</directory> </directory>
<directory name="genguid"> <directory name="genguid">
<xi:include href="genguid/genguid.rbuild" /> <xi:include href="genguid/genguid.rbuild" />
</directory> </directory>
<directory name="roswebparser"> <directory name="roswebparser">
<xi:include href="roswebparser/roswebparser.rbuild" /> <xi:include href="roswebparser/roswebparser.rbuild" />
</directory> </directory>
<directory name="zoomin"> <directory name="zoomin">
<xi:include href="zoomin/zoomin.rbuild" /> <xi:include href="zoomin/zoomin.rbuild" />
</directory> </directory>
</group>

117
rosapps/directory.rbuild
View file

@ -1,104 +1,109 @@
<!-- <?xml version="1.0"?>
<directory name="avtest"> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<!--
<directory name="avtest">
<xi:include href="avtest/avtest.rbuild" /> <xi:include href="avtest/avtest.rbuild" />
</directory> </directory>
--> -->
<directory name="cardsbav">
<directory name="cardsbav">
<xi:include href="cardsbav/cardsbav.rbuild" /> <xi:include href="cardsbav/cardsbav.rbuild" />
</directory> </directory>
<directory name="cmdutils"> <directory name="cmdutils">
<xi:include href="cmdutils/cmdutils.rbuild" /> <xi:include href="cmdutils/cmdutils.rbuild" />
</directory> </directory>
<directory name="demos"> <directory name="demos">
<xi:include href="demos/directory.rbuild" /> <xi:include href="demos/directory.rbuild" />
</directory> </directory>
<directory name="devutils"> <directory name="devutils">
<xi:include href="devutils/directory.rbuild" /> <xi:include href="devutils/directory.rbuild" />
</directory> </directory>
<directory name="dflat32"> <directory name="dflat32">
<xi:include href="dflat32/dflat32.rbuild" /> <xi:include href="dflat32/dflat32.rbuild" />
</directory> </directory>
<directory name="downloader"> <directory name="downloader">
<xi:include href="downloader/downloader.rbuild" /> <xi:include href="downloader/downloader.rbuild" />
</directory> </directory>
<directory name="fontview"> <directory name="fontview">
<xi:include href="fontview/fontview.rbuild" /> <xi:include href="fontview/fontview.rbuild" />
</directory> </directory>
<directory name="gettype"> <directory name="gettype">
<xi:include href="gettype/gettype.rbuild" /> <xi:include href="gettype/gettype.rbuild" />
</directory> </directory>
<directory name="green"> <directory name="green">
<xi:include href="green/green.rbuild" /> <xi:include href="green/green.rbuild" />
</directory> </directory>
<directory name="imagesoft"> <directory name="imagesoft">
<xi:include href="imagesoft/imagesoft.rbuild" /> <xi:include href="imagesoft/imagesoft.rbuild" />
</directory> </directory>
<!-- <!--
<directory name="lib"> <directory name="lib">
<xi:include href="lib/directory.rbuild" /> <xi:include href="lib/directory.rbuild" />
</directory> </directory>
--> -->
<directory name="logevent"> <directory name="logevent">
<xi:include href="logevent/logevent.rbuild" /> <xi:include href="logevent/logevent.rbuild" />
</directory> </directory>
<directory name="magnify"> <directory name="magnify">
<xi:include href="magnify/magnify.rbuild" /> <xi:include href="magnify/magnify.rbuild" />
</directory> </directory>
<directory name="mc"> <directory name="mc">
<xi:include href="mc/mc.rbuild" /> <xi:include href="mc/mc.rbuild" />
</directory> </directory>
<directory name="net"> <directory name="net">
<xi:include href="net/directory.rbuild" /> <xi:include href="net/directory.rbuild" />
</directory> </directory>
<directory name="notevil"> <directory name="notevil">
<xi:include href="notevil/notevil.rbuild" /> <xi:include href="notevil/notevil.rbuild" />
</directory> </directory>
<!-- <!--
<directory name="packmgr"> <directory name="packmgr">
<xi:include href="packmgr/directory.rbuild" /> <xi:include href="packmgr/directory.rbuild" />
</directory> </directory>
--> -->
<directory name="ramdrv"> <directory name="ramdrv">
<xi:include href="ramdrv/ramdrv.rbuild" /> <xi:include href="ramdrv/ramdrv.rbuild" />
</directory> </directory>
<directory name="roshttpd"> <directory name="roshttpd">
<xi:include href="roshttpd/roshttpd.rbuild" /> <xi:include href="roshttpd/roshttpd.rbuild" />
</directory> </directory>
<directory name="screenshot"> <directory name="screenshot">
<xi:include href="screenshot/screenshot.rbuild" /> <xi:include href="screenshot/screenshot.rbuild" />
</directory> </directory>
<directory name="sysutils"> <directory name="sysutils">
<xi:include href="sysutils/sysutils.rbuild" /> <xi:include href="sysutils/sysutils.rbuild" />
</directory> </directory>
<directory name="templates"> <directory name="templates">
<xi:include href="templates/directory.rbuild" /> <xi:include href="templates/directory.rbuild" />
</directory> </directory>
<directory name="winefile"> <directory name="winefile">
<xi:include href="winefile/winefile.rbuild" /> <xi:include href="winefile/winefile.rbuild" />
</directory> </directory>
<directory name="winver"> <directory name="winver">
<xi:include href="winver/winver.rbuild" /> <xi:include href="winver/winver.rbuild" />
</directory> </directory>
</group>

11
rosapps/downloader/downloader.rbuild
View file

@ -1,13 +1,13 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude">
<installfile base="system32">downloader.xml</installfile> <installfile base="system32">downloader.xml</installfile>
<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes"> <module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes">
<include base="downloader">.</include> <include base="downloader">.</include>
<include base="expat">.</include> <include base="expat">.</include>
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="WINVER">0x0501</define> <define name="WINVER">0x0501</define>
<define name="_WIN32_IE>0x0600</define> <define name="_WIN32_IE">0x0600</define>
<library>kernel32</library> <library>kernel32</library>
<library>advapi32</library> <library>advapi32</library>
@ -26,4 +26,5 @@
<file>xml.c</file> <file>xml.c</file>
<file>download.c</file> <file>download.c</file>
<file>downloader.rc</file> <file>downloader.rc</file>
</module> </module>
</group>

7
rosapps/lib/directory.rbuild
View file

@ -1,3 +1,6 @@
<directory name="dflat32"> <?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="dflat32">
<xi:include href="dflat32/dflat32.rbuild" /> <xi:include href="dflat32/dflat32.rbuild" />
</directory> </directory>
</group>

15
rosapps/net/directory.rbuild
View file

@ -1,12 +1,15 @@
<directory name="ncftp"> <?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="ncftp">
<xi:include href="ncftp/ncftp.rbuild" /> <xi:include href="ncftp/ncftp.rbuild" />
</directory> </directory>
<directory name="netreg"> <directory name="netreg">
<xi:include href="netreg/netreg.rbuild" /> <xi:include href="netreg/netreg.rbuild" />
</directory> </directory>
<directory name="niclist"> <directory name="niclist">
<xi:include href="niclist/niclist.rbuild" /> <xi:include href="niclist/niclist.rbuild" />
</directory> </directory>
</group>

48
rosapps/sysutils/sysutils.rbuild
View file

@ -1,40 +1,44 @@
<directory name="lib"> <?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="lib">
<xi:include href="lib/lib.rbuild" /> <xi:include href="lib/lib.rbuild" />
</directory> </directory>
<directory name="ctm"> <directory name="ctm">
<xi:include href="ctm/ctm.rbuild" /> <xi:include href="ctm/ctm.rbuild" />
</directory> </directory>
<!--
<directory name="chkdsk"> <!--
<directory name="chkdsk">
<xi:include href="chkdsk/chkdsk.rbuild" /> <xi:include href="chkdsk/chkdsk.rbuild" />
</directory> </directory>
--> -->
<directory name="kill"> <directory name="kill">
<xi:include href="kill/kill.rbuild" /> <xi:include href="kill/kill.rbuild" />
</directory> </directory>
<directory name="lsdd"> <directory name="lsdd">
<xi:include href="lsdd/lsdd.rbuild" /> <xi:include href="lsdd/lsdd.rbuild" />
</directory> </directory>
<directory name="man"> <directory name="man">
<xi:include href="man/man.rbuild" /> <xi:include href="man/man.rbuild" />
</directory> </directory>
<directory name="pedump"> <directory name="pedump">
<xi:include href="pedump/pedump.rbuild" /> <xi:include href="pedump/pedump.rbuild" />
</directory> </directory>
<directory name="regexpl"> <directory name="regexpl">
<xi:include href="regexpl/regexpl.rbuild" /> <xi:include href="regexpl/regexpl.rbuild" />
</directory> </directory>
<directory name="tcat"> <directory name="tcat">
<xi:include href="tcat/cat.rbuild" /> <xi:include href="tcat/cat.rbuild" />
</directory> </directory>
<directory name="tlist"> <directory name="tlist">
<xi:include href="tlist/tlist.rbuild" /> <xi:include href="tlist/tlist.rbuild" />
</directory> </directory>
</group>

16
rosapps/templates/directory.rbuild
View file

@ -1,8 +1,12 @@
<directory name="dialog"> <?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="dialog">
<xi:include href="dialog/dialog.rbuild" /> <xi:include href="dialog/dialog.rbuild" />
</directory> </directory>
<!--
<directory name="mdi"> <!--
<directory name="mdi">
<xi:include href="mdi/mdi.rbuild" /> <xi:include href="mdi/mdi.rbuild" />
</directory> </directory>
--> -->
</group>