Change remaining .xml build files to .rbuild and fixup links.

svn path=/trunk/; revision=21147

reactos/ReactOS.rbuild

@@ -56,7 +56,7 @@
     <xi:include href="hal/hal.rbuild" />
   </directory>
   <directory name="include">
-    <xi:include href="include/directory.xml" />
+    <xi:include href="include/directory.rbuild" />
   </directory>
   <directory name="lib">
     <xi:include href="lib/lib.rbuild" />
@@ -65,13 +65,13 @@
     <xi:include href="media/media.rbuild" />
   </directory>
   <directory name="modules">
-    <xi:include href="modules/directory.xml" />
+    <xi:include href="modules/directory.rbuild" />
   </directory>
   <directory name="ntoskrnl">
     <xi:include href="ntoskrnl/ntoskrnl.rbuild" />
   </directory>
   <directory name="regtests">
-    <xi:include href="regtests/directory.xml" />
+    <xi:include href="regtests/directory.rbuild" />
   </directory>  
   <directory name="subsystems">
     <xi:include href="subsystems/subsystems.rbuild" />

reactos/base/applications/regedit/regedit.rbuild

@@ -32,5 +32,5 @@
 	<pch>regedit.h</pch>
 </module>
 <directory name="clb">
-	<xi:include href="clb/clb.xml" />
+	<xi:include href="clb/clb.rbuild" />
 </directory>

reactos/base/applications/utils/directory.rbuild

@@ -0,0 +1,17 @@
+<group>
+<directory name="net">
+	<xi:include href="net/directory.rbuild" />
+</directory>
+<directory name="getfirefox">
+	<xi:include href="getfirefox/getfirefox.rbuild" />
+</directory>
+<directory name="shutdown">
+	<xi:include href="shutdown/shutdown.rbuild" />
+</directory>
+<directory name="ps">
+	<xi:include href="ps/ps.rbuild" />
+</directory>
+<directory name="rosperf">
+	<xi:include href="rosperf/rosperf.rbuild" />
+</directory>
+</group>

reactos/base/applications/utils/directory.xml

@@ -1,17 +0,0 @@
-<group>
-<directory name="net">
-	<xi:include href="net/directory.xml" />
-</directory>
-<directory name="getfirefox">
-	<xi:include href="getfirefox/getfirefox.xml" />
-</directory>
-<directory name="shutdown">
-	<xi:include href="shutdown/shutdown.xml" />
-</directory>
-<directory name="ps">
-	<xi:include href="ps/ps.xml" />
-</directory>
-<directory name="rosperf">
-	<xi:include href="rosperf/rosperf.xml" />
-</directory>
-</group>

reactos/base/services/directory.rbuild

@@ -0,0 +1,17 @@
+<group>
+<directory name="dhcp">
+	<xi:include href="dhcp/dhcp.rbuild" />
+</directory>
+<directory name="eventlog">
+	<xi:include href="eventlog/eventlog.rbuild" />
+</directory>
+<directory name="rpcss">
+	<xi:include href="rpcss/rpcss.rbuild" />
+</directory>
+<directory name="tcpsvcs">
+	<xi:include href="tcpsvcs/tcpsvcs.rbuild" />
+</directory>
+<directory name="umpnpmgr">
+	<xi:include href="umpnpmgr/umpnpmgr.rbuild" />
+</directory>
+</group>

reactos/base/services/directory.xml

@@ -1,17 +0,0 @@
-<group>
-<directory name="dhcp">
-	<xi:include href="dhcp/dhcp.xml" />
-</directory>
-<directory name="eventlog">
-	<xi:include href="eventlog/eventlog.xml" />
-</directory>
-<directory name="rpcss">
-	<xi:include href="rpcss/rpcss.xml" />
-</directory>
-<directory name="tcpsvcs">
-	<xi:include href="tcpsvcs/tcpsvcs.xml" />
-</directory>
-<directory name="umpnpmgr">
-	<xi:include href="umpnpmgr/umpnpmgr.xml" />
-</directory>
-</group>

reactos/base/services/services.rbuild

@@ -1,17 +1,17 @@
 <group>
 <directory name="dhcp">
