Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:32:59 +00:00
Code Issues Projects Releases Packages 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
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>

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

@ -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/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>

2
reactos/subsystems/win32/csrss/csrss.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="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>

3
rosapps/cmdutils/cmdutils.rbuild
View file

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

3
rosapps/demos/directory.rbuild
View file

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

4
rosapps/devutils/directory.rbuild
View file

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

5
rosapps/directory.rbuild
View file

@ -1,8 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- <!--
<directory name="avtest"> <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>
@ -102,3 +106,4 @@
<directory name="winver"> <directory name="winver">
<xi:include href="winver/winver.rbuild" /> <xi:include href="winver/winver.rbuild" />
</directory> </directory>
</group>

5
rosapps/downloader/downloader.rbuild
View file

@ -1,5 +1,5 @@
<?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>
@ -7,7 +7,7 @@
<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>
@ -27,3 +27,4 @@
<file>download.c</file> <file>download.c</file>
<file>downloader.rc</file> <file>downloader.rc</file>
</module> </module>
</group>

3
rosapps/lib/directory.rbuild
View file

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

3
rosapps/net/directory.rbuild
View file

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

4
rosapps/sysutils/sysutils.rbuild
View file

@ -1,3 +1,5 @@
<?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="lib"> <directory name="lib">
<xi:include href="lib/lib.rbuild" /> <xi:include href="lib/lib.rbuild" />
</directory> </directory>
@ -5,6 +7,7 @@
<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" />
@ -38,3 +41,4 @@
<directory name="tlist"> <directory name="tlist">
<xi:include href="tlist/tlist.rbuild" /> <xi:include href="tlist/tlist.rbuild" />
</directory> </directory>
</group>

4
rosapps/templates/directory.rbuild
View file

@ -1,8 +1,12 @@
<?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="dialog"> <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>