Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Wow, WriteConfigurationFile() in rbuild never worked since it was added in r13496 over 3 years ago! :-)

Browse source 
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
This commit is contained in:
Colin Finck 2008-09-21 13:00:40 +00:00
parent 0f1167cbc0
commit 0fa81bc0da
21 changed files with 0 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/dhcpcsvc/dhcpcsvc.c
View file

@ -6,7 +6,6 @@
* COPYRIGHT: Copyright 2005 Art Yerkes <ayerkes@speakeasy.net> * COPYRIGHT: Copyright 2005 Art Yerkes <ayerkes@speakeasy.net>
*/ */
#include <roscfg.h>
#include <winsock2.h> #include <winsock2.h>
#include <dhcpcsdk.h> #include <dhcpcsdk.h>
#include <time.h> #include <time.h>

1
reactos/dll/win32/iphlpapi/ipstats_reactos.c
View file

@ -19,7 +19,6 @@
* tcpip.sys * tcpip.sys
*/ */
#include <roscfg.h>
#include <stdio.h> #include <stdio.h>
#include "iphlpapi_private.h" #include "iphlpapi_private.h"

2
reactos/dll/win32/ws2_32/include/upcall.h
View file

@ -7,8 +7,6 @@
#ifndef __UPCALL_H #ifndef __UPCALL_H
#define __UPCALL_H #define __UPCALL_H
#include <ws2_32.h>
BOOL BOOL
WSPAPI WSPAPI
WPUCloseEvent( WPUCloseEvent(

1
reactos/dll/win32/ws2_32/include/ws2_32.h
View file

@ -8,7 +8,6 @@
#define __WS2_32_H #define __WS2_32_H
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#include <roscfg.h>
#include <winsock2.h> #include <winsock2.h>
#include <ws2spi.h> #include <ws2spi.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>

1
reactos/dll/win32/ws2_32/misc/dllmain.c
View file

@ -8,7 +8,6 @@
* CSH 01/09-2000 Created * CSH 01/09-2000 Created
*/ */
#include <roscfg.h>
#include <w32api.h> #include <w32api.h>
#include <ws2_32.h> #include <ws2_32.h>
#include <catalog.h> #include <catalog.h>

1
reactos/dll/win32/ws2_32/misc/sndrcv.c
View file

@ -8,7 +8,6 @@
* CSH 01/09-2000 Created * CSH 01/09-2000 Created
*/ */
#include <roscfg.h>
#include <w32api.h> #include <w32api.h>
#include <ws2_32.h> #include <ws2_32.h>
#include <catalog.h> #include <catalog.h>

1
reactos/dll/win32/ws2_32/misc/upcall.c
View file

@ -7,7 +7,6 @@
* REVISIONS: * REVISIONS:
* CSH 01/09-2000 Created * CSH 01/09-2000 Created
*/ */
#include <roscfg.h>
#include <ws2_32.h> #include <ws2_32.h>
#include <catalog.h> #include <catalog.h>
#include <handle.h> #include <handle.h>

1
reactos/drivers/network/dd/ne2000/ne2000/8390.c
View file

@ -7,7 +7,6 @@
* REVISIONS: * REVISIONS:
* CSH 27/08-2000 Created * CSH 27/08-2000 Created
*/ */
#include <roscfg.h>
#include <ne2000.h> #include <ne2000.h>
#include <debug.h> #include <debug.h>

1
reactos/drivers/network/dd/ne2000/ne2000/main.c
View file

@ -7,7 +7,6 @@
* REVISIONS: * REVISIONS:
* CSH 27/08-2000 Created * CSH 27/08-2000 Created
*/ */
#include <roscfg.h>
#include <ne2000.h> #include <ne2000.h>
#include <debug.h> #include <debug.h>

1
reactos/drivers/network/lan/include/precomp.h
View file

@ -4,7 +4,6 @@
#include <limits.h> #include <limits.h>
#include <ntddk.h> #include <ntddk.h>
#include <ndis.h> #include <ndis.h>
#include <roscfg.h>
#include <debug.h> #include <debug.h>
#include <pseh.h> #include <pseh.h>
#include "net_lan.h" #include "net_lan.h"

2
reactos/drivers/network/tcpip/include/precomp.h
View file

@ -1,11 +1,9 @@
#include <roscfg.h>
#include <limits.h> #include <limits.h>
#include <ntddk.h> #include <ntddk.h>
#include <ntifs.h> #include <ntifs.h>
#include <tdi.h> #include <tdi.h>
#include <tdistat.h> #include <tdistat.h>
#include <../recmutex/recmutex.h> #include <../recmutex/recmutex.h>
#include <roscfg.h>
#include <tcpip.h> #include <tcpip.h>
#include <loopback.h> #include <loopback.h>
#include <ip.h> #include <ip.h>

1
reactos/drivers/network/tcpip/tests/tests/ipreceive.c
View file

@ -1,4 +1,3 @@
#include <roscfg.h>
#include "../../include/precomp.h" #include "../../include/precomp.h"
#include "regtests.h" #include "regtests.h"

1
reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c
View file

@ -1,4 +1,3 @@
#include <roscfg.h>
#include "../../include/precomp.h" #include "../../include/precomp.h"
#include "regtests.h" #include "regtests.h"

3
reactos/lib/drivers/oskittcp/include/oskitdebug.h
View file

@ -33,9 +33,6 @@
#define OSK_DEBUG_CPOINT 0x00800000 #define OSK_DEBUG_CPOINT 0x00800000
#define OSK_DEBUG_ULTRA 0xFFFFFFFF #define OSK_DEBUG_ULTRA 0xFFFFFFFF
#ifndef _MSC_VER
#include <roscfg.h>
#endif/*_MSC_VER*/
#include <oskittypes.h> #include <oskittypes.h>
#ifdef DBG #ifdef DBG

3
reactos/lib/drivers/oskittcp/include/oskittcp.h
View file

@ -5,9 +5,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#ifndef _MSC_VER
#include <roscfg.h>
#endif/*_MSC_VER*/
#ifdef KERNEL #ifdef KERNEL
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>

3
reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c
View file

@ -33,9 +33,6 @@
* @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94
*/ */
#ifndef _MSC_VER
#include <roscfg.h>
#endif/*_MSC_VER*/
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/proc.h> #include <sys/proc.h>

1
reactos/ntoskrnl/ke/i386/ctxswitch.S
View file

@ -10,7 +10,6 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
//#include <roscfg.h>
#include <ndk/asm.h> #include <ndk/asm.h>
.intel_syntax noprefix .intel_syntax noprefix

1
reactos/ntoskrnl/ke/powerpc/main_asm.S
View file

@ -1,4 +1,3 @@
#include <roscfg.h>
#include <ndk/asm.h> #include <ndk/asm.h>
#define AP_MAGIC (0x12481020) #define AP_MAGIC (0x12481020)

63
reactos/tools/rbuild/project.cpp
View file

@ -250,69 +250,6 @@ Project::ResolveProperties ( const string& s ) const
return s2; 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 void
Project::ExecuteInvocations () Project::ExecuteInvocations ()
{ {

1
reactos/tools/rbuild/rbuild.cpp
View file

@ -329,7 +329,6 @@ main ( int argc, char** argv )
project, project,
configuration ) ); configuration ) );
project.WriteConfigurationFile ();
project.ExecuteInvocations (); project.ExecuteInvocations ();
project.GetBackend().Process(); project.GetBackend().Process();

6
reactos/tools/rbuild/rbuild.h
View file

@ -243,7 +243,6 @@ public:
~Project (); ~Project ();
void SetBackend ( Backend* backend ) { _backend = backend; } void SetBackend ( Backend* backend ) { _backend = backend; }
Backend& GetBackend() { return *_backend; } Backend& GetBackend() { return *_backend; }
void WriteConfigurationFile ();
void ExecuteInvocations (); void ExecuteInvocations ();
void ProcessXML ( const std::string& path ); void ProcessXML ( const std::string& path );
@ -254,11 +253,6 @@ public:
const Property* LookupProperty ( const std::string& name ) const; const Property* LookupProperty ( const std::string& name ) const;
private: private:
std::string ResolveNextProperty ( const std::string& s ) const; 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 ReadXml ();
void ProcessXMLSubElement ( const XMLElement& e, void ProcessXMLSubElement ( const XMLElement& e,
const std::string& path, const std::string& path,