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

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

diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild
index c1ff2db..414b722 100644 (file)
--- a/reactos/ReactOS-generic.rbuild
+++ b/reactos/ReactOS-generic.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd">
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd">

-<group>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">

   <xi:include href="baseaddress.rbuild" />
 
   <define name="_REACTOS_" />
   <xi:include href="baseaddress.rbuild" />
 
   <define name="_REACTOS_" />

diff --git a/reactos/base/applications/regedit/regedit.rbuild b/reactos/base/applications/regedit/regedit.rbuild
index ccd0c76..6b782d4 100644 (file)
--- a/reactos/base/applications/regedit/regedit.rbuild
+++ b/reactos/base/applications/regedit/regedit.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <?xml version="1.0"?>
 <!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">
        <include base="regedit">.</include>
        <define name="__USE_W32API" />
 <module name="regedit" type="win32gui" installname="regedit.exe">
        <include base="regedit">.</include>
        <define name="__USE_W32API" />

diff --git a/reactos/base/applications/screensavers/logon/logon.rbuild b/reactos/base/applications/screensavers/logon/logon.rbuild
index 65d9786..ef7ae7a 100644 (file)
--- a/reactos/base/applications/screensavers/logon/logon.rbuild
+++ b/reactos/base/applications/screensavers/logon/logon.rbuild
@@ -10,9 +10,6 @@
        <library>kernel32</library>\r
        <library>user32</library>\r
        <library>gdi32</library>\r
        <library>kernel32</library>\r
        <library>user32</library>\r
        <library>gdi32</library>\r

-       <library>opengl32</library>\r
-       <library>glu32</library>\r
-       <library>winmm</library>\r

 \r
        <metadata description = "Default ReactOS Logo screensaver" />\r
 \r
 \r
        <metadata description = "Default ReactOS Logo screensaver" />\r
 \r

diff --git a/reactos/base/shell/explorer/explorer.rbuild b/reactos/base/shell/explorer/explorer.rbuild
index 538c64f..1f0fe29 100644 (file)
--- a/reactos/base/shell/explorer/explorer.rbuild
+++ b/reactos/base/shell/explorer/explorer.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <?xml version="1.0"?>
 <!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">
        <linkerflag>-fexceptions</linkerflag>
        <include base="explorer">.</include>
 <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" stdlib="host" usewrc="false">
        <linkerflag>-fexceptions</linkerflag>
        <include base="explorer">.</include>

diff --git a/reactos/dll/directx/wine/d3d8/d3d8.rbuild b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
index 21cfbb1..7522d95 100644 (file)
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@@ -16,10 +16,10 @@
 
        <library>uuid</library>
        <library>wine</library>
 
        <library>uuid</library>
        <library>wine</library>

-       <library>user32 </library>
-       <library>opengl32 </library>
-       <library>gdi32 </library>
-       <library>advapi32 </library>
+       <library>user32</library>
+       <library>opengl32</library>
+       <library>gdi32</library>
+       <library>advapi32</library>

        <library>kernel32</library>
        <library>wined3d</library>
 
        <library>kernel32</library>
        <library>wined3d</library>
 


@@ -42,5 +42,4 @@
        <file>volumetexture.c</file>
        <file>version.rc</file>
        <file>d3d8.spec</file>
        <file>volumetexture.c</file>
        <file>version.rc</file>
        <file>d3d8.spec</file>

-

 </module>
 </module>

diff --git a/reactos/dll/directx/wine/wined3d/wined3d.rbuild b/reactos/dll/directx/wine/wined3d/wined3d.rbuild
index 2f01e0e..37172db 100644 (file)
--- a/reactos/dll/directx/wine/wined3d/wined3d.rbuild
+++ b/reactos/dll/directx/wine/wined3d/wined3d.rbuild
@@ -16,7 +16,7 @@
        <library>user32</library>
        <library>opengl32</library>
        <library>gdi32</library>
        <library>user32</library>
        <library>opengl32</library>
        <library>gdi32</library>

-       <library>advapi32 </library>
+       <library>advapi32</library>

        <library>kernel32</library>
        <library>uuid</library>
        <library>msvcrt</library>
        <library>kernel32</library>
        <library>uuid</library>
        <library>msvcrt</library>

diff --git a/reactos/lib/drivers/ip/ip.rbuild b/reactos/lib/drivers/ip/ip.rbuild
index 3870b37..27a3d16 100644 (file)
--- a/reactos/lib/drivers/ip/ip.rbuild
+++ b/reactos/lib/drivers/ip/ip.rbuild
@@ -8,7 +8,7 @@
        <directory name="network">
                <if property="ARCH" value="i386">
                        <directory name="i386">
        <directory name="network">
                <if property="ARCH" value="i386">
                        <directory name="i386">

-                               <file>checksum.S</file>
+                               <file>checksum.S</file>

                        </directory>
                </if>
                <file>address.c</file>
                        </directory>
                </if>
                <file>address.c</file>


@@ -27,20 +27,20 @@
                <file>transmit.c</file>
        </directory>
        <directory name="transport">
                <file>transmit.c</file>
        </directory>
        <directory name="transport">

-               <directory name="datagram">
-                       <file>datagram.c</file>
+               <directory name="datagram">
+                       <file>datagram.c</file>

                </directory>
                <directory name="rawip">
                </directory>
                <directory name="rawip">

-                       <file>rawip.c</file>
+                       <file>rawip.c</file>

                </directory>
                <directory name="tcp">
                </directory>
                <directory name="tcp">

-                       <file>accept.c</file>
+                       <file>accept.c</file>

                        <file>event.c</file>
                        <file>if.c</file>
                        <file>tcp.c</file>
                </directory>
                <directory name="udp">
                        <file>event.c</file>
                        <file>if.c</file>
                        <file>tcp.c</file>
                </directory>
                <directory name="udp">

-                       <file>udp.c</file>
+                       <file>udp.c</file>

                </directory>
        </directory>
 </module>
                </directory>
        </directory>
 </module>

diff --git a/reactos/lib/sdk/sdk.rbuild b/reactos/lib/sdk/sdk.rbuild
index 9ce5216..4c4795d 100644 (file)
--- a/reactos/lib/sdk/sdk.rbuild
+++ b/reactos/lib/sdk/sdk.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>\r
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">\r
 <?xml version="1.0"?>\r
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">\r

-<group>\r
+<group xmlns:xi="http://www.w3.org/2001/XInclude">\r

        <directory name="crt">\r
                <xi:include href="crt/crt.rbuild" />\r
        </directory>\r
        <directory name="crt">\r
                <xi:include href="crt/crt.rbuild" />\r
        </directory>\r

