Activate define override check in rbuild

Cleanup some .rbuild files
Set __REACTOS__ as overridable ; it should be removed after next winesync

svn path=/trunk/; revision=29685

diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild
index 215e42b..75195ed 100644 (file)
--- a/reactos/ReactOS-generic.rbuild
+++ b/reactos/ReactOS-generic.rbuild
@@ -3,17 +3,17 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <xi:include href="baseaddress.rbuild" />
 
-       <define name="__REACTOS__" />
+       <define name="__REACTOS__" overridable="true" />
        <if property="MP" value="1">
-               <define name="CONFIG_SMP" value="1" />
+               <define name="CONFIG_SMP">1</define>
        </if>
        <if property="DBG" value="1">
-               <define name="DBG" value="1" />
+               <define name="DBG">1</define>
                <define name="_SEH_ENABLE_TRACE" />
                <property name="DBG_OR_KDBG" value="true" />
        </if>
        <if property="KDBG" value="1">
-               <define name="KDBG" value="1" />
+               <define name="KDBG">1</define>
                <property name="DBG_OR_KDBG" value="true" />
        </if>
 

diff --git a/reactos/ReactOS-ppc.rbuild b/reactos/ReactOS-ppc.rbuild
index f2d920b..c92e417 100644 (file)
--- a/reactos/ReactOS-ppc.rbuild
+++ b/reactos/ReactOS-ppc.rbuild
@@ -16,19 +16,19 @@
        <define name="_M_PPC" />
        <define name="_PPC_" />
        <define name="__PowerPC__" />
-       <define name="stdcall" empty="true" />
-       <define name="__stdcall__" empty="true" />
-       <define name="fastcall" empty="true" />
-       <define name="cdecl" empty="true" />
-       <define name="__cdecl__" empty="true" />
-       <define name="dllimport" empty="true" />
-       <define name="WORDS_BIGENDIAN" empty="true" />
-       <define name="__MSVCRT__" empty="true" />
+       <define name="stdcall"/>
+       <define name="__stdcall__"/>
+       <define name="fastcall"/>
+       <define name="cdecl"/>
+       <define name="__cdecl__"/>
+       <define name="dllimport"/>
+       <define name="WORDS_BIGENDIAN"/>
+       <define name="__MSVCRT__"/>
        <define name="__NO_CTYPE_INLINES" />
        <!-- <define name="__DECLSPEC_SUPPORTED" /> -->
        <define name="__MINGW_IMPORT">extern</define>
-       <define name="_CRTIMP" empty="true" />
-       <define name="'__declspec(x)'" empty="true" />
+       <define name="_CRTIMP"/>
+       <define name="'__declspec(x)'"/>
        <compilerflag>-fshort-wchar</compilerflag>
        <compilerflag>-fsigned-char</compilerflag>
        <compilerflag>-mfull-toc</compilerflag>

diff --git a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
index 10480e1..eac000d 100644 (file)
--- a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
+++ b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
@@ -2,7 +2,6 @@
 <module name="std_ole_v2" type="embeddedtypelib">\r
        <include base="std_ole_v2">.</include>\r
        <include base="ReactOS">include/reactos/wine</include>\r
-       <define name="__REACTOS__" />\r
        <define name="__WINESRC__" />\r
        <define name="__USE_W32API" />\r
        <define name="_WIN32_IE">0x600</define>\r
@@ -15,7 +14,6 @@
        <include base="stdole2">.</include>\r
        <include base="ReactOS">include/reactos/wine</include>\r
        <dependency>std_ole_v2</dependency>\r
-       <define name="__REACTOS__" />\r
        <define name="__WINESRC__" />\r
        <define name="__USE_W32API" />\r
        <define name="_WIN32_IE">0x600</define>\r

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
index b880268..fc163c0 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
+++ b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
@@ -12,7 +12,6 @@
 
        <define name="__USE_W32API" />
        <define name="_NTDDK_" />
-       <define name="DBG" />
        <define name="PC_NO_IMPORTS" />
 
        <include base="portcls">../include</include>

diff --git a/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild b/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
index 9a7220b..669a24b 100644 (file)
--- a/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
+++ b/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
@@ -14,7 +14,6 @@
        <include base="mpu401">..</include>
        <library>ntoskrnl</library>
        <library>portcls</library>
-       <define name="DBG" />
        <define name="__USE_W32API" />
        <!--file>mpu401.rc</file-->
        <file>adapter.cpp</file>

