[cfinck] 36373: Wow, WriteConfigurationFile() in rbuild never worked since it was added in r13496 over 3 years ago! :-) Thus, the generated "roscfg.h" was always empty, but for whatever reason modules started to include it. I removed all dependencies on this file and the function itself from rbuild.

Author: cfinck
Date: Sun Sep 21 08:00:40 2008
New Revision: 36373

URL: http://svn.reactos.org/svn/reactos?rev=36373&view=rev
Log:
Wow, WriteConfigurationFile() in rbuild never worked since it was added in r13496 over 3
years ago! :-)

Thus, the generated "roscfg.h" was always empty, but for whatever reason modules
started to include it.
I removed all dependencies on this file and the function itself from rbuild.

Modified:
    trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c
    trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c
    trunk/reactos/dll/win32/ws2_32/include/upcall.h
    trunk/reactos/dll/win32/ws2_32/include/ws2_32.h
    trunk/reactos/dll/win32/ws2_32/misc/dllmain.c
    trunk/reactos/dll/win32/ws2_32/misc/sndrcv.c
    trunk/reactos/dll/win32/ws2_32/misc/upcall.c
    trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c
    trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c
    trunk/reactos/drivers/network/lan/include/precomp.h
    trunk/reactos/drivers/network/tcpip/include/precomp.h
    trunk/reactos/drivers/network/tcpip/tests/tests/ipreceive.c
    trunk/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c
    trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h
    trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h
    trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c
    trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S
    trunk/reactos/ntoskrnl/ke/powerpc/main_asm.S
    trunk/reactos/tools/rbuild/project.cpp
    trunk/reactos/tools/rbuild/rbuild.cpp
    trunk/reactos/tools/rbuild/rbuild.h

Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv…
==============================================================================
--- trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -6,7 +6,6 @@
  * COPYRIGHT:       Copyright 2005 Art Yerkes <ayerkes(a)speakeasy.net>
  */
 
-#include <roscfg.h>
 #include <winsock2.h>
 #include <dhcpcsdk.h>
 #include <time.h>

Modified: trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ipstats…
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] Sun Sep 21 08:00:40
2008
@@ -19,7 +19,6 @@
  * tcpip.sys
  */
 
-#include <roscfg.h>
 #include <stdio.h>
 
 #include "iphlpapi_private.h"

Modified: trunk/reactos/dll/win32/ws2_32/include/upcall.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -6,8 +6,6 @@
  */
 #ifndef __UPCALL_H
 #define __UPCALL_H
-
-#include <ws2_32.h>
 
 BOOL
 WSPAPI

Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -8,7 +8,6 @@
 #define __WS2_32_H
 
 #define WIN32_NO_STATUS
-#include <roscfg.h>
 #include <winsock2.h>
 #include <ws2spi.h>
 #include <ws2tcpip.h>

Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -8,7 +8,6 @@
  *   CSH 01/09-2000 Created
  */
 
-#include <roscfg.h>
 #include <w32api.h>
 #include <ws2_32.h>
 #include <catalog.h>

Modified: trunk/reactos/dll/win32/ws2_32/misc/sndrcv.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/sndr…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/sndrcv.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/sndrcv.c [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -8,7 +8,6 @@
  *   CSH 01/09-2000 Created
  */
 
-#include <roscfg.h>
 #include <w32api.h>
 #include <ws2_32.h>
 #include <catalog.h>

Modified: trunk/reactos/dll/win32/ws2_32/misc/upcall.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/upca…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -7,7 +7,6 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#include <roscfg.h>
 #include <ws2_32.h>
 #include <catalog.h>
 #include <handle.h>

Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/…
==============================================================================
--- trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Sun Sep 21 08:00:40
2008
@@ -7,7 +7,6 @@
  * REVISIONS:
  *   CSH 27/08-2000 Created
  */
-#include <roscfg.h>
 #include <ne2000.h>
 #include <debug.h>
 

Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/…
==============================================================================
--- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Sun Sep 21 08:00:40
2008
@@ -7,7 +7,6 @@
  * REVISIONS:
  *   CSH 27/08-2000 Created
  */
-#include <roscfg.h>
 #include <ne2000.h>
 #include <debug.h>
 

Modified: trunk/reactos/drivers/network/lan/include/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/lan/includ…
==============================================================================
--- trunk/reactos/drivers/network/lan/include/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/lan/include/precomp.h [iso-8859-1] Sun Sep 21 08:00:40
2008
@@ -4,7 +4,6 @@
 #include <limits.h>
 #include <ntddk.h>
 #include <ndis.h>
-#include <roscfg.h>
 #include <debug.h>
 #include <pseh.h>
 #include "net_lan.h"

Modified: trunk/reactos/drivers/network/tcpip/include/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] Sun Sep 21 08:00:40
2008
@@ -1,11 +1,9 @@
-#include <roscfg.h>
 #include <limits.h>
 #include <ntddk.h>
 #include <ntifs.h>
 #include <tdi.h>
 #include <tdistat.h>
 #include <../recmutex/recmutex.h>
-#include <roscfg.h>
 #include <tcpip.h>
 #include <loopback.h>
 #include <ip.h>

Modified: trunk/reactos/drivers/network/tcpip/tests/tests/ipreceive.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/test…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tests/tests/ipreceive.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tests/tests/ipreceive.c [iso-8859-1] Sun Sep 21
08:00:40 2008
@@ -1,4 +1,3 @@
-#include <roscfg.h>
 #include "../../include/precomp.h"
 #include "regtests.h"
 