diff --git a/reactos/ntoskrnl/ntoskrnl.rbuild b/reactos/ntoskrnl/ntoskrnl.rbuild
index 48c644b..be4199f 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl.rbuild
@@ -1,389 +1,389 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
 <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe">
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
 <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe">

-    <bootstrap base="$(CDOUTPUT)" />
-    <importlibrary definition="ntoskrnl.def" />
-    <define name="_DISABLE_TIDENTS" />
-    <define name="__NTOSKRNL__" />
-    <define name="_NTOSKRNL_" />
-    <define name="_NTSYSTEM_" />
-    <define name="__NO_CTYPE_INLINES" />
-    <define name="__USE_W32API" />
-    <define name="WIN9X_COMPAT_SPINLOCK" />
-    <define name="_IN_KERNEL_" />
-    <if property="_WINKD_" value="1">
-        <define name="_WINKD_" />
-    </if>
-    <include base="cmlib">.</include>
-    <include base="ntoskrnl">include</include>
-    <include base="ntoskrnl" root="intermediate"></include>
-    <include base="ReactOS">include/reactos/drivers</include>
-    <library>csq</library>
-    <library>hal</library>
-    <library>pseh</library>
-    <library>cmlib</library>
-    <library>rtl</library>
-    <library>rossym</library>
-    <library>libcntpr</library>
-    <library>kdcom</library>
-    <library>bootvid</library>
-    <library>wdmguid</library>
-    <directory name="include">
-        <pch>ntoskrnl.h</pch>
-    </directory>
-    <directory name="ke">
-        <if property="ARCH" value="i386">
-            <directory name="i386">
-                <file first="true">boot.S</file>
-                <file>abios.c</file>
-                <file>cpu.c</file>
-                <file>ctxswitch.S</file>
-                <file>exp.c</file>
-                <file>irqobj.c</file>
-                <file>kiinit.c</file>
-                <file>ldt.c</file>
-                <file>mtrr.c</file>
-                <file>patpge.c</file>
-                <file>systimer.S</file>
-                <file>thrdini.c</file>
-                <file>trap.s</file>
-                <file>usercall_asm.S</file>
-                <file>usercall.c</file>
-                <file>v86vdm.c</file>
-                <file>v86m_sup.S</file>
-            </directory>
-        </if>
-            <file>apc.c</file>
-            <file>balmgr.c</file>
-            <file>bug.c</file>
-            <file>clock.c</file>
-            <file>config.c</file>
-            <file>devqueue.c</file>
-            <file>dpc.c</file>
-            <file>eventobj.c</file>
-            <file>except.c</file>
-            <file>freeldr.c</file>
-            <file>gate.c</file>
-            <file>gmutex.c</file>
-            <file>ipi.c</file>
-            <file>krnlinit.c</file>
-            <file>mutex.c</file>
-            <file>procobj.c</file>
-            <file>profobj.c</file>
-            <file>queue.c</file>
-            <file>semphobj.c</file>
-            <file>spinlock.c</file>
-            <file>thrdschd.c</file>
-            <file>thrdobj.c</file>
-            <file>timerobj.c</file>
-            <file>wait.c</file>
-    </directory>
-    <directory name="cc">
-            <file>cacheman.c</file>
-            <file>copy.c</file>
-            <file>fs.c</file>
-            <file>mdl.c</file>
-            <file>pin.c</file>
-            <file>view.c</file>
-    </directory>
-    <directory name="config">
-            <if property="ARCH" value="i386">
-                <directory name="i386">
-                    <file>cmhardwr.c</file>
-                </directory>
-            </if>
-            <file>cmapi.c</file>
-            <file>cmboot.c</file>
-            <file>cmcheck.c</file>
-            <file>cmcontrl.c</file>
-            <file>cmconfig.c</file>
-            <file>cmdata.c</file>
-            <file>cmindex.c</file>
-            <file>cminit.c</file>
-            <file>cmhook.c</file>
-            <file>cmkcbncb.c</file>
-            <file>cmkeydel.c</file>
-            <file>cmmapvw.c</file>
-            <file>cmname.c</file>
-            <file>cmparse.c</file>
-            <file>cmse.c</file>
-            <file>cmsecach.c</file>
-            <file>cmsysini.c</file>
-            <file>cmvalue.c</file>
-            <file>cmvalche.c</file>
-            <file>cmwraprs.c</file>
-    </directory>
-    <directory name="cm">
-            <file>ntfunc.c</file>
-            <file>regfile.c</file>
-            <file>registry.c</file>
-            <file>regobj.c</file>
-    </directory>
-    <directory name="dbgk">
-        <file>dbgkutil.c</file>
-        <file>dbgkobj.c</file>
-    </directory>
-    <directory name="ex" root="intermediate">
-        <file>zw.S</file>
-    </directory>
-    <directory name="ex">
-        <if property="ARCH" value="i386">
-            <directory name="i386">
-                <file>interlck_asm.S</file>
-                <file>fastinterlck_asm.S</file>
-                <file>ioport.S</file>
-            </directory>
-        </if>
-            <file>atom.c</file>
-            <file>callback.c</file>
-            <file>dbgctrl.c</file>
-            <file>efi.c</file>
-            <file>event.c</file>
-            <file>evtpair.c</file>
-            <file>fmutex.c</file>
-            <file>handle.c</file>
-            <file>harderr.c</file>
-            <file>hdlsterm.c</file>
-            <file>init.c</file>
-            <file>keyedevt.c</file>
-            <file>locale.c</file>
-            <file>lookas.c</file>
-            <file>mutant.c</file>
-            <file>pushlock.c</file>
-            <file>profile.c</file>
-            <file>resource.c</file>
-            <file>rundown.c</file>
-            <file>sem.c</file>
-            <file>shutdown.c</file>
-            <file>sysinfo.c</file>
-            <file>time.c</file>
-            <file>timer.c</file>
-            <file>uuid.c</file>
-            <file>win32k.c</file>
-            <file>work.c</file>
-            <file>xipdisp.c</file>
-            <file>zone.c</file>
-    </directory>
-    <directory name="fsrtl">
-            <file>dbcsname.c</file>
-            <file>fastio.c</file>
-            <file>faulttol.c</file>
-            <file>filelock.c</file>
-            <file>filter.c</file>
-            <file>filtrctx.c</file>
-            <file>fsfilter.c</file>
-            <file>fsrtlpc.c</file>
-            <file>largemcb.c</file>
-            <file>name.c</file>
-            <file>notify.c</file>
-            <file>oplock.c</file>
-            <file>pnp.c</file>
-            <file>stackovf.c</file>
-            <file>tunnel.c</file>
-            <file>unc.c</file>
-    </directory>
-    <directory name="fstub">
-        <file>disksup.c</file>
-        <file>fstubex.c</file>
-        <file>halstub.c</file>
-    </directory>
-    <directory name="inbv">
-        <file>inbv.c</file>
-    </directory>
-    <directory name="io">
-        <directory name="iomgr">
-            <file>adapter.c</file>
-            <file>arcname.c</file>
-            <file>bootlog.c</file>
-            <file>controller.c</file>
-            <file>device.c</file>
-            <file>deviface.c</file>
-            <file>driver.c</file>
-            <file>drvrlist.c</file>
-            <file>error.c</file>
-            <file>file.c</file>
-            <file>iocomp.c</file>
-            <file>ioevent.c</file>
-            <file>iofunc.c</file>
-            <file>iomdl.c</file>
-            <file>iomgr.c</file>
-            <file>iorsrce.c</file>
-            <file>iotimer.c</file>
-            <file>iowork.c</file>
-            <file>irp.c</file>
-            <file>irq.c</file>
-            <file>rawfs.c</file>
-            <file>remlock.c</file>
-            <file>util.c</file>
-            <file>symlink.c</file>
-            <file>volume.c</file>
-        </directory>
-        <directory name="pnpmgr">
-            <file>plugplay.c</file>
-            <file>pnpdma.c</file>
-            <file>pnpmgr.c</file>
-            <file>pnpnotify.c</file>
-            <file>pnpreport.c</file>
-            <file>pnproot.c</file>
-        </directory>
-    </directory>
-    <if property="_WINKD_" value="0">
-        <directory name="kdbg">
-            <if property="ARCH" value="i386">
-                <directory name="i386">
-                    <if property="KDBG" value="1">
-                        <group>
-                            <file>i386-dis.c</file>
-                            <file>kdb_help.S</file>
-                            <file>longjmp.S</file>
-                            <file>setjmp.S</file>
-                        </group>
-                    </if>
-                </directory>
-            </if>
-            <if property="KDBG" value="1">
-                <file>kdb.c</file>
-                <file>kdb_cli.c</file>
-                <file>kdb_expr.c</file>
-                <file>kdb_keyboard.c</file>
-                <file>kdb_serial.c</file>
-                <file>kdb_string.c</file>
-            </if>
-            <if property="DBG_OR_KDBG" value="true">
-                <file>kdb_symbols.c</file>
-            </if>
-        </directory>
-        <directory name="kd">
-            <directory name="wrappers">
-                <file>bochs.c</file>
-                <file>gdbstub.c</file>
-               <file>kdbg.c</file>
-            </directory>
-            <file>kdinit.c</file>
-            <file>kdio.c</file>
-            <file>kdmain.c</file>
-        </directory>
-    </if>
-    <if property="_WINKD_" value ="1">
-        <directory name="kd64">
-            <file>kdapi.c</file>
-            <file>kdbreak.c</file>
-            <file>kddata.c</file>
-            <file>kdinit.c</file>
-            <file>kdlock.c</file>
-            <file>kdprint.c</file>
-            <file>kdtrap.c</file>
-        </directory>
-    </if>
-    <directory name="lpc">
-            <file>close.c</file>
-            <file>complete.c</file>
-            <file>connect.c</file>
-            <file>create.c</file>
-            <file>listen.c</file>
-            <file>port.c</file>
-            <file>reply.c</file>
-            <file>send.c</file>
-    </directory>
-    <directory name="mm">
-        <if property="ARCH" value="i386">
-            <directory name="i386">
-                <file>page.c</file>
-            </directory>
-        </if>
-            <file>anonmem.c</file>
-            <file>aspace.c</file>
-            <file>balance.c</file>
-            <file>cont.c</file>
-            <file>drvlck.c</file>
-            <file>freelist.c</file>
-            <file>iospace.c</file>
-            <file>kmap.c</file>
-            <file>marea.c</file>
-            <file>mdlsup.c</file>
-            <file>mm.c</file>
-            <file>mminit.c</file>
-            <file>mpw.c</file>
-            <file>ncache.c</file>
-            <file>npool.c</file>
-            <file>pagefile.c</file>
-            <file>pageop.c</file>
-            <file>pager.c</file>
-            <file>pagfault.c</file>
-            <file>paging.c</file>
-            <file>pe.c</file>
-            <file>physical.c</file>
-            <file>pool.c</file>
-            <file>ppool.c</file>
-            <file>procsup.c</file>
-            <file>region.c</file>
-            <file>rmap.c</file>
-            <file>section.c</file>
-            <file>sysldr.c</file>
-            <file>verifier.c</file>
-            <file>virtual.c</file>
-            <file>wset.c</file>
-        <file>elf32.c</file>
-        <file>elf64.c</file>
-    </directory>
-    <directory name="ob">
-            <file>obdir.c</file>
-            <file>obinit.c</file>
-            <file>obhandle.c</file>
-            <file>obname.c</file>
-            <file>oblife.c</file>
-            <file>obref.c</file>
-            <file>sdcache.c</file>
-            <file>obsecure.c</file>
-            <file>oblink.c</file>
-            <file>obwait.c</file>
-    </directory>
-    <directory name="po">
-        <file>power.c</file>
-        <file>events.c</file>
-    </directory>
-    <directory name="ps">
-            <file>debug.c</file>
-            <file>job.c</file>
-            <file>kill.c</file>
-            <file>psnotify.c</file>
-            <file>process.c</file>
-            <file>psmgr.c</file>
-            <file>query.c</file>
-            <file>quota.c</file>
-            <file>security.c</file>
-            <file>state.c</file>
-            <file>thread.c</file>
-            <file>win32.c</file>
-    </directory>
-    <directory name="rtl">
-            <file>libsupp.c</file>
-            <file>misc.c</file>
-            <file>strtok.c</file>
-    </directory>
-    <directory name="se">
-            <file>access.c</file>
-            <file>acl.c</file>
-            <file>audit.c</file>
-            <file>lsa.c</file>
-            <file>luid.c</file>
-            <file>priv.c</file>
-            <file>sd.c</file>
-            <file>semgr.c</file>
-            <file>sid.c</file>
-            <file>token.c</file>
-    </directory>
-    <directory name="vdm">
-        <if property="ARCH" value="i386">
-            <file>vdmmain.c</file>
-            <file>vdmexec.c</file>
-        </if>
-    </directory>
-    <directory name="wmi">
-        <file>wmi.c</file>
-    </directory>
-    <file>ntoskrnl.rc</file>
-    <linkerflag>-nostartfiles</linkerflag>
-    <linkerflag>-nostdlib</linkerflag>
-    <linkerflag>-lgcc</linkerflag>
+       <bootstrap base="$(CDOUTPUT)" />
+       <importlibrary definition="ntoskrnl.def" />
+       <define name="_DISABLE_TIDENTS" />
+       <define name="__NTOSKRNL__" />
+       <define name="_NTOSKRNL_" />
+       <define name="_NTSYSTEM_" />
+       <define name="__NO_CTYPE_INLINES" />
+       <define name="__USE_W32API" />
+       <define name="WIN9X_COMPAT_SPINLOCK" />
+       <define name="_IN_KERNEL_" />
+       <if property="_WINKD_" value="1">
+               <define name="_WINKD_" />
+       </if>
+       <include base="cmlib">.</include>
+       <include base="ntoskrnl">include</include>
+       <include base="ntoskrnl" root="intermediate"></include>
+       <include base="ReactOS">include/reactos/drivers</include>
+       <library>csq</library>
+       <library>hal</library>
+       <library>pseh</library>
+       <library>cmlib</library>
+       <library>rtl</library>
+       <library>rossym</library>
+       <library>libcntpr</library>
+       <library>kdcom</library>
+       <library>bootvid</library>
+       <library>wdmguid</library>
+       <directory name="include">
+               <pch>ntoskrnl.h</pch>
+       </directory>
+       <directory name="ke">
+               <if property="ARCH" value="i386">
+                       <directory name="i386">
+                               <file first="true">boot.S</file>
+                               <file>abios.c</file>
+                               <file>cpu.c</file>
+                               <file>ctxswitch.S</file>
+                               <file>exp.c</file>
+                               <file>irqobj.c</file>
+                               <file>kiinit.c</file>
+                               <file>ldt.c</file>
+                               <file>mtrr.c</file>
+                               <file>patpge.c</file>
+                               <file>systimer.S</file>
+                               <file>thrdini.c</file>
+                               <file>trap.s</file>
+                               <file>usercall_asm.S</file>
+                               <file>usercall.c</file>
+                               <file>v86vdm.c</file>
+                               <file>v86m_sup.S</file>
+                       </directory>
+               </if>
+               <file>apc.c</file>
+               <file>balmgr.c</file>
+               <file>bug.c</file>
+               <file>clock.c</file>
+               <file>config.c</file>
+               <file>devqueue.c</file>
+               <file>dpc.c</file>
+               <file>eventobj.c</file>
+               <file>except.c</file>
+               <file>freeldr.c</file>
+               <file>gate.c</file>
+               <file>gmutex.c</file>
+               <file>ipi.c</file>
+               <file>krnlinit.c</file>
+               <file>mutex.c</file>
+               <file>procobj.c</file>
+               <file>profobj.c</file>
+               <file>queue.c</file>
+               <file>semphobj.c</file>
+               <file>spinlock.c</file>
+               <file>thrdschd.c</file>
+               <file>thrdobj.c</file>
+               <file>timerobj.c</file>
+               <file>wait.c</file>
+       </directory>
+       <directory name="cc">
+               <file>cacheman.c</file>
+               <file>copy.c</file>
+               <file>fs.c</file>
+               <file>mdl.c</file>
+               <file>pin.c</file>
+               <file>view.c</file>
+       </directory>
+       <directory name="config">
+               <if property="ARCH" value="i386">
+                       <directory name="i386">
+                               <file>cmhardwr.c</file>
+                       </directory>
+               </if>
+               <file>cmapi.c</file>
+               <file>cmboot.c</file>
+               <file>cmcheck.c</file>
+               <file>cmcontrl.c</file>
+               <file>cmconfig.c</file>
+               <file>cmdata.c</file>
+               <file>cmindex.c</file>
+               <file>cminit.c</file>
+               <file>cmhook.c</file>
+               <file>cmkcbncb.c</file>
+               <file>cmkeydel.c</file>
+               <file>cmmapvw.c</file>
+               <file>cmname.c</file>
+               <file>cmparse.c</file>
+               <file>cmse.c</file>
+               <file>cmsecach.c</file>
+               <file>cmsysini.c</file>
+               <file>cmvalue.c</file>
+               <file>cmvalche.c</file>
+               <file>cmwraprs.c</file>
+       </directory>
+       <directory name="cm">
+               <file>ntfunc.c</file>
+               <file>regfile.c</file>
+               <file>registry.c</file>
+               <file>regobj.c</file>
+       </directory>
+       <directory name="dbgk">
+               <file>dbgkutil.c</file>
+               <file>dbgkobj.c</file>
+       </directory>
+       <directory name="ex" root="intermediate">
+               <file>zw.S</file>
+       </directory>
+       <directory name="ex">
+               <if property="ARCH" value="i386">
+                       <directory name="i386">
+                               <file>interlck_asm.S</file>
+                               <file>fastinterlck_asm.S</file>
+                               <file>ioport.S</file>
+                       </directory>
+               </if>
+               <file>atom.c</file>
+               <file>callback.c</file>
+               <file>dbgctrl.c</file>
+               <file>efi.c</file>
+               <file>event.c</file>
+               <file>evtpair.c</file>
+               <file>fmutex.c</file>
+               <file>handle.c</file>
+               <file>harderr.c</file>
+               <file>hdlsterm.c</file>
+               <file>init.c</file>
+               <file>keyedevt.c</file>
+               <file>locale.c</file>
+               <file>lookas.c</file>
+               <file>mutant.c</file>
+               <file>pushlock.c</file>
+               <file>profile.c</file>
+               <file>resource.c</file>
+               <file>rundown.c</file>
+               <file>sem.c</file>
+               <file>shutdown.c</file>
+               <file>sysinfo.c</file>
+               <file>time.c</file>
+               <file>timer.c</file>
+               <file>uuid.c</file>
+               <file>win32k.c</file>
+               <file>work.c</file>
+               <file>xipdisp.c</file>
+               <file>zone.c</file>
+       </directory>
+       <directory name="fsrtl">
+               <file>dbcsname.c</file>
+               <file>fastio.c</file>
+               <file>faulttol.c</file>
+               <file>filelock.c</file>
+               <file>filter.c</file>
+               <file>filtrctx.c</file>
+               <file>fsfilter.c</file>
+               <file>fsrtlpc.c</file>
+               <file>largemcb.c</file>
+               <file>name.c</file>
+               <file>notify.c</file>
+               <file>oplock.c</file>
+               <file>pnp.c</file>
+               <file>stackovf.c</file>
+               <file>tunnel.c</file>
+               <file>unc.c</file>
+       </directory>
+       <directory name="fstub">
+               <file>disksup.c</file>
+               <file>fstubex.c</file>
+               <file>halstub.c</file>
+       </directory>
+       <directory name="inbv">
+               <file>inbv.c</file>
+       </directory>
+       <directory name="io">
+               <directory name="iomgr">
+                       <file>adapter.c</file>
+                       <file>arcname.c</file>
+                       <file>bootlog.c</file>
+                       <file>controller.c</file>
+                       <file>device.c</file>
+                       <file>deviface.c</file>
+                       <file>driver.c</file>
+                       <file>drvrlist.c</file>
+                       <file>error.c</file>
+                       <file>file.c</file>
+                       <file>iocomp.c</file>
+                       <file>ioevent.c</file>
+                       <file>iofunc.c</file>
+                       <file>iomdl.c</file>
+                       <file>iomgr.c</file>
+                       <file>iorsrce.c</file>
+                       <file>iotimer.c</file>
+                       <file>iowork.c</file>
+                       <file>irp.c</file>
+                       <file>irq.c</file>
+                       <file>rawfs.c</file>
+                       <file>remlock.c</file>
+                       <file>util.c</file>
+                       <file>symlink.c</file>
+                       <file>volume.c</file>
+               </directory>
+               <directory name="pnpmgr">
+                       <file>plugplay.c</file>
+                       <file>pnpdma.c</file>
+                       <file>pnpmgr.c</file>
+                       <file>pnpnotify.c</file>
+                       <file>pnpreport.c</file>
+                       <file>pnproot.c</file>
+               </directory>
+       </directory>
+       <if property="_WINKD_" value="0">
+               <directory name="kdbg">
+                       <if property="ARCH" value="i386">
+                               <directory name="i386">
+                                       <if property="KDBG" value="1">
+                                               <group>
+                                                       <file>i386-dis.c</file>
+                                                       <file>kdb_help.S</file>
+                                                       <file>longjmp.S</file>
+                                                       <file>setjmp.S</file>
+                                               </group>
+                                       </if>
+                               </directory>
+                       </if>
+                       <if property="KDBG" value="1">
+                               <file>kdb.c</file>
+                               <file>kdb_cli.c</file>
+                               <file>kdb_expr.c</file>
+                               <file>kdb_keyboard.c</file>
+                               <file>kdb_serial.c</file>
+                               <file>kdb_string.c</file>
+                       </if>
+                       <if property="DBG_OR_KDBG" value="true">
+                               <file>kdb_symbols.c</file>
+                       </if>
+               </directory>
+               <directory name="kd">
+                       <directory name="wrappers">
+                               <file>bochs.c</file>
+                               <file>gdbstub.c</file>
+                               <file>kdbg.c</file>
+                       </directory>
+                       <file>kdinit.c</file>
+                       <file>kdio.c</file>
+                       <file>kdmain.c</file>
+               </directory>
+       </if>
+       <if property="_WINKD_" value ="1">
+               <directory name="kd64">
+                       <file>kdapi.c</file>
+                       <file>kdbreak.c</file>
+                       <file>kddata.c</file>
+                       <file>kdinit.c</file>
+                       <file>kdlock.c</file>
+                       <file>kdprint.c</file>
+                       <file>kdtrap.c</file>
+               </directory>
+       </if>
+       <directory name="lpc">
+               <file>close.c</file>
+               <file>complete.c</file>
+               <file>connect.c</file>
+               <file>create.c</file>
+               <file>listen.c</file>
+               <file>port.c</file>
+               <file>reply.c</file>
+               <file>send.c</file>
+       </directory>
+       <directory name="mm">
+               <if property="ARCH" value="i386">
+                       <directory name="i386">
+                               <file>page.c</file>
+                       </directory>
+               </if>
+               <file>anonmem.c</file>
+               <file>aspace.c</file>
+               <file>balance.c</file>
+               <file>cont.c</file>
+               <file>drvlck.c</file>
+               <file>freelist.c</file>
+               <file>iospace.c</file>
+               <file>kmap.c</file>
+               <file>marea.c</file>
+               <file>mdlsup.c</file>
+               <file>mm.c</file>
+               <file>mminit.c</file>
+               <file>mpw.c</file>
+               <file>ncache.c</file>
+               <file>npool.c</file>
+               <file>pagefile.c</file>
+               <file>pageop.c</file>
+               <file>pager.c</file>
+               <file>pagfault.c</file>
+               <file>paging.c</file>
+               <file>pe.c</file>
+               <file>physical.c</file>
+               <file>pool.c</file>
+               <file>ppool.c</file>
+               <file>procsup.c</file>
+               <file>region.c</file>
+               <file>rmap.c</file>
+               <file>section.c</file>
+               <file>sysldr.c</file>
+               <file>verifier.c</file>
+               <file>virtual.c</file>
+               <file>wset.c</file>
+               <file>elf32.c</file>
+               <file>elf64.c</file>
+       </directory>
+       <directory name="ob">
+               <file>obdir.c</file>
+               <file>obinit.c</file>
+               <file>obhandle.c</file>
+               <file>obname.c</file>
+               <file>oblife.c</file>
+               <file>obref.c</file>
+               <file>sdcache.c</file>
+               <file>obsecure.c</file>
+               <file>oblink.c</file>
+               <file>obwait.c</file>
+       </directory>
+       <directory name="po">
+               <file>power.c</file>
+               <file>events.c</file>
+       </directory>
+       <directory name="ps">
+               <file>debug.c</file>
+               <file>job.c</file>
+               <file>kill.c</file>
+               <file>psnotify.c</file>
+               <file>process.c</file>
+               <file>psmgr.c</file>
+               <file>query.c</file>
+               <file>quota.c</file>
+               <file>security.c</file>
+               <file>state.c</file>
+               <file>thread.c</file>
+               <file>win32.c</file>
+       </directory>
+       <directory name="rtl">
+               <file>libsupp.c</file>
+               <file>misc.c</file>
+               <file>strtok.c</file>
+       </directory>
+       <directory name="se">
+               <file>access.c</file>
+               <file>acl.c</file>
+               <file>audit.c</file>
+               <file>lsa.c</file>
+               <file>luid.c</file>
+               <file>priv.c</file>
+               <file>sd.c</file>
+               <file>semgr.c</file>
+               <file>sid.c</file>
+               <file>token.c</file>
+       </directory>
+       <directory name="vdm">
+               <if property="ARCH" value="i386">
+                       <file>vdmmain.c</file>
+                       <file>vdmexec.c</file>
+               </if>
+       </directory>
+       <directory name="wmi">
+               <file>wmi.c</file>
+       </directory>
+       <file>ntoskrnl.rc</file>
+       <linkerflag>-nostartfiles</linkerflag>
+       <linkerflag>-nostdlib</linkerflag>
+       <linkerflag>-lgcc</linkerflag>

 </module>
 </module>

