Wow, WriteConfigurationFile() in rbuild never worked since it was added in r13496...
authorColin Finck <colin@reactos.org>
Sun, 21 Sep 2008 13:00:40 +0000 (13:00 +0000)
committerColin Finck <colin@reactos.org>
Sun, 21 Sep 2008 13:00:40 +0000 (13:00 +0000)
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.

svn path=/trunk/; revision=36373

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

index cf382b9..4d3a6b5 100644 (file)
@@ -6,7 +6,6 @@
  * COPYRIGHT:       Copyright 2005 Art Yerkes <ayerkes@speakeasy.net>
  */
 
-#include <roscfg.h>
 #include <winsock2.h>
 #include <dhcpcsdk.h>
 #include <time.h>
index 358c021..8b13451 100644 (file)
@@ -19,7 +19,6 @@
  * tcpip.sys
  */
 
-#include <roscfg.h>
 #include <stdio.h>
 
 #include "iphlpapi_private.h"
index ede4e1e..3fe222d 100644 (file)
@@ -7,8 +7,6 @@
 #ifndef __UPCALL_H
 #define __UPCALL_H
 
-#include <ws2_32.h>
-
 BOOL
 WSPAPI
 WPUCloseEvent(
index 8b0e9a2..f495fa1 100644 (file)
@@ -8,7 +8,6 @@
 #define __WS2_32_H
 
 #define WIN32_NO_STATUS
-#include <roscfg.h>
 #include <winsock2.h>
 #include <ws2spi.h>
 #include <ws2tcpip.h>
index c9e07cb..ea4e2f3 100644 (file)
@@ -8,7 +8,6 @@
  *   CSH 01/09-2000 Created
  */
 
-#include <roscfg.h>
 #include <w32api.h>
 #include <ws2_32.h>
 #include <catalog.h>
index ec3384b..f1b68fe 100644 (file)
@@ -8,7 +8,6 @@
  *   CSH 01/09-2000 Created
  */
 
-#include <roscfg.h>
 #include <w32api.h>
 #include <ws2_32.h>
 #include <catalog.h>
index c5bee36..dc358ca 100644 (file)
@@ -7,7 +7,6 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#include <roscfg.h>
 #include <ws2_32.h>
 #include <catalog.h>
 #include <handle.h>
index 669ef72..bfe9934 100644 (file)
@@ -7,7 +7,6 @@
  * REVISIONS:
  *   CSH 27/08-2000 Created
  */
-#include <roscfg.h>
 #include <ne2000.h>
 #include <debug.h>
 
index 44142e3..f84779d 100644 (file)
@@ -7,7 +7,6 @@
  * REVISIONS:
  *   CSH 27/08-2000 Created
  */
-#include <roscfg.h>
 #include <ne2000.h>
 #include <debug.h>
 
index f152c32..31c1479 100644 (file)
@@ -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"
index 5906ced..82e15ce 100644 (file)
@@ -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>
index c753fb4..c7824b3 100644 (file)
@@ -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
index 0971f50..c3d1c00 100644 (file)
@@ -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>
index 685d590..900dec1 100644 (file)
@@ -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>
index 73fe483..45abea5 100644 (file)
@@ -10,7 +10,6 @@
 
 /* INCLUDES ******************************************************************/
 
-//#include <roscfg.h>
 #include <ndk/asm.h>
 .intel_syntax noprefix
 
index 59a8911..8476be6 100644 (file)
@@ -1,4 +1,3 @@
-#include <roscfg.h>
 #include <ndk/asm.h>
 
 #define AP_MAGIC (0x12481020)
index 0592dc2..ea63bf5 100644 (file)
@@ -250,69 +250,6 @@ Project::ResolveProperties ( const string& s ) const
        return s2;
 }
 
-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 ()
 {
index 03fdc9e..d81fd3b 100644 (file)
@@ -329,7 +329,6 @@ main ( int argc, char** argv )
                        project,
                        configuration ) );
 
-               project.WriteConfigurationFile ();
                project.ExecuteInvocations ();
                project.GetBackend().Process();
 
index 2870754..be8dd7e 100644 (file)
@@ -243,7 +243,6 @@ public:
        ~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 @@ public:
        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,