-	<xi:include href="dhcp/dhcp.xml" />
+	<xi:include href="dhcp/dhcp.rbuild" />
 </directory>
 <directory name="eventlog">
-	<xi:include href="eventlog/eventlog.xml" />
+	<xi:include href="eventlog/eventlog.rbuild" />
 </directory>
 <directory name="rpcss">
-	<xi:include href="rpcss/rpcss.xml" />
+	<xi:include href="rpcss/rpcss.rbuild" />
 </directory>
 <directory name="tcpsvcs">
-	<xi:include href="tcpsvcs/tcpsvcs.xml" />
+	<xi:include href="tcpsvcs/tcpsvcs.rbuild" />
 </directory>
 <directory name="umpnpmgr">
-	<xi:include href="umpnpmgr/umpnpmgr.xml" />
+	<xi:include href="umpnpmgr/umpnpmgr.rbuild" />
 </directory>
 </group>

reactos/base/setup/setup.rbuild

@@ -2,19 +2,19 @@
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
   <group>
   <directory name="setup">
-  <xi:include href="setup/setup.xml" />
+  <xi:include href="setup/setup.rbuild" />
   </directory>
   <directory name="usetup">
-  <xi:include href="usetup/usetup.xml" />
+  <xi:include href="usetup/usetup.rbuild" />
   </directory>
   <directory name="vmwinst">
-  <xi:include href="vmwinst/vmwinst.xml" />
+  <xi:include href="vmwinst/vmwinst.rbuild" />
   </directory>
   <directory name="welcome">
-  <xi:include href="welcome/welcome.xml" />
+  <xi:include href="welcome/welcome.rbuild" />
   </directory>
   <directory name="reactos">
-  <xi:include href="reactos/reactos.xml" />
+  <xi:include href="reactos/reactos.rbuild" />
   </directory>
   </group>
 </rbuild>

reactos/base/shell/explorer/explorer.rbuild

@@ -68,7 +68,7 @@
 	<file>i386-stub-win32.c</file>
 	<file>explorer.rc</file>
 </module>
-<installfile base=".">explorer-cfg-template.xml</installfile>
+<installfile base=".">explorer-cfg-template.rbuild</installfile>
 <directory name="notifyhook">
-	<xi:include href="notifyhook/notifyhook.xml" />
+	<xi:include href="notifyhook/notifyhook.rbuild" />
 </directory>

reactos/boot/boot.rbuild

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <directory name="freeldr">
-	<xi:include href="freeldr/freeldr.xml" />
+	<xi:include href="freeldr/freeldr.rbuild" />
 </directory>
 <directory name="bootdata">
-	<xi:include href="bootdata/bootdata.xml" />
+	<xi:include href="bootdata/bootdata.rbuild" />
 </directory>
 

reactos/boot/bootdata/bootdata.rbuild

@@ -8,9 +8,9 @@
 <cdfile base="reactos">hivesys.inf</cdfile>
 <cdfile base="reactos">txtsetup.sif</cdfile>
 <directory name="bootcd">
-	<xi:include href="bootcd/bootcd.xml" />
+	<xi:include href="bootcd/bootcd.rbuild" />
 </directory>
 <directory name="livecd">
-	<xi:include href="livecd/livecd.xml" />
+	<xi:include href="livecd/livecd.rbuild" />
 </directory>
 </group>

reactos/boot/freeldr/freeldr.rbuild

@@ -0,0 +1,15 @@
+<directory name="bootsect">
+	<xi:include href="bootsect/bootsect.rbuild" />
+</directory>
+<directory name="freeldr">
+	<xi:include href="freeldr/freeldr_startup.rbuild" />
+	<xi:include href="freeldr/freeldr_base64k.rbuild" />
+	<xi:include href="freeldr/freeldr_base.rbuild" />
+	<xi:include href="freeldr/freeldr_main.rbuild" />
+	<xi:include href="freeldr/setupldr_main.rbuild" />
+	<xi:include href="freeldr/freeldr.rbuild" />
+	<xi:include href="freeldr/setupldr.rbuild" />
+</directory>
+<directory name="install">
+	<xi:include href="install/installfreeldr.rbuild" />
+</directory>

reactos/boot/freeldr/freeldr.xml