Modified: trunk/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/test…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c [iso-8859-1]
(original)
+++ trunk/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c [iso-8859-1] Sun
Sep 21 08:00:40 2008
@@ -1,4 +1,3 @@
-#include <roscfg.h>
 #include "../../include/precomp.h"
 #include "regtests.h"
 

Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h [iso-8859-1] Sun Sep 21
08:00:40 2008
@@ -33,9 +33,6 @@
 #define OSK_DEBUG_CPOINT    0x00800000
 #define OSK_DEBUG_ULTRA     0xFFFFFFFF
 
-#ifndef _MSC_VER
-#include <roscfg.h>
-#endif/*_MSC_VER*/
 #include <oskittypes.h>
 
 #ifdef DBG

Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] Sun Sep 21 08:00:40
2008
@@ -5,9 +5,6 @@
 #include <netinet/in.h>
 #endif
 
-#ifndef _MSC_VER
-#include <roscfg.h>
-#endif/*_MSC_VER*/
 #ifdef KERNEL
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] Sun Sep 21
08:00:40 2008
@@ -33,9 +33,6 @@
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
  */
 
-#ifndef _MSC_VER
-#include <roscfg.h>
-#endif/*_MSC_VER*/
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>

Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -10,7 +10,6 @@
 
 /* INCLUDES ******************************************************************/
 
-//#include <roscfg.h>
 #include <ndk/asm.h>
 .intel_syntax noprefix
 

Modified: trunk/reactos/ntoskrnl/ke/powerpc/main_asm.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/main_a…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/powerpc/main_asm.S [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/powerpc/main_asm.S [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -1,4 +1,3 @@
-#include <roscfg.h>
 #include <ndk/asm.h>
 
 #define AP_MAGIC (0x12481020)

Modified: trunk/reactos/tools/rbuild/project.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r…
==============================================================================
--- trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -251,69 +251,6 @@
 }
 
 void
-Project::SetConfigurationOption ( char* s,
-                                  string name,
-                                  string alternativeName )
-{
-	const Property* property = LookupProperty ( name );
-	if ( property != NULL && property->value.length () > 0 )
-	{
-		s = s + sprintf ( s,
-		                  "#define %s=%s\n",
-		                  property->name.c_str (),
-		                  property->value.c_str () );
-	}
-	else if ( property != NULL )
-	{
-		s = s + sprintf ( s,
-		                  "#define %s\n",
-		                  property->name.c_str () );
-	}
-	else if ( !alternativeName.empty()  )
-	{
-		s = s + sprintf ( s,
-		                  "#define %s\n",
-		                  alternativeName.c_str () );
-	}
-}
-
-void
-Project::SetConfigurationOption ( char* s,
-	                              string name )
-{
-	SetConfigurationOption ( s, name, "" );
-}
-
-void
-Project::WriteConfigurationFile ()
-{
-	char* buf;
-	char* s;
-
-	buf = (char*) malloc ( 10*1024 );
-	if ( buf == NULL )
-		throw OutOfMemoryException ();
-
-	s = buf;
-	s = s + sprintf ( s, "/* Automatically generated. " );
-	s = s + sprintf ( s, "Edit config.xml to change configuration */\n" );
-	s = s + sprintf ( s, "#ifndef __INCLUDE_CONFIG_H\n" );
-	s = s + sprintf ( s, "#define __INCLUDE_CONFIG_H\n" );
-
-	SetConfigurationOption ( s, "ARCH" );
-	SetConfigurationOption ( s, "OPTIMIZED" );
-	SetConfigurationOption ( s, "MP", "UP");
-	SetConfigurationOption ( s, "ACPI" );
-	SetConfigurationOption ( s, "_3GB" );
-
-	s = s + sprintf ( s, "#endif /* __INCLUDE_CONFIG_H */\n" );
-
-	FileSupportCode::WriteIfChanged ( buf, Environment::GetIntermediatePath() + sSep +
"include" + sSep + "roscfg.h" );
-
-	free ( buf );
-}
-
-void
 Project::ExecuteInvocations ()
 {
 	for ( size_t i = 0; i < modules.size (); i++ )

Modified: trunk/reactos/tools/rbuild/rbuild.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?re…
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/rbuild.cpp [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -329,7 +329,6 @@
 			project,
 			configuration ) );
 
-		project.WriteConfigurationFile ();
 		project.ExecuteInvocations ();
 		project.GetBackend().Process();
 

Modified: trunk/reactos/tools/rbuild/rbuild.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Sun Sep 21 08:00:40 2008
@@ -243,7 +243,6 @@
 	~Project ();
 	void SetBackend ( Backend* backend ) { _backend = backend; }
 	Backend& GetBackend() { return *_backend; }
-	void WriteConfigurationFile ();
 	void ExecuteInvocations ();
 
 	void ProcessXML ( const std::string& path );
@@ -254,11 +253,6 @@
 	const Property* LookupProperty ( const std::string& name ) const;
 private:
 	std::string ResolveNextProperty ( const std::string& s ) const;
-	void SetConfigurationOption ( char* s,
-	                              std::string name,
-	                              std::string alternativeName );
-	void SetConfigurationOption ( char* s,
-	                              std::string name );
 	void ReadXml ();
 	void ProcessXMLSubElement ( const XMLElement& e,
 	                            const std::string& path,