Build configurations shouldn't be done in svn controlled files, so I

finally created a solution to avoid that: Header files that contain
configuration settings (and nothing else) go to build/config_headers.
To change settings, create a directory build/user_config_headers (which
is ignored by svn), copy the respective header there and modify it at
your leisure. Currently only tracing_config.h has been moved to the new
location, but more files will follow eventually. It is also recommended
to move optional macro definitions in Jamfile (as for BFS) to a config
header instead; the build system will then automatically rebuild on
changes.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24611 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/jam/BuildSetup

@@ -113,6 +113,10 @@ HAIKU_BONE_COMPATIBLE_PLATFORMS = haiku bone dano haiku_host ;
 HAIKU_DANO_COMPATIBLE_PLATFORMS = haiku dano haiku_host ;
 HAIKU_HAIKU_COMPATIBLE_PLATFORMS = haiku haiku_host ;
 
+# configuration header directories
+HAIKU_CONFIG_HEADERS = [ FDirName $(HAIKU_TOP) build user_config_headers ]
+	[ FDirName $(HAIKU_TOP) build config_headers ] ;
+
 
 #pragma mark -
 

build/jam/OverriddenJamRules

@@ -69,7 +69,8 @@ rule Object
 		# yacc, lex, etc) are located in $(LOCATE_TARGET), possibly
 		# different from $(SEARCH_SOURCE).
 
-		headers = $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) ;
+		headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
+			$(HDRS) ;
 		sysHeaders = $(SUBDIRSYSHDRS) $(SYSHDRS) ;
 		defines = $(DEFINES) ;
 

headers/private/kernel/tracing.h

@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 
-#include <tracing_config.h>
+#include "tracing_config.h"
 
 
 struct trace_entry {

src/kits/app/Message.cpp

@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <tracing_config.h>
+#include "tracing_config.h"
 	// kernel tracing configuration
 
 #define DEBUG_FUNCTION_ENTER	//debug_printf("thread: 0x%x; this: 0x%08x; header: 0x%08x; fields: 0x%08x; data: 0x%08x; line: %04ld; func: %s\n", find_thread(NULL), this, fHeader, fFields, fData, __LINE__, __PRETTY_FUNCTION__);

src/system/kernel/arch/x86/arch_interrupts.S

@@ -12,7 +12,8 @@
 #include <arch/x86/descriptors.h>
 #include <commpage.h>
 #include <thread_types.h>
-#include <tracing_config.h>
+
+#include "tracing_config.h"
 
 #include "asm_offsets.h"
 #include "syscall_numbers.h"

src/system/libroot/posix/malloc/wrapper.cpp

@@ -24,13 +24,13 @@
 #include "processheap.h"
 #include "arch-specific.h"
 
-#include <tracing_config.h>
-
 #include <image.h>
 
 #include <errno.h>
 #include <string.h>
 
+#include "tracing_config.h"
+
 using namespace BPrivate;
 
 

src/system/runtime_loader/elf.cpp

@@ -24,10 +24,11 @@
 #include <runtime_loader.h>
 #include <sem.h>
 #include <syscalls.h>
-#include <tracing_config.h>
 #include <user_runtime.h>
 #include <vm_types.h>
 
+#include "tracing_config.h"
+
 
 //#define TRACE_RLD
 #ifdef TRACE_RLD