@@ -1,15 +0,0 @@
-<directory name="bootsect">
-	<xi:include href="bootsect/bootsect.xml" />
-</directory>
-<directory name="freeldr">
-	<xi:include href="freeldr/freeldr_startup.xml" />
-	<xi:include href="freeldr/freeldr_base64k.xml" />
-	<xi:include href="freeldr/freeldr_base.xml" />
-	<xi:include href="freeldr/freeldr_main.xml" />
-	<xi:include href="freeldr/setupldr_main.xml" />
-	<xi:include href="freeldr/freeldr.xml" />
-	<xi:include href="freeldr/setupldr.xml" />
-</directory>
-<directory name="install">
-	<xi:include href="install/installfreeldr.xml" />
-</directory>

reactos/config.template.rbuild

@@ -3,9 +3,9 @@
 
 <!--
   This file is a template used as a starting point for compile-time
-  configuration of ReactOS. Make a copy of this file and name it config.xml.
-  Then change the options in config.xml. If you don't have a config.xml file,
-  then the defaults in this file, config.template.xml, will be used instead.
+  configuration of ReactOS. Make a copy of this file and name it config.rbuild.
+  Then change the options in config.rbuild. If you don't have a config.rbuild file,
+  then the defaults in this file, config.template.rbuild, will be used instead.
 
   Boolean options can obtain the values 0 (disabled) or 1 (enabled). String
   options can obtain any value specified in the comment before it.

reactos/dll/keyboard/keyboard.rbuild

@@ -1,53 +1,53 @@
 <group>
 	<directory name="kbdda">
-		<xi:include href="kbdda/kbdda.xml" />
+		<xi:include href="kbdda/kbdda.rbuild" />
 	</directory>
 	<directory name="kbddv">
-		<xi:include href="kbddv/kbddv.xml" />
+		<xi:include href="kbddv/kbddv.rbuild" />
 	</directory>
 	<directory name="kbdes">
-		<xi:include href="kbdes/kbdes.xml" />
+		<xi:include href="kbdes/kbdes.rbuild" />
 	</directory>
 	<directory name="kbdfr">
-		<xi:include href="kbdfr/kbdfr.xml" />
+		<xi:include href="kbdfr/kbdfr.rbuild" />
 	</directory>
 	<directory name="kbdgr">
-		<xi:include href="kbdgr/kbdgr.xml" />
+		<xi:include href="kbdgr/kbdgr.rbuild" />
 	</directory>
 	<directory name="kbdhe">
-		<xi:include href="kbdhe/kbdhe.xml" />
+		<xi:include href="kbdhe/kbdhe.rbuild" />
 	</directory>
 	<directory name="kbdheb">
-		<xi:include href="kbdheb/kbdheb.xml" />
+		<xi:include href="kbdheb/kbdheb.rbuild" />
 	</directory>
 	<directory name="kbdhu">
-		<xi:include href="kbdhu/kbdhu.xml" />
+		<xi:include href="kbdhu/kbdhu.rbuild" />
 	</directory>
 	<directory name="kbdru">
-		<xi:include href="kbdru/kbdru.xml" />
+		<xi:include href="kbdru/kbdru.rbuild" />
 	</directory>
 	<directory name="kbdse">
-		<xi:include href="kbdse/kbdse.xml" />
+		<xi:include href="kbdse/kbdse.rbuild" />
 	</directory>
 	<directory name="kbdsg">
-		<xi:include href="kbdsg/kbdsg.xml" />
+		<xi:include href="kbdsg/kbdsg.rbuild" />
 	</directory>
 	<directory name="kbdsk">
-		<xi:include href="kbdsk/kbdsk.xml" />
+		<xi:include href="kbdsk/kbdsk.rbuild" />
 	</directory>
 	<directory name="kbduk">
-		<xi:include href="kbduk/kbduk.xml" />
+		<xi:include href="kbduk/kbduk.rbuild" />
 	</directory>
 	<directory name="kbdus">
-		<xi:include href="kbdus/kbdus.xml" />
+		<xi:include href="kbdus/kbdus.rbuild" />
 	</directory>
 	<directory name="kbdbe">
