Changeset 24680

Timestamp:

03/30/08 11:34:30 (8 months ago)

Author:

bonefish

Message:

* Added JAMFILE to the config variables.
* Added additional parameters to DeferredSubInclude. It's now possible

to specify an alternative Jamfile name.

* Added DeferredSubInclude example to UserBuildConfig.ReadMe showing the

new feature.

* Moved ExecuteDeferredSubIncludes in the root Jamfile before the

inclusion of HaikuImage, NetBootArchive etc., so that targets defined
in the subdirectories are already known there.

Location:

haiku/trunk

Files:

• Jamfile (modified) (2 diffs)
• build/jam/ConfigRules (modified) (1 diff)
• build/jam/MiscRules (modified) (1 diff)
• build/jam/UserBuildConfig.ReadMe (modified) (2 diffs)

haiku/trunk/Jamfile

@@ -146 +146 @@
 }
 
+# Perform deferred SubIncludes.
+ExecuteDeferredSubIncludes ;
+
 # reset subdir
 SubDir HAIKU_TOP ;
@@ -154 +157 @@
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) FloppyBootImage ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootImage ] ;
-
-# Perform deferred SubIncludes.
-ExecuteDeferredSubIncludes ;

haiku/trunk/build/jam/ConfigRules

@@ -164 +164 @@
 # Some config variables that should be set up automatically for subdirs.
 AUTO_SET_UP_CONFIG_VARIABLES +=
-        CCFLAGS C++FLAGS DEBUG DEFINES HDRS LINKFLAGS OPTIM OPTIMIZE
+        CCFLAGS C++FLAGS DEBUG DEFINES HDRS JAMFILE LINKFLAGS OPTIM OPTIMIZE
         SYSHDRS WARNINGS
 ;

haiku/trunk/build/jam/MiscRules

@@ -91 +91 @@
 HAIKU_DEFERRED_SUB_INCLUDES = ;
 
-rule DeferredSubInclude params
-{
-        # DeferredSubInclude <subdir tokens> ;
-        #
-        # Takes the same parameter as SubInclude. The the subdirectory referred to
-        # by <subdir tokens> will be included when ExecuteDeferredSubIncludes is
-        # invoked, i.e. at the end of the root Jamfile.
+rule DeferredSubInclude params : jamfile : scope
+{
+        # DeferredSubInclude <subdir tokens> [ : <jamfile name>  [ : <scope> ] ] ;
+        #
+        # Takes the same directory tokens parameter as SubInclude plus an optional
+        # alternative Jamfile name. The the subdirectory referred to by
+        # <subdir tokens> will be included when ExecuteDeferredSubIncludes is
+        # invoked, i.e. at the end of the root Jamfile. The <jamfile name> parameter
+        # specifies the name of the Jamfile to include. By default it is "Jamfile".
+        # The <scope> parameter can be "global" (default) or "local", specifying
+        # whether the alternative Jamfile name shall also be used for subdirectories.
 
         HAIKU_DEFERRED_SUB_INCLUDES += "/" $(params) ;
+        if $(jamfile) {
+                SetConfigVar JAMFILE : $(params) : $(jamfile) : $(scope) ;
+        }
 }
 

haiku/trunk/build/jam/UserBuildConfig.ReadMe

@@ -159 +159 @@
 
 
-# Optimizing Jamfile Parsing Times
+# Optimizing Jamfile Parsing Times / Third Party Inclusion
 
 # Setting this variable will prevent the root Jamfile to include the Jamfile
@@ -173 +173 @@
         userlandfs ;
 
+# Schedule src/3rdparty/myproject/Jamfile.haiku for later inclusion. The "local"
+# parameter specifies that the alternative Jamfile name shall not be used for
+# any subdirectory of the given directory (i.e. "Jamfile" will be used as
+# usual). Omitting this parameter or specifying "global" will cause the given
+# name to be used recursively.
+DeferredSubInclude HAIKU_TOP src 3rdparty myproject : Jamfile.haiku : local ;
+
 
 # Copy the posix test suite onto the image (or on the installation) into