diff --git a/reactos/subsystems/win32/csrss/csrss.rbuild b/reactos/subsystems/win32/csrss/csrss.rbuild
index 52b3eaf..39c3bc6 100644 (file)
--- a/reactos/subsystems/win32/csrss/csrss.rbuild
+++ b/reactos/subsystems/win32/csrss/csrss.rbuild
@@ -1,31 +1,31 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">

-<group>
-<module name="csrss" type="nativecui" installbase="system32" installname="csrss.exe">
-       <include base="csrss">.</include>
-       <include base="csrss">include</include>
-       <include base="ReactOS">include/reactos/subsys</include>
-       <include base="ReactOS">include/reactos/drivers</include>
-       <define name="__USE_W32API" />
-       <define name="_WIN32_WINNT">0x0600</define>
-       <define name="WINVER">0x0501</define>
-       <library>nt</library>
-       <library>ntdll</library>
-       <library>smdll</library>
-       <directory name="api">
-               <file>handle.c</file>
-               <file>process.c</file>
-               <file>user.c</file>
-               <file>wapi.c</file>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <module name="csrss" type="nativecui" installbase="system32" installname="csrss.exe">
+               <include base="csrss">.</include>
+               <include base="csrss">include</include>
+               <include base="ReactOS">include/reactos/subsys</include>
+               <include base="ReactOS">include/reactos/drivers</include>
+               <define name="__USE_W32API" />
+               <define name="_WIN32_WINNT">0x0600</define>
+               <define name="WINVER">0x0501</define>
+               <library>nt</library>
+               <library>ntdll</library>
+               <library>smdll</library>
+               <directory name="api">
+                       <file>handle.c</file>
+                       <file>process.c</file>
+                       <file>user.c</file>
+                       <file>wapi.c</file>
+               </directory>
+               <pch>csrss.h</pch>
+               <file>csrss.c</file>
+               <file>init.c</file>
+               <file>print.c</file>
+               <file>video.c</file>
+               <file>csrss.rc</file>
+       </module>
+       <directory name="win32csr">
+               <xi:include href="win32csr/win32csr.rbuild" />

        </directory>
        </directory>

