[ros-diffs] [mpiulachs] 32446: - Use the new 'package' module type.

Author: mpiulachs
Date: Fri Feb 22 02:27:21 2008
New Revision: 32446

URL: http://svn.reactos.org/svn/reactos?rev=32446&view=rev
Log:
- Use the new 'package' module type.

Modified:
    branches/rbuild/reactos/base/shell/explorer/explorer.rbuild
    branches/rbuild/reactos/media/fonts/fonts.rbuild
    branches/rbuild/reactos/media/inf/inf.rbuild

Modified: branches/rbuild/reactos/base/shell/explorer/explorer.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/shell/explo…
==============================================================================
--- branches/rbuild/reactos/base/shell/explorer/explorer.rbuild (original)
+++ branches/rbuild/reactos/base/shell/explorer/explorer.rbuild Fri Feb 22 02:27:21 2008
@@ -70,8 +70,10 @@
 	<file>explorer.cpp</file>
 	<file>i386-stub-win32.c</file>
 	<file>explorer.rc</file>
+
+	<installfile
installbase=".">explorer-cfg-template.xml</installfile>
 </module>
-<installfile
installbase=".">explorer-cfg-template.xml</installfile>
+
 <directory name="notifyhook">
 	<xi:include href="notifyhook/notifyhook.rbuild" />
 </directory>

Modified: branches/rbuild/reactos/media/fonts/fonts.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/media/fonts/font…
==============================================================================
--- branches/rbuild/reactos/media/fonts/fonts.rbuild (original)
+++ branches/rbuild/reactos/media/fonts/fonts.rbuild Fri Feb 22 02:27:21 2008
@@ -1,55 +1,63 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-	<installfile installbase="media/fonts">DejaVuSans-Bold.ttf
</installfile>
-	<installfile
installbase="media/fonts">DejaVuSans.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSans-BoldOblique.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSansCondensed.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSans-ExtraLight.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSansMono.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSansMono-Bold.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSansMono-Oblique.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSans-Oblique.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerif.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile>
-	<installfile
installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile>
-	<installfile installbase="media/fonts">c0419bt_.ttf</installfile>
-	<installfile installbase="media/fonts">c0582bt_.ttf</installfile>
-	<installfile installbase="media/fonts">c0583bt_.ttf</installfile>
-	<installfile installbase="media/fonts">c0611bt_.ttf</installfile>
-	<installfile installbase="media/fonts">c0632bt_.ttf</installfile>
-	<installfile installbase="media/fonts">c0633bt_.ttf</installfile>
-	<installfile installbase="media/fonts">c0648bt_.ttf</installfile>
-	<installfile installbase="media/fonts">c0649bt_.ttf</installfile>
-	<installfile installbase="media/fonts">cour.ttf</installfile>
-	<installfile installbase="media/fonts">courb.ttf</installfile>
-	<installfile installbase="media/fonts">courbi.ttf</installfile>
-	<installfile installbase="media/fonts">helb____.ttf</installfile>
-	<installfile installbase="media/fonts">Marlett.ttf</installfile>
-	<installfile installbase="media/fonts">timr____.ttf</installfile>
-	<installfile installbase="media/fonts">UTB_____.ttf</installfile>
-	<installfile installbase="media/fonts">UTBI____.ttf</installfile>
-	<installfile installbase="media/fonts">UTI_____.ttf</installfile>
-	<installfile installbase="media/fonts">UTRG____.ttf</installfile>
-	<installfile installbase="media/fonts">Vera.ttf</installfile>
-	<installfile installbase="media/fonts">VeraBd.ttf</installfile>
-	<installfile installbase="media/fonts">VeraBI.ttf</installfile>
-	<installfile installbase="media/fonts">VeraIt.ttf</installfile>
-	<installfile installbase="media/fonts">VeraMoBd.ttf</installfile>
-	<installfile installbase="media/fonts">VeraMoBI.ttf</installfile>
-	<installfile installbase="media/fonts">VeraMoIt.ttf</installfile>
-	<installfile installbase="media/fonts">VeraMono.ttf</installfile>
-	<installfile installbase="media/fonts">VeraSe.ttf</installfile>
-	<installfile installbase="media/fonts">VeraSeBd.ttf</installfile>
+	<module name="dejavufonts" type="package">
+		<installfile installbase="media/fonts">DejaVuSans-Bold.ttf
</installfile>
+		<installfile
installbase="media/fonts">DejaVuSans.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSans-BoldOblique.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSansCondensed.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSans-ExtraLight.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSansMono.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSansMono-Bold.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSansMono-Oblique.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSans-Oblique.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerif.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile>
+		<installfile
installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile>
+	</module>
+
+	<module name="standardfonts" type="package">
+		<installfile
installbase="media/fonts">c0419bt_.ttf</installfile>
+		<installfile
installbase="media/fonts">c0582bt_.ttf</installfile>
+		<installfile
installbase="media/fonts">c0583bt_.ttf</installfile>
+		<installfile
installbase="media/fonts">c0611bt_.ttf</installfile>
+		<installfile
installbase="media/fonts">c0632bt_.ttf</installfile>
+		<installfile
installbase="media/fonts">c0633bt_.ttf</installfile>
+		<installfile
installbase="media/fonts">c0648bt_.ttf</installfile>
+		<installfile
installbase="media/fonts">c0649bt_.ttf</installfile>
+		<installfile installbase="media/fonts">cour.ttf</installfile>
+		<installfile installbase="media/fonts">courb.ttf</installfile>
+		<installfile installbase="media/fonts">courbi.ttf</installfile>
+		<installfile
installbase="media/fonts">helb____.ttf</installfile>
+		<installfile installbase="media/fonts">Marlett.ttf</installfile>
+		<installfile
installbase="media/fonts">timr____.ttf</installfile>
+		<installfile
installbase="media/fonts">UTB_____.ttf</installfile>
+		<installfile
installbase="media/fonts">UTBI____.ttf</installfile>
+		<installfile
installbase="media/fonts">UTI_____.ttf</installfile>
+		<installfile
installbase="media/fonts">UTRG____.ttf</installfile>
+	</module>
+
+	<module name="verafonts" type="package">
+		<installfile installbase="media/fonts">Vera.ttf</installfile>
+		<installfile installbase="media/fonts">VeraBd.ttf</installfile>
+		<installfile installbase="media/fonts">VeraBI.ttf</installfile>
+		<installfile installbase="media/fonts">VeraIt.ttf</installfile>
+		<installfile
installbase="media/fonts">VeraMoBd.ttf</installfile>
+		<installfile
installbase="media/fonts">VeraMoBI.ttf</installfile>
+		<installfile
installbase="media/fonts">VeraMoIt.ttf</installfile>
+		<installfile
installbase="media/fonts">VeraMono.ttf</installfile>
+		<installfile installbase="media/fonts">VeraSe.ttf</installfile>
+		<installfile
installbase="media/fonts">VeraSeBd.ttf</installfile>
+	</module>
 </group>

