[ros-diffs] [fireball] 46927: Samuel Serapion - Assorted rbuild syntax fixes.
fireball at svn.reactos.org
fireball at svn.reactos.org
Sun Apr 18 20:20:33 CEST 2010
Author: fireball
Date: Sun Apr 18 20:20:33 2010
New Revision: 46927
URL: http://svn.reactos.org/svn/reactos?rev=46927&view=rev
Log:
Samuel Serapion
- Assorted rbuild syntax fixes.
Modified:
trunk/reactos/base/applications/cmdutils/reg/reg.rbuild
trunk/reactos/base/applications/downloader/downloader.rbuild
trunk/reactos/base/applications/fontview/fontview.rbuild
trunk/reactos/base/applications/kbswitch/kbswitch.rbuild
trunk/reactos/base/applications/magnify/magnify.rbuild
trunk/reactos/base/applications/mplay32/mplay32.rbuild
trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild
trunk/reactos/base/applications/rapps/rapps.rbuild
trunk/reactos/base/applications/winver/winver.rbuild
trunk/reactos/base/services/rpcss/rpcss.rbuild
trunk/reactos/base/services/telnetd/telnetd.rbuild
trunk/reactos/base/services/tftpd/tftpd.rbuild
trunk/reactos/base/system/runonce/runonce.rbuild
trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild
trunk/reactos/boot/bootdata/livecd/livecd.rbuild
trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild
trunk/reactos/dll/win32/msacm32/msacm32.rbuild
trunk/reactos/drivers/bus/acpi/acpi.rbuild
Modified: trunk/reactos/base/applications/cmdutils/reg/reg.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/reg/reg.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/reg.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/reg.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/applications/downloader/downloader.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/downloader/downloader.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/applications/downloader/downloader.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/downloader/downloader.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/applications/fontview/fontview.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/fontview.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/applications/fontview/fontview.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/fontview.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/applications/kbswitch/kbswitch.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch/kbswitch.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/applications/kbswitch/kbswitch.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/kbswitch/kbswitch.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/applications/magnify/magnify.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/magnify.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/applications/magnify/magnify.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/magnify/magnify.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/applications/mplay32/mplay32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/mplay32.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/applications/mplay32/mplay32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/mplay32.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/applications/rapps/rapps.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rapps.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/applications/rapps/rapps.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/rapps.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/applications/winver/winver.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/winver.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/applications/winver/winver.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winver/winver.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/services/telnetd/telnetd.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/telnetd.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/services/tftpd/tftpd.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/services/tftpd/tftpd.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/services/tftpd/tftpd.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/base/system/runonce/runonce.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/runonce.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/base/system/runonce/runonce.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/system/runonce/runonce.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/boot/bootdata/livecd/livecd.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd/livecd.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/livecd/livecd.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/livecd/livecd.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/dll/win32/msacm32/msacm32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rbuild?rev=46927&r1=46926&r2=46927&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] Sun Apr 18 20:20:33 2010
@@ -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>
More information about the Ros-diffs
mailing list