diff --git a/reactos/include/reactos/idl/idl.rbuild b/reactos/include/reactos/idl/idl.rbuild
index 519307e..7d9bf6b 100644 (file)
--- a/reactos/include/reactos/idl/idl.rbuild
+++ b/reactos/include/reactos/idl/idl.rbuild
@@ -4,49 +4,41 @@
 <module name="pnp_server" type="rpcserver">
        <include base="ReactOS">.</include>
        <include base="ReactOS">w32api/include</include>
-       <define name="_X86_" />
        <file>pnp.idl</file>
 </module>
 <module name="pnp_client" type="rpcclient">
        <include base="ReactOS">.</include>
        <include base="ReactOS">w32api/include</include>
-       <define name="_X86_" />
        <file>pnp.idl</file>
 </module>
 <module name="scm_server" type="rpcserver">
        <include base="ReactOS">.</include>
        <include base="ReactOS">w32api/include</include>
-       <define name="_X86_" />
        <file switches="--oldnames">svcctl.idl</file>
 </module>
 <module name="scm_client" type="rpcclient">
        <include base="ReactOS">.</include>
        <include base="ReactOS">w32api/include</include>
-       <define name="_X86_" />
        <file switches="--oldnames">svcctl.idl</file>
 </module>
 <module name="eventlog_server" type="rpcserver">
        <include base="ReactOS">.</include>
        <include base="ReactOS">w32api/include</include>
-       <define name="_X86_" />
        <file switches="--oldnames">eventlogrpc.idl</file>
 </module>
 <module name="eventlog_client" type="rpcclient" >
        <include base="ReactOS">.</include>
        <include base="ReactOS">w32api/include</include>
-       <define name="_X86_" />
        <file switches="--oldnames">eventlogrpc.idl</file>
 </module>
 <module name="lsa_server" type="rpcserver">
        <include base="ReactOS">.</include>
        <include base="ReactOS">w32api/include</include>
-       <define name="_X86_" />
        <file switches="--oldnames">lsa.idl</file>
 </module>
 <module name="lsa_client" type="rpcclient">
        <include base="ReactOS">.</include>
        <include base="ReactOS">w32api/include</include>
-       <define name="_X86_" />
        <file switches="--oldnames">lsa.idl</file>
 </module>
 </group>

diff --git a/reactos/lib/3rdparty/mingw/mingw.rbuild b/reactos/lib/3rdparty/mingw/mingw.rbuild
index 70f3c8e..3f6e2c7 100644 (file)
--- a/reactos/lib/3rdparty/mingw/mingw.rbuild
+++ b/reactos/lib/3rdparty/mingw/mingw.rbuild
@@ -20,7 +20,7 @@
        <file>wcscmpi.c</file>
        <file>_wgetopt.c</file>
        <if property="ARCH" value="i386">
-           <file>pseudo-reloc.c</file>
+               <file>pseudo-reloc.c</file>
        </if>
 </module>
 <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true">

diff --git a/reactos/lib/rtl/rtl.rbuild b/reactos/lib/rtl/rtl.rbuild
index 4d8f452..a052219 100644 (file)
--- a/reactos/lib/rtl/rtl.rbuild
+++ b/reactos/lib/rtl/rtl.rbuild
@@ -25,8 +25,8 @@
                <file>debug.c</file>
                <file>except.c</file>
                <file>interlocked.c</file>
-                <file>rtlmem.s</file>
-                <file>rtlswap.s</file>
+               <file>rtlmem.s</file>
+               <file>rtlswap.s</file>
                <file>thread.c</file>
        </directory>
        </if>

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index e133918..d9e5286 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -816,18 +816,16 @@ MingwModuleHandler::GenerateMacro (
                const Define& define = *data.defines[i];
                if ( used_defs && used_defs->find ( define.name ) != used_defs->end () )
                {
-#if 0 /* FIXME: activate */
                        if ( !define.overridable )
                        {
                                throw InvalidOperationException ( __FILE__,
                                                                  __LINE__,
-                                                                 "Invalid override of define '%s' in '%s'",
+                                                                 "Invalid override of define '%s' in module '%s'",
                                                                  define.name.c_str (),
                                                                  module.name.c_str () );
                        }
-#endif
                        if ( backend->configuration.Verbose )
-                               printf("%s define overridden in '%s' module\n",
+                               printf("Define '%s' overridden in module '%s'\n",
                                        define.name.c_str (), module.name.c_str () );
                        continue;
                }