Changeset 28765

Timestamp:

12/02/08 21:02:28 (5 weeks ago)

Author:

bonefish

Message:

Introduced rules UserBuildConfigRulePostBuildTargets,
UserBuildConfigRulePreImage, and UserBuildConfigRulePostImage which will be
invoked at different points in the build system execution. They can be
overridden in UserBuildConfig, thus allowing for executing user code at
those points.

Location:

haiku/trunk

Files:

• Jamrules (modified) (1 diff)
• build/jam/HaikuImage (modified) (2 diffs)
• build/jam/UserBuildConfig.ReadMe (modified) (3 diffs)

haiku/trunk/Jamrules

@@ -46 +46 @@
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) BuildSetup ] ;
 
+# Declare no-op user-overridable build rules.
+rule UserBuildConfigRulePostBuildTargets        { }
+rule UserBuildConfigRulePreImage                        { }
+rule UserBuildConfigRulePostImage                       { }
+
 # Include UserBuildConfig.
 {

haiku/trunk/build/jam/HaikuImage

@@ -607 +607 @@
 
 
+# Execute pre-image user config rules.
+UserBuildConfigRulePreImage     ;
+
 # Set image name and directory defaults and locate the image.
 HAIKU_IMAGE_NAME ?= $(HAIKU_DEFAULT_IMAGE_NAME) ;
@@ -717 +720 @@
 NotFile haiku-vmware-image ;
 Depends haiku-vmware-image : $(HAIKU_VMWARE_IMAGE) ;
+
+# Execute post-image user config rules.
+UserBuildConfigRulePostImage ;

haiku/trunk/build/jam/UserBuildConfig.ReadMe

@@ -13 +13 @@
 
 
-# Adding timezone and keymap settings
-AddSymlinkToHaikuImage home config settings
-        : /boot/beos/etc/timezones/Europe/Paris : timezone ;
-
-AddFilesToHaikuImage home config settings : <keymap>US-International
-        : Key_map ;
-
-
 # Adjusting Build Variables
 
@@ -99 +91 @@
 # Make a symlink to home/config/bin/crash.
 AddSymlinkToHaikuImage home config bin : /beos/bin/crashing_app : crash ;
+
+# Add timezone and keymap settings.
+AddSymlinkToHaikuImage home config settings
+        : /boot/beos/etc/timezones/Europe/Paris : timezone ;
+AddFilesToHaikuImage home config settings : <keymap>US-International : Key_map ;
 
 # Adds the source directories src/kits/storage and src/tests/servers/debug
@@ -285 +282 @@
 # name to be used recursively.
 DeferredSubInclude HAIKU_TOP src 3rdparty myproject : Jamfile.haiku : local ;
+
+# The following rules can be overriden to do things at different points of
+# the build system execution by jam (note: we're talking about execution of
+# Jamfiles, not the build actions they define):
+#
+# UserBuildConfigRulePostBuildTargets:
+#       Executed after the complete Jamfile tree has been processed. I.e. all build
+#       targets are known and located at this point.
+# UserBuildConfigRulePreImage:
+#       Executed after the contents of the Haiku image has been defined, but before
+#       the scripts generating the images are defined.
+# UserBuildConfigRulePostImage:
+#       Executed after the Haiku image build target has been fully defined.
+#
+# E.g. making use of the fact that all targets have already been located when
+# UserBuildConfigRulePostBuildTargets is called, we can print the directory
+# where the StyledEdit executable will be generated.
+rule UserBuildConfigRulePostBuildTargets
+{
+        Echo "StyledEdit will appear here:" [ on StyledEdit return $(LOCATE) ] ;
+}