Internalize build options into config header.

src/engine/build.sh

@@ -162,14 +162,6 @@ case "$1" in
 esac
 BOOST_JAM_OPT_JAM="\
  -DNDEBUG \
- -DOPT_HEADER_CACHE_EXT \
- -DOPT_GRAPH_DEBUG_EXT \
- -DOPT_SEMAPHORE \
- -DOPT_AT_FILES \
- -DOPT_DEBUG_PROFILE \
- -DJAM_DEBUGGER \
- -DOPT_FIX_TARGET_VARIABLES_EXT \
- -DOPT_IMPROVED_PATIENCE_EXT \
  -DYYSTACKSIZE=5000 \
  -DYYINITDEPTH=5000 \
  -o b2"

src/engine/builtins.h

@@ -7,6 +7,7 @@
 #ifndef JAM_BUILTINS_H
 # define JAM_BUILTINS_H
 
+# include "config.h"
 # include "frames.h"
 
 /*

src/engine/class.h

@@ -5,6 +5,7 @@
 #ifndef CLASS_H_VP_2003_08_01
 #define CLASS_H_VP_2003_08_01
 
+#include "config.h"
 #include "lists.h"
 #include "frames.h"
 

src/engine/command.h

@@ -40,6 +40,7 @@
 #ifndef COMMAND_SW20111118_H
 #define COMMAND_SW20111118_H
 
+#include "config.h"
 #include "lists.h"
 #include "rules.h"
 #include "strings.h"

src/engine/compile.h

@@ -17,6 +17,7 @@
 #ifndef COMPILE_DWA20011022_H
 #define COMPILE_DWA20011022_H
 
+#include "config.h"
 #include "frames.h"
 #include "lists.h"
 #include "object.h"

src/engine/config.h

@@ -0,0 +1,20 @@
+#ifndef B2_CONFIG_H
+#define B2_CONFIG_H
+
+/*
+Copyright 2002-2018 Rene Rivera.
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+#define OPT_HEADER_CACHE_EXT 1
+#define OPT_GRAPH_DEBUG_EXT 1
+#define OPT_SEMAPHORE 1
+#define OPT_AT_FILES 1
+#define OPT_DEBUG_PROFILE 1
+#define JAM_DEBUGGER 1
+#define OPT_FIX_TARGET_VARIABLES_EXT 1
+#define OPT_IMPROVED_PATIENCE_EXT 1
+
+#endif

src/engine/config_toolset.bat

@@ -19,14 +19,6 @@ if "_%BOOST_JAM_TOOLSET%_" == "_intel-win32_" call :Config_INTEL_WIN32
 if "_%BOOST_JAM_TOOLSET%_" == "_mingw_" call :Config_MINGW
 set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DNT"
 set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DNDEBUG"
-set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DOPT_HEADER_CACHE_EXT"
-set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DOPT_GRAPH_DEBUG_EXT"
-set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DOPT_SEMAPHORE"
-set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DOPT_AT_FILES"
-set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DOPT_DEBUG_PROFILE"
-set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DJAM_DEBUGGER"
-set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DOPT_FIX_TARGET_VARIABLES_EXT"
-set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DOPT_IMPROVED_PATIENCE_EXT"
 set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DYYSTACKSIZE=5000"
 set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DYYINITDEPTH=5000"
 exit /b %errorlevel%

src/engine/constants.h

@@ -11,6 +11,7 @@
 #ifndef BOOST_JAM_CONSTANTS_H
 #define BOOST_JAM_CONSTANTS_H
 
+#include "config.h"
 #include "object.h"
 
 void constants_init( void );

src/engine/cwd.h

@@ -12,6 +12,7 @@
 #ifndef CWD_H
 #define CWD_H
 
+#include "config.h"
 #include "object.h"
 
 

src/engine/debug.h

@@ -8,6 +8,7 @@
 #ifndef BJAM_DEBUG_H
 #define BJAM_DEBUG_H
 
+#include "config.h"
 #include "constants.h"
 #include "object.h"
 

src/engine/debugger.h

@@ -8,6 +8,7 @@
 #ifndef DEBUGGER_SW20150314_H
 #define DEBUGGER_SW20150314_H
 
+#include "config.h"
 #include <setjmp.h>
 #include "object.h"
 #include "frames.h"

src/engine/execcmd.h

@@ -15,6 +15,7 @@
 #ifndef EXECCMD_H
 #define EXECCMD_H
 
+#include "config.h"
 #include "lists.h"
 #include "strings.h"
 #include "timestamp.h"

src/engine/filesys.h

@@ -17,6 +17,7 @@
 #ifndef FILESYS_DWA20011025_H
 #define FILESYS_DWA20011025_H
 
+#include "config.h"
 #include "hash.h"
 #include "lists.h"
 #include "object.h"

src/engine/frames.h

@@ -8,6 +8,7 @@
 #ifndef FRAMES_DWA20011021_H
 #define FRAMES_DWA20011021_H
 
+#include "config.h"
 #include "lists.h"
 #include "modules.h"
 #include "object.h"

src/engine/function.h

@@ -7,6 +7,7 @@
 #ifndef FUNCTION_SW20111123_H
 #define FUNCTION_SW20111123_H
 
+#include "config.h"
 #include "object.h"
 #include "frames.h"
 #include "lists.h"

src/engine/hash.h

@@ -11,6 +11,7 @@
 #ifndef BOOST_JAM_HASH_H
 #define BOOST_JAM_HASH_H
 
+#include "config.h"
 #include "object.h"
 
 /*

src/engine/hcache.c

@@ -25,6 +25,8 @@
  * @boundname@ timestamp_sec timestamp_nsec @file@ @file@ @file@ ...
  */
 
