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.)
This commit is contained in:
Augustin Cavalier 2018-11-15 21:20:24 -05:00
parent ee355c32c7
commit 795f1571b3
3 changed files with 4 additions and 1 deletions

View File

@ -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) ;
}