-		<xi:include href="kbdbe/kbdbe.xml" />
+		<xi:include href="kbdbe/kbdbe.rbuild" />
 	</directory>
 	<directory name="kbdur">
-		<xi:include href="kbdur/kbdur.xml" />
+		<xi:include href="kbdur/kbdur.rbuild" />
 	</directory>
 	<directory name="kbdpo">
-		<xi:include href="kbdpo/kbdpo.xml" />
+		<xi:include href="kbdpo/kbdpo.rbuild" />
 	</directory>
 </group>

reactos/dll/win32/kernel32/kernel32.rbuild

@@ -135,5 +135,5 @@
 	<file>kernel32.rc</file>
 </module>
 <directory name="tests">
-	<xi:include href="tests/kernel32.xml" />
+	<xi:include href="tests/kernel32.rbuild" />
 </directory>

reactos/dll/win32/kernel32/tests/kernel32.rbuild

@@ -18,5 +18,5 @@
 	<linkerflag>-nostdlib</linkerflag>
 	<file>setup.c</file>
 	<file>CreateFile.c</file>
-	<xi:include href="stubs.xml" />
+	<xi:include href="stubs.rbuild" />
 </module>

reactos/dll/win32/shellext/shellext.rbuild

@@ -1,3 +1,3 @@
 <directory name="slayer">
-	<xi:include href="slayer/slayer.xml" />
+	<xi:include href="slayer/slayer.rbuild" />
 </directory>

reactos/dll/win32/winmm/winmm.rbuild

@@ -1,7 +1,33 @@
-<xi:include href="winmm.xml" />
+<group>
 <directory name="midimap">
-	<xi:include href="midimap/midimap.xml" />
+	<xi:include href="midimap/midimap.rbuild" />
 </directory>
 <directory name="wavemap">
-	<xi:include href="wavemap/wavemap.xml" />
+	<xi:include href="wavemap/wavemap.rbuild" />
 </directory> 
+<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true">
+	<importlibrary definition="winmm.spec.def" />
+	<include base="winmm">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>user32</library>
+	<file>driver.c</file>
+	<file>joystick.c</file>
+	<file>lolvldrv.c</file>
+	<file>mci.c</file>
+	<file>mmio.c</file>
+	<file>playsound.c</file>
+	<file>time.c</file>
+	<file>winmm.c</file>
+	<file>winmm_res.rc</file>
+	<file>winmm.spec</file>
+</module>
+</group>

reactos/drivers/base/directory.rbuild

@@ -0,0 +1,27 @@
+<directory name="beep">
+	<xi:include href="beep/beep.rbuild" />
+</directory>
+<directory name="blue">
+	<xi:include href="blue/blue.rbuild" />
+</directory>
+<directory name="green">
+	<xi:include href="green/green.rbuild" />
+</directory>
+<directory name="bootvid">
+	<xi:include href="bootvid/bootvid.rbuild" />
+</directory>
+<directory name="debugout">
+	<xi:include href="debugout/debugout.rbuild" />
+</directory>
+<directory name="null">
+	<xi:include href="null/null.rbuild" />
+</directory>
+<directory name="parallel">
+	<xi:include href="parallel/parallel.rbuild" />
+</directory>
+<directory name="ramdrv">
+	<xi:include href="ramdrv/ramdrv.rbuild" />
+</directory>
+<directory name="serial">
+	<xi:include href="serial/serial.rbuild" />
+</directory>

reactos/drivers/base/directory.xml

@@ -1,27 +0,0 @@
-<directory name="beep">
-	<xi:include href="beep/beep.xml" />
-</directory>
-<directory name="blue">
-	<xi:include href="blue/blue.xml" />
-</directory>
-<directory name="green">
-	<xi:include href="green/green.xml" />
-</directory>
-<directory name="bootvid">
-	<xi:include href="bootvid/bootvid.xml" />
-</directory>
-<directory name="debugout">
-	<xi:include href="debugout/debugout.xml" />
-</directory>
-<directory name="null">
-	<xi:include href="null/null.xml" />
-</directory>
-<directory name="parallel">
-	<xi:include href="parallel/parallel.xml" />
-</directory>
-<directory name="ramdrv">
-	<xi:include href="ramdrv/ramdrv.xml" />
-</directory>
-<directory name="serial">
-	<xi:include href="serial/serial.xml" />
-</directory>

