Samuel Serapion
authorAleksey Bragin <aleksey@reactos.org>
Sun, 18 Apr 2010 18:20:33 +0000 (18:20 +0000)
committerAleksey Bragin <aleksey@reactos.org>
Sun, 18 Apr 2010 18:20:33 +0000 (18:20 +0000)
- Assorted rbuild syntax fixes.

svn path=/trunk/; revision=46927

19 files changed:
reactos/base/applications/cmdutils/reg/reg.rbuild
reactos/base/applications/downloader/downloader.rbuild
reactos/base/applications/fontview/fontview.rbuild
reactos/base/applications/kbswitch/kbswitch.rbuild
reactos/base/applications/magnify/magnify.rbuild
reactos/base/applications/mplay32/mplay32.rbuild
reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild
reactos/base/applications/rapps/rapps.rbuild
reactos/base/applications/winver/winver.rbuild
reactos/base/services/rpcss/rpcss.rbuild
reactos/base/services/telnetd/telnetd.rbuild
reactos/base/services/tftpd/tftpd.rbuild
reactos/base/system/runonce/runonce.rbuild
reactos/boot/bootdata/bootcd/bootcd.rbuild
reactos/boot/bootdata/livecd/livecd.rbuild
reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
reactos/dll/win32/actxprxy/actxprxy.rbuild
reactos/dll/win32/msacm32/msacm32.rbuild
reactos/drivers/bus/acpi/acpi.rbuild

index ce9a744..ac33ef4 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="reg" type="win32cui" installbase="system32" installname="reg.exe" unicode="true">
        <include base="reg">.</include>
        <redefine name="_WIN32_WINNT">0x600</redefine>
index 9ea43dc..b45df06 100644 (file)
@@ -1,25 +1,26 @@
 <?xml version="1.0"?>
-<group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <installfile installbase="system32">downloader.xml</installfile>
-       <module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes">
-               <include base="downloader">.</include>
-               <include base="expat">.</include>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+<installfile installbase="system32">downloader.xml</installfile>
+<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes">
+       <include base="downloader">.</include>
+       <include base="expat">.</include>
 
-               <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>
+       <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>
+       <file>main.c</file>
+       <file>xml.c</file>
+       <file>download.c</file>
+       <file>downloader.rc</file>
+</module>
 </group>
index 8ceda78..f5cad36 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="fontview" type="win32gui" installbase="system32" installname="fontview.exe">
        <include base="fontview">.</include>
        <library>gdi32</library>
index 2eed0b2..11ea960 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="kbswitch" type="win32gui" installbase="system32" installname="kbswitch.exe" unicode="yes">
        <include base="kbswitch">.</include>
index 995437d..8c06ce8 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe">
        <include base="magnify">.</include>
        <library>user32</library>
index c472e6f..77003d9 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mplay32" type="win32gui" installbase="system32" installname="mplay32.exe" unicode="yes">
        <include base="mplay32">.</include>
        <library>advapi32</library>
index 367c19e..cb23e1f 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" unicode="yes">
        <include base="eventvwr">.</include>
        <library>user32</library>
@@ -8,4 +8,3 @@
        <file>eventvwr.c</file>
        <file>eventvwr.rc</file>
 </module>
-</rbuild>
index 066b3ba..bc83f3a 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="rapps" type="win32gui" installbase="system32" installname="rapps.exe" unicode="yes">
        <include base="ReactOS">include/reactos</include>
index 89ff51c..4f24a71 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="winver" type="win32gui" installbase="system32" installname="winver.exe" unicode="yes">
        <include base="winver">.</include>
        <library>shell32</library>
index 04e42f8..95b29e8 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe" unicode="yes">
        <include base="rpcss">.</include>
index 8ccb81d..1b17bfc 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="telnetd" type="win32cui" installbase="system32" installname="telnetd.exe" unicode="no">
        <include base="reactos"></include>
        <include base="telnetd">..</include>
index be34bb7..0008cfb 100644 (file)
@@ -1,11 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="tftpd" type="win32cui" installbase="system32" installname="tftpd.exe" allowwarnings="true" unicode="no">
        <include base="reactos"></include>
        <include base="telnetd">..</include>
-
        <library>ntdll</library>
        <library>advapi32</library>
        <library>ws2_32</library>
        <library>wine</library>
-
        <file>tftpd.cpp</file>
 </module>
index 950580d..9dba766 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="runonce" type="win32gui" installbase="system32" installname="runonce.exe" unicode="yes">
        <include base="runonce">.</include>
        <library>advapi32</library>
index 471a7f4..f84fa71 100644 (file)
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<if property="ARCH" value="i386>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+<if property="ARCH" value="i386">
        <module name="bootcd" type="iso" output="ReactOS.iso">
                <bootsector>isoboot</bootsector>
        </module>
 </if>
-<ifnot property="ARCH" value="i386>
+<ifnot property="ARCH" value="i386">
        <module name="bootcd" type="iso" output="ReactOS-$(ARCH).iso">
                <bootsector>isoboot</bootsector>
        </module>
 </ifnot>
+</group>
index e92deca..8a04d12 100644 (file)
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<if property="ARCH" value="i386>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+<if property="ARCH" value="i386">
        <module name="livecd" type="liveiso" output="ReactOS-LiveCD.iso">
                <bootsector>isoboot</bootsector>
        </module>
 </if>
-<ifnot property="ARCH" value="i386>
+<ifnot property="ARCH" value="i386">
        <module name="livecd" type="liveiso" output="ReactOS-LiveCD-$(ARCH).iso">
                <bootsector>isoboot</bootsector>
        </module>
 </ifnot>
+</group>
index 2b8a8b2..6aa231c 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE directory SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="freeldr_arch" type="objectlibrary" crt="static">
        <include base="freeldr_base">include</include>
        <include base="freeldr_base">cache</include>
index f5272b5..c8b28ca 100644 (file)
@@ -31,7 +31,6 @@
        <file>actxprxy_ocmm.idl</file>
        <file>actxprxy_servprov.idl</file>
        <!-- file>actxprxy_shobjidl.idl</file -->
-       <file>actxprxy_urlhist.idl
-</file>
+       <file>actxprxy_urlhist.idl</file>
 </module>
 </group>
index df9cb03..b6f802e 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes">
        <importlibrary definition="msacm32.spec" />
        <include base="msacm32">.</include>
index c3e5b7d..334cdfc 100644 (file)
@@ -10,7 +10,7 @@
 <directory name="compbatt">
        <xi:include href="compbatt/compbatt.rbuild" />
 </directory>
-</group>
+
 
 <module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" allowwarnings="true">
        <bootstrap installbase="$(CDOUTPUT)" />
@@ -36,3 +36,4 @@
        <file>buspdo.c</file>
        <file>main.c</file>
 </module>
+</group>