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

RepositoryConfig rule: Make a bit more generic

Browse Source 
Instead of the repository the URL can now be passed. It can use the
"$version" placeholder, which will be replaced by the content of the
given version file. If the URL is not given, the one from the repository
info will be used.
This commit is contained in:
Ingo Weinhold
2014-01-19 00:49:11 +01:00
parent 1221b67d07
commit f0b99b54bb
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/RepositoryRules
+10 -9
View File
@@ -172,7 +172,7 @@ rule RemotePackageRepository repository : architecture : repositoryUrl
local repositoryConfig = $(repository:G=repository-config)-config ;
MakeLocate $(repositoryConfig) : $(repositoriesDir) ;
RepositoryConfig $(repositoryConfig) : $(repositoryInfo)
: $(packagesChecksumFile) : $(repository) ;
: $(repositoryUrl)/$version : $(packagesChecksumFile) ;
HAIKU_REPOSITORY_CACHE_FILE on $(repository) = $(repositoryFile) ;
HAIKU_REPOSITORY_CONFIG_FILE on $(repository) = $(repositoryConfig) ;
@@ -209,23 +209,24 @@ actions GeneratedRepositoryPackageList1
}
rule RepositoryConfig repoConfig : repoInfo : packagesChecksumFile : repository
rule RepositoryConfig repoConfig : repoInfo : url : versionFile
{
repository = $(repository:G=repository) ;
HAIKU_REPOSITORY_URL on $(repoConfig)
= [ on $(repository) return $(HAIKU_REPOSITORY_URL) ] ;
HAIKU_REPOSITORY_URL on $(repoConfig) = $(url) ;
Depends $(repoConfig)
: <build>create_repository_config $(repoInfo) $(packagesChecksumFile) ;
: <build>create_repository_config $(repoInfo) $(versionFile) ;
RepositoryConfig1 $(repoConfig)
: <build>create_repository_config $(repoInfo) $(packagesChecksumFile) ;
: <build>create_repository_config $(repoInfo) $(versionFile) ;
}
actions RepositoryConfig1
{
version=
if [ -n "$(2[3]:E)" ]; then
version=`cat "$(2[3]:E)"`
fi
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(2[1]) $(HAIKU_REPOSITORY_URL)/`cat $(2[3])` $(2[2]) $(1)
$(2[1]) $(HAIKU_REPOSITORY_URL) $(2[2]) $(1)
}