+#include "config.h"
+
 #ifdef OPT_HEADER_CACHE_EXT
 
 #include "jam.h"

src/engine/hcache.h

@@ -8,6 +8,7 @@
 #ifndef HCACHE_H
 #define HCACHE_H
 
+#include "config.h"
 #include "lists.h"
 #include "regexp.h"
 #include "rules.h"

src/engine/hdrmacro.h

@@ -12,6 +12,7 @@
 #ifndef HDRMACRO_SW20111118_H
 #define HDRMACRO_SW20111118_H
 
+#include "config.h"
 #include "object.h"
 #include "rules.h"
 

src/engine/headers.h

@@ -11,6 +11,7 @@
 #ifndef HEADERS_SW20111118_H
 #define HEADERS_SW20111118_H
 
+#include "config.h"
 #include "object.h"
 #include "rules.h"
 #include "regexp.h"

src/engine/jam.h

@@ -18,6 +18,8 @@
 #ifndef JAM_H_VP_2003_08_01
 #define JAM_H_VP_2003_08_01
 
+#include "config.h"
+
 #ifdef HAVE_PYTHON
 #include <Python.h>
 #endif

src/engine/lists.h

@@ -41,6 +41,7 @@
 #ifndef LISTS_DWA20011022_H
 #define LISTS_DWA20011022_H
 
+#include "config.h"
 #include "object.h"
 
 #ifdef HAVE_PYTHON

src/engine/make.h

@@ -11,6 +11,7 @@
 #ifndef MAKE_SW20111118_H
 #define MAKE_SW20111118_H
 
+#include "config.h"
 #include "lists.h"
 #include "object.h"
 #include "rules.h"

src/engine/mem.h

@@ -8,6 +8,8 @@
 #ifndef BJAM_MEM_H
 #define BJAM_MEM_H
 
+#include "config.h"
+
 /* Standard C memory allocation. */
 #include <stdlib.h>
 

src/engine/modules.h

@@ -6,6 +6,7 @@
 #ifndef MODULES_DWA10182001_H
 #define MODULES_DWA10182001_H
 
+#include "config.h"
 #include "lists.h"
 #include "object.h"
 

src/engine/native.h

@@ -7,6 +7,7 @@
 #ifndef NATIVE_H_VP_2003_12_09
 #define NATIVE_H_VP_2003_12_09
 
+#include "config.h"
 #include "function.h"
 #include "frames.h"
 #include "lists.h"

src/engine/object.h

@@ -11,6 +11,8 @@
 #ifndef BOOST_JAM_OBJECT_H
 #define BOOST_JAM_OBJECT_H
 
+#include "config.h"
+
 typedef struct _object OBJECT;
 
 OBJECT * object_new( char const * const );

src/engine/option.h

@@ -11,6 +11,8 @@
  *  \ -) "Command line option."
  */
 
+#include "config.h"
+
 typedef struct bjam_option
 {
     char flag;   /* filled in by getoption() */

src/engine/output.h

@@ -7,6 +7,7 @@
 #ifndef BJAM_OUTPUT_H
 #define BJAM_OUTPUT_H
 
+#include "config.h"
 #include "object.h"
 #include "timestamp.h"
 

src/engine/parse.h

@@ -17,6 +17,7 @@
 #ifndef PARSE_DWA20011020_H
 #define PARSE_DWA20011020_H
 
+#include "config.h"
 #include "frames.h"
 #include "lists.h"
 #include "modules.h"

src/engine/pathsys.h

@@ -21,6 +21,7 @@
 #ifndef PATHSYS_VP_20020211_H
 #define PATHSYS_VP_20020211_H
 
+#include "config.h"
 #include "object.h"
 #include "strings.h"
 

src/engine/regexp.h

@@ -7,6 +7,8 @@
 #ifndef REGEXP_DWA20011023_H
 #define REGEXP_DWA20011023_H
 
+#include "config.h"
+
 #define NSUBEXP  10
 typedef struct regexp {
     char const * startp[ NSUBEXP ];

src/engine/rules.h

@@ -29,6 +29,7 @@
 #ifndef RULES_DWA_20011020_H
 #define RULES_DWA_20011020_H
 
+#include "config.h"
 #include "function.h"
 #include "modules.h"
 #include "timestamp.h"

src/engine/scan.h

@@ -22,6 +22,7 @@
  * lists without quoting.
  */
 
+#include "config.h"
 #include "lists.h"
 #include "object.h"
 #include "parse.h"

src/engine/search.h

@@ -11,6 +11,7 @@
 #ifndef SEARCH_SW20111118_H
 #define SEARCH_SW20111118_H
 
+#include "config.h"
 #include "object.h"
 #include "timestamp.h"
 

src/engine/strings.h

@@ -8,6 +8,7 @@
 #ifndef STRINGS_DWA20011024_H
 #define STRINGS_DWA20011024_H
 
+#include "config.h"
 #include <stddef.h>
 
 typedef struct string

src/engine/subst.h

@@ -6,6 +6,7 @@
 #ifndef SUBST_JG20120722_H
 #define SUBST_JG20120722_H
 
+#include "config.h"
 #include "object.h"
 #include "regexp.h"
 

src/engine/timestamp.h

@@ -11,6 +11,7 @@
 #ifndef TIMESTAMP_H_SW_2011_11_18
 #define TIMESTAMP_H_SW_2011_11_18
 
+#include "config.h"
 #include "object.h"
 
 #ifdef OS_NT

src/engine/variable.h

@@ -11,6 +11,7 @@
 #ifndef VARIABLE_SW20111119_H
 #define VARIABLE_SW20111119_H
 
+#include "config.h"
 #include "lists.h"
 #include "object.h"