-       <pch>csrss.h</pch>
-       <file>csrss.c</file>
-       <file>init.c</file>
-       <file>print.c</file>
-       <file>video.c</file>
-       <file>csrss.rc</file>
-</module>
-<directory name="win32csr">
-       <xi:include href="win32csr/win32csr.rbuild" />
-</directory>

 </group>
 </group>

diff --git a/rosapps/cmdutils/cmdutils.rbuild b/rosapps/cmdutils/cmdutils.rbuild
index 5007a13..0df0539 100644 (file)
--- a/rosapps/cmdutils/cmdutils.rbuild
+++ b/rosapps/cmdutils/cmdutils.rbuild
@@ -1,20 +1,21 @@
-<group>
-<directory name="comp">
-    <xi:include href="comp/comp.rbuild" />
-</directory>
-<directory name="mode">
-    <xi:include href="mode/mode.rbuild" />
-</directory>
-<directory name="sort">
-    <xi:include href="sort/sort.rbuild" />
-</directory>
-<directory name="tee">
-    <xi:include href="tee/tee.rbuild" />
-</directory>
-<directory name="touch">
-    <xi:include href="touch/touch.rbuild" />
-</directory>
-<directory name="y">
-    <xi:include href="y/y.rbuild" />
-</directory>
+<?xml version="1.0"?>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <directory name="comp">
+               <xi:include href="comp/comp.rbuild" />
+       </directory>
+       <directory name="mode">
+               <xi:include href="mode/mode.rbuild" />
+       </directory>
+       <directory name="sort">
+               <xi:include href="sort/sort.rbuild" />
+       </directory>
+       <directory name="tee">
+               <xi:include href="tee/tee.rbuild" />
+       </directory>
+       <directory name="touch">
+               <xi:include href="touch/touch.rbuild" />
+       </directory>
+       <directory name="y">
+               <xi:include href="y/y.rbuild" />
+       </directory>

 </group>
 </group>