reactos/drivers/bus/directory.rbuild

@@ -0,0 +1,12 @@
+<directory name="acpi">
+	<xi:include href="acpi/acpi.rbuild" />
+</directory>
+<directory name="isapnp">
+	<xi:include href="isapnp/isapnp.rbuild" />
+</directory>
+<directory name="pci">
+	<xi:include href="pci/pci.rbuild" />
+</directory>
+<directory name="serenum">
+	<xi:include href="serenum/serenum.rbuild" />
+</directory>

reactos/drivers/bus/directory.xml

@@ -1,12 +0,0 @@
-<directory name="acpi">
-	<xi:include href="acpi/acpi.xml" />
-</directory>
-<directory name="isapnp">
-	<xi:include href="isapnp/isapnp.xml" />
-</directory>
-<directory name="pci">
-	<xi:include href="pci/pci.xml" />
-</directory>
-<directory name="serenum">
-	<xi:include href="serenum/serenum.xml" />
-</directory>

reactos/drivers/drivers.rbuild

@@ -1,29 +1,29 @@
 <group>
 <directory name="base">
-	<xi:include href="base/directory.xml" />
+	<xi:include href="base/directory.rbuild" />
 </directory>
 <directory name="bus">
-	<xi:include href="bus/directory.xml" />
+	<xi:include href="bus/directory.rbuild" />
 </directory>
 <directory name="filesystems">
-	<xi:include href="filesystems/directory.xml" />
+	<xi:include href="filesystems/directory.rbuild" />
 </directory>
 <directory name="input">
-	<xi:include href="input/directory.xml" />
+	<xi:include href="input/directory.rbuild" />
 </directory>
 <directory name="multimedia">
-	<xi:include href="multimedia/directory.xml" />
+	<xi:include href="multimedia/directory.rbuild" />
 </directory>
 <directory name="network">
-	<xi:include href="network/directory.xml" />
+	<xi:include href="network/directory.rbuild" />
 </directory>
 <directory name="storage">
-	<xi:include href="storage/directory.xml" />
+	<xi:include href="storage/directory.rbuild" />
 </directory>
 <directory name="usb">
-	<xi:include href="usb/directory.xml" />
+	<xi:include href="usb/directory.rbuild" />
 </directory>
 <directory name="video">
-	<xi:include href="video/directory.xml" />
+	<xi:include href="video/directory.rbuild" />
 </directory>
 </group>

reactos/drivers/filesystems/directory.rbuild

@@ -0,0 +1,21 @@
+<directory name="cdfs">
+	<xi:include href="cdfs/cdfs.rbuild" />
+</directory>
+<directory name="fs_rec">
+	<xi:include href="fs_rec/fs_rec.rbuild" />
+</directory>
+<directory name="ms">
+	<xi:include href="ms/msfs.rbuild" />
+</directory>
+<directory name="mup">
+	<xi:include href="mup/mup.rbuild" />
+</directory>
+<directory name="np">
+	<xi:include href="np/npfs.rbuild" />
+</directory>
+<directory name="ntfs">
+	<xi:include href="ntfs/ntfs.rbuild" />
+</directory>
+<directory name="vfat">
+	<xi:include href="vfat/vfatfs.rbuild" />
+</directory>

reactos/drivers/filesystems/directory.xml

@@ -1,21 +0,0 @@
-<directory name="cdfs">
-	<xi:include href="cdfs/cdfs.xml" />
-</directory>
-<directory name="fs_rec">
-	<xi:include href="fs_rec/fs_rec.xml" />
-</directory>
-<directory name="ms">
-	<xi:include href="ms/msfs.xml" />
-</directory>
-<directory name="mup">
-	<xi:include href="mup/mup.xml" />
-</directory>
-<directory name="np">
-	<xi:include href="np/npfs.xml" />
-</directory>
-<directory name="ntfs">
-	<xi:include href="ntfs/ntfs.xml" />
-</directory>
-<directory name="vfat">
-	<xi:include href="vfat/vfatfs.xml" />
-</directory>