[ros-diffs] [hpoussin] 29685: Activate define override check in rbuild Cleanup some .rbuild files Set __REACTOS__ as overridable ; it should be removed after next winesync

Author: hpoussin
Date: Fri Oct 19 19:27:44 2007
New Revision: 29685

URL: http://svn.reactos.org/svn/reactos?rev=29685&view=rev
Log:
Activate define override check in rbuild
Cleanup some .rbuild files
Set __REACTOS__ as overridable ; it should be removed after next winesync

Modified:
    trunk/reactos/ReactOS-generic.rbuild
    trunk/reactos/ReactOS-ppc.rbuild
    trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
    trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
    trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
    trunk/reactos/include/reactos/idl/idl.rbuild
    trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
    trunk/reactos/lib/rtl/rtl.rbuild
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp

Modified: trunk/reactos/ReactOS-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev…
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild (original)
+++ trunk/reactos/ReactOS-generic.rbuild Fri Oct 19 19:27:44 2007
@@ -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>
 

Modified: trunk/reactos/ReactOS-ppc.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=296…
==============================================================================
--- trunk/reactos/ReactOS-ppc.rbuild (original)
+++ trunk/reactos/ReactOS-ppc.rbuild Fri Oct 19 19:27:44 2007
@@ -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>

Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdo…
==============================================================================
--- trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild (original)
+++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Fri Oct 19 19:27:44 2007
@@ -2,7 +2,6 @@
 <module name="std_ole_v2" type="embeddedtypelib">
 	<include base="std_ole_v2">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
@@ -15,7 +14,6 @@
 	<include base="stdole2">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<dependency>std_ole_v2</dependency>
-	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild Fri Oct 19 19:27:44
2007
@@ -12,7 +12,6 @@
 
 	<define name="__USE_W32API" />
 	<define name="_NTDDK_" />
-	<define name="DBG" />
 	<define name="PC_NO_IMPORTS" />
 
 	<include base="portcls">../include</include>

Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild (original)
+++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild Fri Oct 19 19:27:44 2007
@@ -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>

Modified: trunk/reactos/include/reactos/idl/idl.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb…
==============================================================================
--- trunk/reactos/include/reactos/idl/idl.rbuild (original)
+++ trunk/reactos/include/reactos/idl/idl.rbuild Fri Oct 19 19:27:44 2007
@@ -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>

Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r…
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild (original)
+++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Fri Oct 19 19:27:44 2007
@@ -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">

Modified: trunk/reactos/lib/rtl/rtl.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=296…
==============================================================================
--- trunk/reactos/lib/rtl/rtl.rbuild (original)
+++ trunk/reactos/lib/rtl/rtl.rbuild Fri Oct 19 19:27:44 2007
@@ -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>

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Oct 19 19:27:44 2007
@@ -816,18 +816,16 @@
 		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;
 		}