diff --git a/rosapps/demos/directory.rbuild b/rosapps/demos/directory.rbuild
index 54a77ba..7e5a0c2 100644 (file)
--- a/rosapps/demos/directory.rbuild
+++ b/rosapps/demos/directory.rbuild
@@ -1,11 +1,14 @@
-<directory name="maze">
-       <xi:include href="maze/maze.rbuild" />
-</directory>
+<?xml version="1.0"?>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <directory name="maze">
+               <xi:include href="maze/maze.rbuild" />
+       </directory>

 
 

-<directory name="mazescr">
-       <xi:include href="mazescr/mazescr.rbuild" />
-</directory>
+       <directory name="mazescr">
+               <xi:include href="mazescr/mazescr.rbuild" />
+       </directory>

 
 

-<directory name="ddraw">
-       <xi:include href="ddraw/ddraw.rbuild" />
-</directory>
+       <directory name="ddraw">
+               <xi:include href="ddraw/ddraw.rbuild" />
+       </directory>
+</group>

diff --git a/rosapps/devutils/directory.rbuild b/rosapps/devutils/directory.rbuild
index 21cd2fc..3243850 100644 (file)
--- a/rosapps/devutils/directory.rbuild
+++ b/rosapps/devutils/directory.rbuild
@@ -1,21 +1,23 @@
-<directory name="gdb2">
-       <xi:include href="gdb2/gdb2.rbuild" />
-</directory>
+<?xml version="1.0"?>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <directory name="gdb2">
+               <xi:include href="gdb2/gdb2.rbuild" />
+       </directory>

 
 

