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

Add DetermineEffectiveHaikuRevision rule

Browse Source 
Simplifies PreprocessPackageInfo a bit.
This commit is contained in:
Ingo Weinhold
2014-01-19 00:49:10 +01:00
parent d4bfbab374
commit af559cd6ee
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FileRules
+24
View File
@@ -377,6 +377,7 @@ rule DetermineHaikuRevision
if ! [ on $(gitIndex) return $(HAIKU_GIT_REVISION_DETERMINED) ] {
HAIKU_GIT_REVISION_DETERMINED on $(gitIndex) = 1 ;
MakeLocate $(revisionFile) : $(HAIKU_BUILD_OUTPUT_DIR) ;
LocalClean clean : $(revisionFile) ;
if $(HAIKU_REVISION) {
DetermineHaikuRevision2 $(revisionFile) ;
} else if [ Glob [ FDirName $(HAIKU_TOP) .git ] : index ] {
@@ -404,6 +405,29 @@ actions DetermineHaikuRevision2
}
rule DetermineEffectiveHaikuRevision
{
local revisionFile = <haiku-rootdir>effective-haiku-revision ;
if ! [ on $(revisionFile) return $(HAIKU_EFFECTIVE_REVISION_DETERMINED) ] {
HAIKU_EFFECTIVE_REVISION_DETERMINED on $(revisionFile) = 1 ;
MakeLocate $(revisionFile) : $(HAIKU_BUILD_OUTPUT_DIR) ;
local rawRevision = [ DetermineHaikuRevision ] ;
Depends $(revisionFile) : $(rawRevision) ;
DetermineEffectiveHaikuRevision1 $(revisionFile) : $(rawRevision) ;
LocalClean clean : $(revisionFile) ;
}
return $(revisionFile) ;
}
actions DetermineEffectiveHaikuRevision1
{
revision=`sed -n 's,^\(hrev[0-9]*\).*,\1,p' "$(2:E=unknown-revision)"`
echo "${revision:-0}" > "$(1)"
}
rule DataFileToSourceFile sourceFile : dataFile : dataVariable : sizeVariable
{
sourceFile = [ FGristFiles $(sourceFile) ] ;