i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rule DetermineHaikuRevision: Avoid duplicate command execution

Browse Source 
... when HAIKU_REVISION is set.
This commit is contained in:
Ingo Weinhold
2013-12-26 00:22:45 +01:00
parent 26b4c54975
commit 1d6ca1dadd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FileRules
+1 -1
View File
@@ -375,11 +375,11 @@ rule DetermineHaikuRevision
local gitIndex = <haiku-rootdir-git>index ; local gitIndex = <haiku-rootdir-git>index ;
local revisionFile = <haiku-rootdir-git>haiku-revision ; local revisionFile = <haiku-rootdir-git>haiku-revision ;
if ! [ on $(gitIndex) return $(HAIKU_GIT_REVISION_DETERMINED) ] { if ! [ on $(gitIndex) return $(HAIKU_GIT_REVISION_DETERMINED) ] {
HAIKU_GIT_REVISION_DETERMINED on $(gitIndex) = 1 ;
MakeLocate $(revisionFile) : $(HAIKU_BUILD_OUTPUT_DIR) ; MakeLocate $(revisionFile) : $(HAIKU_BUILD_OUTPUT_DIR) ;
if $(HAIKU_REVISION) { if $(HAIKU_REVISION) {
DetermineHaikuRevision2 $(revisionFile) ; DetermineHaikuRevision2 $(revisionFile) ;
} else if [ Glob [ FDirName $(HAIKU_TOP) .git ] : index ] { } else if [ Glob [ FDirName $(HAIKU_TOP) .git ] : index ] {
HAIKU_GIT_REVISION_DETERMINED on $(gitIndex) = 1 ;
SEARCH on $(gitIndex) = [ FDirName $(HAIKU_TOP) .git ] ; SEARCH on $(gitIndex) = [ FDirName $(HAIKU_TOP) .git ] ;
Depends $(revisionFile) : $(gitIndex) ; Depends $(revisionFile) : $(gitIndex) ;
DetermineHaikuRevision1 $(revisionFile) : $(gitIndex) ; DetermineHaikuRevision1 $(revisionFile) : $(gitIndex) ;