Modified: branches/rbuild/reactos/media/inf/inf.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/media/inf/inf.rb…
==============================================================================
--- branches/rbuild/reactos/media/inf/inf.rbuild (original)
+++ branches/rbuild/reactos/media/inf/inf.rbuild Fri Feb 22 02:27:21 2008
@@ -1,23 +1,25 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-	<installfile installbase="inf">acpi.inf</installfile>
-	<installfile installbase="inf">cdrom.inf</installfile>
-	<installfile installbase="inf">display.inf</installfile>
-	<installfile installbase="inf">hdc.inf</installfile>
-	<installfile installbase="inf">keyboard.inf</installfile>
-	<installfile installbase="inf">layout.inf</installfile>
-	<installfile installbase="inf">machine.inf</installfile>
-	<installfile installbase="inf">msmouse.inf</installfile>
-	<installfile installbase="inf">NET_NIC.inf</installfile>
-	<installfile installbase="inf">netamd.inf</installfile>
-	<installfile installbase="inf">netisa.inf</installfile>
-	<installfile installbase="inf">netrtpnt.inf</installfile>
-	<installfile installbase="inf">nettcpip.inf</installfile>
-	<installfile installbase="inf">ports.inf</installfile>
-	<installfile installbase="inf">scsi.inf</installfile>
+	<module name="hardwareinfs" type="package">
+		<installfile installbase="inf">acpi.inf</installfile>
+		<installfile installbase="inf">cdrom.inf</installfile>
+		<installfile installbase="inf">display.inf</installfile>
+		<installfile installbase="inf">hdc.inf</installfile>
+		<installfile installbase="inf">keyboard.inf</installfile>
+		<installfile installbase="inf">layout.inf</installfile>
+		<installfile installbase="inf">machine.inf</installfile>
+		<installfile installbase="inf">msmouse.inf</installfile>
+		<installfile installbase="inf">NET_NIC.inf</installfile>
+		<installfile installbase="inf">netamd.inf</installfile>
+		<installfile installbase="inf">netisa.inf</installfile>
+		<installfile installbase="inf">netrtpnt.inf</installfile>
+		<installfile installbase="inf">nettcpip.inf</installfile>
+		<installfile installbase="inf">ports.inf</installfile>
+		<installfile installbase="inf">scsi.inf</installfile>
+		<installfile installbase="inf">usbport.inf</installfile>
+		<installfile installbase="inf">usbstor.inf</installfile>
+		<installfile installbase="inf">xboxdisp.inf</installfile>
+	</module>
 	<installfile installbase="inf"
root="output">syssetup.inf</installfile>
-	<installfile installbase="inf">usbport.inf</installfile>
-	<installfile installbase="inf">usbstor.inf</installfile>
-	<installfile installbase="inf">xboxdisp.inf</installfile>
-</group>
+</group>