From 795f1571b3c63189b712359612ae07e6f42ae77f Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 15 Nov 2018 21:20:24 -0500 Subject: [PATCH] Move data/image_directories to src/data/directory_attrs. These data files are used in the generation of build targets, so moving them to src/data alongside the package_infos & etc. makes more sense. They don't seem to be activated properly though (I added some tracing to try and figure out why they aren't used but haven't gotten to the bottom of that yet.) --- build/jam/ImageRules | 5 ++++- .../home-config-settings-printers-preview.rdef | 0 .../home-config-settings-printers-save-as-pdf.rdef | 0 3 files changed, 4 insertions(+), 1 deletion(-) rename {data/image_directories => src/data/directory_attrs}/home-config-settings-printers-preview.rdef (100%) rename {data/image_directories => src/data/directory_attrs}/home-config-settings-printers-save-as-pdf.rdef (100%) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index b77862855f..d7c4471afd 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -142,7 +142,7 @@ rule AddDirectoryToContainer container : directoryTokens : attributeFiles if $(attributeFiles) { SEARCH on $(attributeFiles) - += [ FDirName $(HAIKU_TOP) data image_directories ] ; + += [ FDirName $(HAIKU_TOP) src data directory_attrs ] ; ATTRIBUTE_FILES on $(dir) += $(attributeFiles) ; } @@ -655,6 +655,9 @@ rule CreateContainerMakeDirectoriesScript container : script Depends $(script) : $(dummyTarget) ; serializationDependency = $(dummyTarget) ; + Echo $(dummyTarget) + $(initScript) $(attributeFile) ; + AppendToContainerMakeDirectoriesScriptAttributes $(dummyTarget) : $(initScript) $(attributeFile) ; } diff --git a/data/image_directories/home-config-settings-printers-preview.rdef b/src/data/directory_attrs/home-config-settings-printers-preview.rdef similarity index 100% rename from data/image_directories/home-config-settings-printers-preview.rdef rename to src/data/directory_attrs/home-config-settings-printers-preview.rdef diff --git a/data/image_directories/home-config-settings-printers-save-as-pdf.rdef b/src/data/directory_attrs/home-config-settings-printers-save-as-pdf.rdef similarity index 100% rename from data/image_directories/home-config-settings-printers-save-as-pdf.rdef rename to src/data/directory_attrs/home-config-settings-printers-save-as-pdf.rdef