* When updating all targets, symlinks and directories are now also recreated.

* Removed superfluous white space.


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

build/jam/ImageRules

@@ -138,6 +138,19 @@ rule FilterContainerUpdateTargets targets : filterVariable
 	return $(filteredTargets) ;
 }
 
+
+rule IncludeAllTargetsInContainer container
+{
+	local filterVar
+		= [ on $(container) return $(HAIKU_INCLUDE_IN_CONTAINER_VAR) ] ;
+	if $(filterVar) {
+		return $($(filterVar)) ;
+	}
+
+	return ;
+}
+
+
 rule AddFilesToContainer container : directoryTokens : targets : destName
 {
 	# AddFilesToContainer <container> : <directoryTokens> : <targets>
@@ -149,7 +162,8 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
 
 	# If the image shall only be updated, we filter out all targets not marked
 	# accordingly.
-	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ] {
+	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
+		&& ! [ IncludeAllTargetsInContainer $(container) ] {
 		local filterVar
 			= [ on $(container) return $(HAIKU_INCLUDE_IN_CONTAINER_VAR) ] ;
 		if $(filterVar) {
@@ -198,7 +212,8 @@ rule AddSymlinkToContainer container : directoryTokens : linkTarget : linkName
 	#
 
 	# If the image shall only be updated, we don't add any symlinks.
-	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ] {
+	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
+		&& ! [ IncludeAllTargetsInContainer $(container) ] {
 		return ;
 	}
 
@@ -238,6 +253,7 @@ rule CopyDirectoryToContainer container : directoryTokens : sourceDirectory
 
 	# If the image shall only be updated, we don't copy any directories
 	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
+			&& ! [ IncludeAllTargetsInContainer $(container) ]
 			&& ! $(alwaysUpdate) {
 		return ;
 	}
@@ -279,7 +295,8 @@ rule AddDriversToContainer container : relativeDirectoryTokens : targets
 		: $(targets) ;
 
 	# If the image shall only be updated, we don't add any symlinks.
-	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ] {
+	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
+		&& ! [ IncludeAllTargetsInContainer $(container) ] {
 		return ;
 	}
 
@@ -316,7 +333,8 @@ rule AddBootModuleSymlinksToContainer container : targets
 	#
 
 	# If the image shall only be updated, we don't add any symlinks.
-	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ] {
+	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
+		&& ! [ IncludeAllTargetsInContainer $(container) ] {
 		return ;
 	}
 
@@ -369,7 +387,8 @@ rule CreateContainerMakeDirectoriesScript container : script
 
 	# If the image shall only be updated, we don't create directories.
 	if $(dirsToCreate)
-		&& ! [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ] {
+		&& ( ! [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
+			|| [ IncludeAllTargetsInContainer $(container) ] ) {
 		Depends $(scriptBody) : $(dirsToCreate) ;
 		CreateContainerMakeDirectoriesScript1 $(scriptBody) : $(dirsToCreate) ;
 
@@ -492,22 +511,26 @@ rule CreateContainerCopyFilesScript container : script
 	}
 }
 
+
 actions piecemeal AppendToContainerCopyFilesScript bind OUTPUT_SCRIPT
 {
 	echo \$cp "\"\${sPrefix}$(2)\"" "\"\${tPrefix}$(TARGET_DIR)\"" >> $(OUTPUT_SCRIPT)
 }
 
+
 actions AppendToContainerCopyFilesScriptSingleFile
 {
 	echo \$cp "\"\${sPrefix}$(2[2])\"" \
 		"\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" >> $(2[1])
 }
 
+
 actions AddSymlinkToContainerCopyFilesScript
 {
 	echo \$ln -sfn "\"$(SYMLINK_TARGET)\"" "\"\${tPrefix}$(1:G=)\"" >> $(2[1])
 }
 
+
 actions AddDirectoryToContainerCopyFilesScript
 {
 	echo \$cp -r $(EXCLUDE_PATTERNS) "\"\${sPrefix}$(SOURCE_DIRECTORY)/.\"" \