Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CopySetHaikuRevision: Pull out rule DetermineHaikuRevision

Browse Source
This commit is contained in:
Ingo Weinhold 2013-10-10 21:37:27 +02:00
parent 4e238d5e68
commit 04d9b3e89c
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
build/jam/FileRules
View File

@ -339,25 +339,10 @@ rule CopySetHaikuRevision target : source
# <target> - Output file target. Gristed and located target. # <target> - Output file target. Gristed and located target.
# <source> - ELF object to be copied. Gristed and located target. # <source> - ELF object to be copied. Gristed and located target.
# If existing, make the target depend on the .git/index file in the
# root directory, so it gets updated when the revision changes due to
# commits or merges.
local gitIndex = <haiku-rootdir-git>index ;
local revisionFile = <haiku-rootdir-git>haiku-revision ;
if ! [ on $(gitIndex) return $(HAIKU_GIT_REVISION_DETERMINED) ] {
if [ Glob [ FDirName $(HAIKU_TOP) .git ] : index ] {
HAIKU_GIT_REVISION_DETERMINED on $(gitIndex) = 1 ;
SEARCH on $(gitIndex) = [ FDirName $(HAIKU_TOP) .git ] ;
MakeLocate $(revisionFile) : $(HAIKU_BUILD_OUTPUT_DIR) ;
Depends $(revisionFile) : $(gitIndex) ;
DetermineHaikuRevision $(revisionFile) : $(gitIndex) ;
} else {
revisionFile = ;
}
}
PropagateContainerUpdateTargetFlags $(target) : $(source) ; PropagateContainerUpdateTargetFlags $(target) : $(source) ;
local revisionFile = [ DetermineHaikuRevision ] ;
Depends $(target) Depends $(target)
: <build>copyattr <build>set_haiku_revision $(source) $(revisionFile) ; : <build>copyattr <build>set_haiku_revision $(source) $(revisionFile) ;
CopySetHaikuRevision1 $(target) CopySetHaikuRevision1 $(target)
@ -379,7 +364,30 @@ actions CopySetHaikuRevision1
} }
actions DetermineHaikuRevision rule DetermineHaikuRevision
{
# If existing, make the target depend on the .git/index file in the
# root directory, so it gets updated when the revision changes due to
# commits or merges.
local gitIndex = <haiku-rootdir-git>index ;
local revisionFile = <haiku-rootdir-git>haiku-revision ;
if ! [ on $(gitIndex) return $(HAIKU_GIT_REVISION_DETERMINED) ] {
if [ Glob [ FDirName $(HAIKU_TOP) .git ] : index ] {
HAIKU_GIT_REVISION_DETERMINED on $(gitIndex) = 1 ;
SEARCH on $(gitIndex) = [ FDirName $(HAIKU_TOP) .git ] ;
MakeLocate $(revisionFile) : $(HAIKU_BUILD_OUTPUT_DIR) ;
Depends $(revisionFile) : $(gitIndex) ;
DetermineHaikuRevision1 $(revisionFile) : $(gitIndex) ;
} else {
revisionFile = ;
}
}
return $(revisionFile) ;
}
actions DetermineHaikuRevision1
{ {
$(HAIKU_TOP)/build/scripts/determine_haiku_revision $(HAIKU_TOP) $(1) $(HAIKU_TOP)/build/scripts/determine_haiku_revision $(HAIKU_TOP) $(1)
} }