Added rules F{Files,Symlinks}In{Container,HaikuImage}Directory returning
the targets/symlinks added to a container/Haiku image directory. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25535 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
adfd232086
commit
3c504a317e
@ -178,6 +178,19 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
|
||||
}
|
||||
}
|
||||
|
||||
rule FFilesInContainerDirectory container : directoryTokens
|
||||
{
|
||||
local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ;
|
||||
local directory = [ FDirName $(directoryTokens) ] ;
|
||||
directory = $(directory:G=$(containerGrist)) ;
|
||||
|
||||
if [ on $(directory) return $(__is_on_image) ] {
|
||||
on $(directory) return $(TARGETS_TO_INSTALL) ;
|
||||
}
|
||||
|
||||
return ;
|
||||
}
|
||||
|
||||
rule AddSymlinkToContainer container : directoryTokens : linkTarget : linkName
|
||||
{
|
||||
# AddSymlinkToContainer <container> : <directory> : <link target>
|
||||
@ -202,6 +215,19 @@ rule AddSymlinkToContainer container : directoryTokens : linkTarget : linkName
|
||||
SYMLINKS_TO_INSTALL on $(directory) += $(link) ;
|
||||
}
|
||||
|
||||
rule FSymlinksInContainerDirectory container : directoryTokens
|
||||
{
|
||||
local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ;
|
||||
local directory = [ FDirName $(directoryTokens) ] ;
|
||||
directory = $(directory:G=$(containerGrist)) ;
|
||||
|
||||
if [ on $(directory) return $(__is_on_image) ] {
|
||||
on $(directory) return $(SYMLINKS_TO_INSTALL) ;
|
||||
}
|
||||
|
||||
return ;
|
||||
}
|
||||
|
||||
rule CopyDirectoryToContainer container : directoryTokens : sourceDirectory
|
||||
: targetDirectoryName : excludePatterns : alwaysUpdate
|
||||
{
|
||||
@ -573,6 +599,12 @@ rule AddFilesToHaikuImage directory : targets : destName
|
||||
: $(targets) : $(destName) ;
|
||||
}
|
||||
|
||||
rule FFilesInHaikuImageDirectory directoryTokens
|
||||
{
|
||||
return [ FFilesInContainerDirectory $(HAIKU_IMAGE_CONTAINER_NAME)
|
||||
: $(directoryTokens) ] ;
|
||||
}
|
||||
|
||||
rule AddSymlinkToHaikuImage directoryTokens : linkTarget : linkName
|
||||
{
|
||||
# AddSymlinkToHaikuImage <directory> : <link target> [ : <link name> ] ;
|
||||
@ -581,6 +613,12 @@ rule AddSymlinkToHaikuImage directoryTokens : linkTarget : linkName
|
||||
: $(linkTarget) : $(linkName) ;
|
||||
}
|
||||
|
||||
rule FSymlinksInHaikuImageDirectory directoryTokens
|
||||
{
|
||||
return [ FSymlinksInContainerDirectory $(HAIKU_IMAGE_CONTAINER_NAME)
|
||||
: $(directoryTokens) ] ;
|
||||
}
|
||||
|
||||
rule CopyDirectoryToHaikuImage directoryTokens : sourceDirectory
|
||||
: targetDirectoryName : excludePatterns : alwaysUpdate
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user