-<directory name="gdihv">
-       <xi:include href="gdihv/gdihv.rbuild" />
-</directory>
+       <directory name="gdihv">
+               <xi:include href="gdihv/gdihv.rbuild" />
+       </directory>

 
 

-<directory name="genguid">
-       <xi:include href="genguid/genguid.rbuild" />
-</directory>
+       <directory name="genguid">
+               <xi:include href="genguid/genguid.rbuild" />
+       </directory>

 
 

-<directory name="roswebparser">
-       <xi:include href="roswebparser/roswebparser.rbuild" />
-</directory>
-
-<directory name="zoomin">
-       <xi:include href="zoomin/zoomin.rbuild" />
-</directory>
+       <directory name="roswebparser">
+               <xi:include href="roswebparser/roswebparser.rbuild" />
+       </directory>

 
 

+       <directory name="zoomin">
+               <xi:include href="zoomin/zoomin.rbuild" />
+       </directory>
+</group>

 
 

diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild
index ce9eb02..ba7b0e2 100644 (file)
--- a/rosapps/directory.rbuild
+++ b/rosapps/directory.rbuild
@@ -1,104 +1,109 @@
-<!--
-<directory name="avtest">
-       <xi:include href="avtest/avtest.rbuild" />
-</directory>
--->
-<directory name="cardsbav">
-       <xi:include href="cardsbav/cardsbav.rbuild" />
-</directory>
-
-<directory name="cmdutils">
-       <xi:include href="cmdutils/cmdutils.rbuild" />
-</directory>
-
-<directory name="demos">
-       <xi:include href="demos/directory.rbuild" />
-</directory>
-
-<directory name="devutils">
-       <xi:include href="devutils/directory.rbuild" />
-</directory>
-
-<directory name="dflat32">
-       <xi:include href="dflat32/dflat32.rbuild" />
-</directory>
-
-<directory name="downloader">
-       <xi:include href="downloader/downloader.rbuild" />
-</directory>
-
-<directory name="fontview">
-       <xi:include href="fontview/fontview.rbuild" />
-</directory>
-
-<directory name="gettype">
-       <xi:include href="gettype/gettype.rbuild" />
-</directory>
-
-<directory name="green">
-       <xi:include href="green/green.rbuild" />
-</directory>
-
-<directory name="imagesoft">
-       <xi:include href="imagesoft/imagesoft.rbuild" />
-</directory>
-
-<!--
-<directory name="lib">
-       <xi:include href="lib/directory.rbuild" />
-</directory>
--->
-
-<directory name="logevent">
-       <xi:include href="logevent/logevent.rbuild" />
-</directory>
-
-<directory name="magnify">
-       <xi:include href="magnify/magnify.rbuild" />
-</directory>
-
-<directory name="mc">
-       <xi:include href="mc/mc.rbuild" />
-</directory>
-
-<directory name="net">
-       <xi:include href="net/directory.rbuild" />
-</directory>
-
-<directory name="notevil">
-       <xi:include href="notevil/notevil.rbuild" />
-</directory>
-
-<!--
-<directory name="packmgr">
-       <xi:include href="packmgr/directory.rbuild" />
-</directory>
--->
-
-<directory name="ramdrv">
-       <xi:include href="ramdrv/ramdrv.rbuild" />
-</directory>
-
-<directory name="roshttpd">
-       <xi:include href="roshttpd/roshttpd.rbuild" />
-</directory>
-
-<directory name="screenshot">
-       <xi:include href="screenshot/screenshot.rbuild" />
-</directory>
-
-<directory name="sysutils">
-       <xi:include href="sysutils/sysutils.rbuild" />
-</directory>
-
-<directory name="templates">
-       <xi:include href="templates/directory.rbuild" />
-</directory>
-
-<directory name="winefile">
-       <xi:include href="winefile/winefile.rbuild" />
-</directory>
-
-<directory name="winver">
-       <xi:include href="winver/winver.rbuild" />
-</directory>
+<?xml version="1.0"?>
+<!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" />
+       </directory>
+       -->
+
+       <directory name="cardsbav">
+               <xi:include href="cardsbav/cardsbav.rbuild" />
+       </directory>
+
+       <directory name="cmdutils">
+               <xi:include href="cmdutils/cmdutils.rbuild" />
+       </directory>
+
+       <directory name="demos">
+               <xi:include href="demos/directory.rbuild" />
+       </directory>
+
+       <directory name="devutils">
+               <xi:include href="devutils/directory.rbuild" />
+       </directory>
+
+       <directory name="dflat32">
+               <xi:include href="dflat32/dflat32.rbuild" />
+       </directory>
+
+       <directory name="downloader">
+               <xi:include href="downloader/downloader.rbuild" />
+       </directory>
+
+       <directory name="fontview">
+               <xi:include href="fontview/fontview.rbuild" />
+       </directory>
+
+       <directory name="gettype">
+               <xi:include href="gettype/gettype.rbuild" />
+       </directory>
+
+       <directory name="green">
+               <xi:include href="green/green.rbuild" />
+       </directory>
+
+       <directory name="imagesoft">
+               <xi:include href="imagesoft/imagesoft.rbuild" />
+       </directory>
+
+       <!--
+       <directory name="lib">
+               <xi:include href="lib/directory.rbuild" />
+       </directory>
+       -->
+
+       <directory name="logevent">
+               <xi:include href="logevent/logevent.rbuild" />
+       </directory>
+
+       <directory name="magnify">
+               <xi:include href="magnify/magnify.rbuild" />
+       </directory>
+
+       <directory name="mc">
+               <xi:include href="mc/mc.rbuild" />
+       </directory>
+
+       <directory name="net">
+               <xi:include href="net/directory.rbuild" />
+       </directory>
+
+       <directory name="notevil">
+               <xi:include href="notevil/notevil.rbuild" />
+       </directory>
+
+       <!--
+       <directory name="packmgr">
+               <xi:include href="packmgr/directory.rbuild" />
+       </directory>
+       -->
+
+       <directory name="ramdrv">
+               <xi:include href="ramdrv/ramdrv.rbuild" />
+       </directory>
+
+       <directory name="roshttpd">
+               <xi:include href="roshttpd/roshttpd.rbuild" />
+       </directory>
+
+       <directory name="screenshot">
+               <xi:include href="screenshot/screenshot.rbuild" />
+       </directory>
+
+       <directory name="sysutils">
+               <xi:include href="sysutils/sysutils.rbuild" />
+       </directory>
+
+       <directory name="templates">
+               <xi:include href="templates/directory.rbuild" />
+       </directory>
+
+       <directory name="winefile">
+               <xi:include href="winefile/winefile.rbuild" />
+       </directory>
+
+       <directory name="winver">
+               <xi:include href="winver/winver.rbuild" />
+       </directory>
+</group>

diff --git a/rosapps/downloader/downloader.rbuild b/rosapps/downloader/downloader.rbuild
index 4b3a834..1c87786 100644 (file)
--- a/rosapps/downloader/downloader.rbuild
+++ b/rosapps/downloader/downloader.rbuild
@@ -1,29 +1,30 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<installfile base="system32">downloader.xml</installfile>    
-<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes">
-       <include base="downloader">.</include>
-       <include base="expat">.</include>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <installfile base="system32">downloader.xml</installfile>
+       <module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes">
+               <include base="downloader">.</include>
+               <include base="expat">.</include>

 
 

-       <define name="__USE_W32API" />
-       <define name="WINVER">0x0501</define>
-       <define name="_WIN32_IE>0x0600</define>
-       
-       <library>kernel32</library>
-       <library>advapi32</library>
-       <library>ntdll</library>
-       <library>user32</library>
-       <library>gdi32</library>
-       <library>shell32</library>
-       <library>comctl32</library>
-       <library>msimg32</library>
-       <library>shlwapi</library>
-       <library>urlmon</library>
-       <library>uuid</library>
-       <library>expat</library>
+               <define name="__USE_W32API" />
+               <define name="WINVER">0x0501</define>
+               <define name="_WIN32_IE">0x0600</define>

 
 

-       <file>main.c</file>
-       <file>xml.c</file>
-       <file>download.c</file>
-       <file>downloader.rc</file>
-</module>
+               <library>kernel32</library>
+               <library>advapi32</library>
+               <library>ntdll</library>
+               <library>user32</library>
+               <library>gdi32</library>
+               <library>shell32</library>
+               <library>comctl32</library>
+               <library>msimg32</library>
+               <library>shlwapi</library>
+               <library>urlmon</library>
+               <library>uuid</library>
+               <library>expat</library>
+
+               <file>main.c</file>
+               <file>xml.c</file>
+               <file>download.c</file>
+               <file>downloader.rc</file>
+       </module>
+</group>

diff --git a/rosapps/lib/directory.rbuild b/rosapps/lib/directory.rbuild
index 2fde578..e812638 100644 (file)
--- a/rosapps/lib/directory.rbuild
+++ b/rosapps/lib/directory.rbuild
@@ -1,3 +1,6 @@
-<directory name="dflat32">
-       <xi:include href="dflat32/dflat32.rbuild" />
-</directory>
\ No newline at end of file
+<?xml version="1.0"?>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <directory name="dflat32">
+               <xi:include href="dflat32/dflat32.rbuild" />
+       </directory>
+</group>

diff --git a/rosapps/net/directory.rbuild b/rosapps/net/directory.rbuild
index 3779630..8007f5e 100644 (file)
--- a/rosapps/net/directory.rbuild
+++ b/rosapps/net/directory.rbuild
@@ -1,12 +1,15 @@
-<directory name="ncftp">
-       <xi:include href="ncftp/ncftp.rbuild" />
-</directory>
+<?xml version="1.0"?>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <directory name="ncftp">
+               <xi:include href="ncftp/ncftp.rbuild" />
+       </directory>

 
 

-<directory name="netreg">
-       <xi:include href="netreg/netreg.rbuild" />
-</directory>
+       <directory name="netreg">
+               <xi:include href="netreg/netreg.rbuild" />
+       </directory>

 
 

-<directory name="niclist">
-       <xi:include href="niclist/niclist.rbuild" />
-</directory>
+       <directory name="niclist">
+               <xi:include href="niclist/niclist.rbuild" />
+       </directory>
+</group>

 
 

diff --git a/rosapps/sysutils/sysutils.rbuild b/rosapps/sysutils/sysutils.rbuild
index 4a6ca80..7a623ba 100644 (file)
--- a/rosapps/sysutils/sysutils.rbuild
+++ b/rosapps/sysutils/sysutils.rbuild
@@ -1,40 +1,44 @@
-<directory name="lib">
-       <xi:include href="lib/lib.rbuild" />
-</directory>
-
-<directory name="ctm">
-       <xi:include href="ctm/ctm.rbuild" />
-</directory>
-<!--
-<directory name="chkdsk">
-       <xi:include href="chkdsk/chkdsk.rbuild" />
-</directory>
--->
-
-<directory name="kill">
-       <xi:include href="kill/kill.rbuild" />
-</directory>
-
-<directory name="lsdd">
-       <xi:include href="lsdd/lsdd.rbuild" />
-</directory>
-
-<directory name="man">
-       <xi:include href="man/man.rbuild" />
-</directory>
-
-<directory name="pedump">
-       <xi:include href="pedump/pedump.rbuild" />
-</directory>
-
-<directory name="regexpl">
-       <xi:include href="regexpl/regexpl.rbuild" />
-</directory>
-
-<directory name="tcat">
-       <xi:include href="tcat/cat.rbuild" />
-</directory>
-
-<directory name="tlist">
-       <xi:include href="tlist/tlist.rbuild" />
-</directory>
+<?xml version="1.0"?>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <directory name="lib">
+               <xi:include href="lib/lib.rbuild" />
+       </directory>
+
+       <directory name="ctm">
+               <xi:include href="ctm/ctm.rbuild" />
+       </directory>
+
+       <!--
+       <directory name="chkdsk">
+               <xi:include href="chkdsk/chkdsk.rbuild" />
+       </directory>
+       -->
+
+       <directory name="kill">
+               <xi:include href="kill/kill.rbuild" />
+       </directory>
+
+       <directory name="lsdd">
+               <xi:include href="lsdd/lsdd.rbuild" />
+       </directory>
+
+       <directory name="man">
+               <xi:include href="man/man.rbuild" />
+       </directory>
+
+       <directory name="pedump">
+               <xi:include href="pedump/pedump.rbuild" />
+       </directory>
+
+       <directory name="regexpl">
+               <xi:include href="regexpl/regexpl.rbuild" />
+       </directory>
+
+       <directory name="tcat">
+               <xi:include href="tcat/cat.rbuild" />
+       </directory>
+
+       <directory name="tlist">
+               <xi:include href="tlist/tlist.rbuild" />
+       </directory>
+</group>

diff --git a/rosapps/templates/directory.rbuild b/rosapps/templates/directory.rbuild
index 333936e..d737274 100644 (file)
--- a/rosapps/templates/directory.rbuild
+++ b/rosapps/templates/directory.rbuild
@@ -1,8 +1,12 @@
-<directory name="dialog">
-       <xi:include href="dialog/dialog.rbuild" />
-</directory>
-<!--
-<directory name="mdi">
-       <xi:include href="mdi/mdi.rbuild" />
-</directory>
--->
\ No newline at end of file
+<?xml version="1.0"?>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <directory name="dialog">
+               <xi:include href="dialog/dialog.rbuild" />
+       </directory>
+
+       <!--
+       <directory name="mdi">
+               <xi:include href="mdi/mdi.rbuild" />
+       </directory>
+       -->
+</group>